From 3d64c52c9a2ef8d4f972381c1b253721e64d7f8f Mon Sep 17 00:00:00 2001
From: Luke Imhoff <luke_imhoff@rapid7.com>
Date: Wed, 21 Oct 2015 09:25:03 -0500
Subject: [PATCH] it { should_not -> it { is_expected.not_to

MSP-13484
---
 spec/lib/metasploit/framework/login_scanner_spec.rb | 12 ++++++------
 spec/lib/msf/core/payload_generator_spec.rb         |  6 +++---
 spec/lib/rex/socket/range_walker_spec.rb            |  4 ++--
 spec/support/matchers/query_the_database.rb         |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/lib/metasploit/framework/login_scanner_spec.rb b/spec/lib/metasploit/framework/login_scanner_spec.rb
index 7840702c27..fde65341ac 100644
--- a/spec/lib/metasploit/framework/login_scanner_spec.rb
+++ b/spec/lib/metasploit/framework/login_scanner_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe Metasploit::Framework::LoginScanner do
     let(:name) { 'smb' }
 
     it { is_expected.to include Metasploit::Framework::LoginScanner::SMB }
-    it { should_not include Metasploit::Framework::LoginScanner::HTTP }
+    it { is_expected.not_to include Metasploit::Framework::LoginScanner::HTTP }
   end
 
   [ 139, 445 ].each do |foo|
@@ -29,8 +29,8 @@ RSpec.describe Metasploit::Framework::LoginScanner do
       let(:port) { foo }
 
       it { is_expected.to include Metasploit::Framework::LoginScanner::SMB }
-      it { should_not include Metasploit::Framework::LoginScanner::HTTP }
-      it { should_not include Metasploit::Framework::LoginScanner::VNC }
+      it { is_expected.not_to include Metasploit::Framework::LoginScanner::HTTP }
+      it { is_expected.not_to include Metasploit::Framework::LoginScanner::VNC }
     end
   end
 
@@ -38,8 +38,8 @@ RSpec.describe Metasploit::Framework::LoginScanner do
     let(:name) { 'http' }
 
     it { is_expected.to include Metasploit::Framework::LoginScanner::HTTP }
-    it { should_not include Metasploit::Framework::LoginScanner::SMB }
-    it { should_not include Metasploit::Framework::LoginScanner::VNC }
+    it { is_expected.not_to include Metasploit::Framework::LoginScanner::SMB }
+    it { is_expected.not_to include Metasploit::Framework::LoginScanner::VNC }
   end
 
   [ 80, 8080, 8000, 443 ].each do |foo|
@@ -49,7 +49,7 @@ RSpec.describe Metasploit::Framework::LoginScanner do
       it { is_expected.to include Metasploit::Framework::LoginScanner::HTTP }
       it { is_expected.to include Metasploit::Framework::LoginScanner::Axis2 }
       it { is_expected.to include Metasploit::Framework::LoginScanner::Tomcat }
-      it { should_not include Metasploit::Framework::LoginScanner::SMB }
+      it { is_expected.not_to include Metasploit::Framework::LoginScanner::SMB }
     end
   end
 
diff --git a/spec/lib/msf/core/payload_generator_spec.rb b/spec/lib/msf/core/payload_generator_spec.rb
index 78f7fab6d1..548bb801a1 100644
--- a/spec/lib/msf/core/payload_generator_spec.rb
+++ b/spec/lib/msf/core/payload_generator_spec.rb
@@ -126,7 +126,7 @@ RSpec.describe Msf::PayloadGenerator do
     context 'when given a payload through stdin' do
       let(:payload_reference_name) { "stdin" }
 
-      it { should_not raise_error }
+      it { is_expected.not_to raise_error }
     end
 
     context 'when given an invalid format' do
@@ -138,13 +138,13 @@ RSpec.describe Msf::PayloadGenerator do
     context 'when given any valid transform format' do
       let(:format) { ::Msf::Simple::Buffer.transform_formats.sample }
 
-      it { should_not raise_error }
+      it { is_expected.not_to raise_error }
     end
 
     context 'when given any valid executable format' do
       let(:format) { ::Msf::Util::EXE.to_executable_fmt_formats.sample }
 
-      it { should_not raise_error }
+      it { is_expected.not_to raise_error }
     end
   end
 
diff --git a/spec/lib/rex/socket/range_walker_spec.rb b/spec/lib/rex/socket/range_walker_spec.rb
index 87c00d0062..f5e4ae8047 100644
--- a/spec/lib/rex/socket/range_walker_spec.rb
+++ b/spec/lib/rex/socket/range_walker_spec.rb
@@ -26,12 +26,12 @@ RSpec.describe Rex::Socket::RangeWalker do
 
     context "with an invalid hostname" do
       let(:args) { "@!*^&.invalid-hostname-really." }
-      it { should_not be_valid }
+      it { is_expected.not_to be_valid }
     end
 
     context "with an invalid hostname and CIDR" do
       let(:args) { "@!*^&.invalid-hostname-really./24" }
-      it { should_not be_valid }
+      it { is_expected.not_to be_valid }
     end
 
     context "with an IPv6 address range containing a scope" do
diff --git a/spec/support/matchers/query_the_database.rb b/spec/support/matchers/query_the_database.rb
index 5dcf1ab5cc..7002f5db7b 100644
--- a/spec/support/matchers/query_the_database.rb
+++ b/spec/support/matchers/query_the_database.rb
@@ -12,7 +12,7 @@ module Shoulda # :nodoc:
       # Examples:
       #  it { is_expected.to query_the_database(4.times).when_calling(:complicated_counting_method)
       #  it { is_expected.to query_the_database(4.times).or_less.when_calling(:generate_big_report)
-      #  it { should_not query_the_database.when_calling(:cached_count)
+      #  it { is_expected.not_to query_the_database.when_calling(:cached_count)
       #
       def query_the_database(times = nil)
         QueryTheDatabaseMatcher.new(times)