metasploit_data_models 0.24.0 → 0.24.1.pre.rspec.pre.3.pre.1

data/spec/app/models/mdm/exploit_attempt_spec.rb

@@ -1,31 +1,29 @@
-require 'spec_helper'
-
-describe Mdm::ExploitAttempt do
+RSpec.describe Mdm::ExploitAttempt, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:host).class_name('Mdm::Host') }
+    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
   end
 
   context 'database' do
 
     context 'timestamps'do
-      it { should have_db_column(:attempted_at).of_type(:datetime) }
+      it { is_expected.to have_db_column(:attempted_at).of_type(:datetime) }
     end
 
     context 'columns' do
-      it { should have_db_column(:host_id).of_type(:integer) }
-      it { should have_db_column(:service_id).of_type(:integer) }
-      it { should have_db_column(:vuln_id).of_type(:integer) }
-      it { should have_db_column(:exploited).of_type(:boolean) }
-      it { should have_db_column(:fail_reason).of_type(:string) }
-      it { should have_db_column(:username).of_type(:string) }
-      it { should have_db_column(:module).of_type(:text) }
-      it { should have_db_column(:session_id).of_type(:integer) }
-      it { should have_db_column(:loot_id).of_type(:integer) }
-      it { should have_db_column(:port).of_type(:integer) }
-      it { should have_db_column(:proto).of_type(:string) }
-      it { should have_db_column(:fail_detail).of_type(:text) }
+      it { is_expected.to have_db_column(:host_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:service_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:vuln_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:exploited).of_type(:boolean) }
+      it { is_expected.to have_db_column(:fail_reason).of_type(:string) }
+      it { is_expected.to have_db_column(:username).of_type(:string) }
+      it { is_expected.to have_db_column(:module).of_type(:text) }
+      it { is_expected.to have_db_column(:session_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:loot_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:port).of_type(:integer) }
+      it { is_expected.to have_db_column(:proto).of_type(:string) }
+      it { is_expected.to have_db_column(:fail_detail).of_type(:text) }
     end
   end
 
@@ -45,17 +43,17 @@ describe Mdm::ExploitAttempt do
   context 'validations' do
     it 'should only be valid with a host_id' do
       orphaned_attempt = FactoryGirl.build(:mdm_exploit_attempt, :host => nil)
-      orphaned_attempt.should_not be_valid
-      orphaned_attempt.errors[:host_id].should include("can't be blank")
+      expect(orphaned_attempt).not_to be_valid
+      expect(orphaned_attempt.errors[:host_id]).to include("can't be blank")
       propper_attempt = FactoryGirl.build(:mdm_exploit_attempt)
-      propper_attempt.should be_valid
+      expect(propper_attempt).to be_valid
     end
   end
 
   context 'factory' do
     it 'should be valid' do
       exploit_attempt = FactoryGirl.build(:mdm_exploit_attempt)
-      exploit_attempt.should be_valid
+      expect(exploit_attempt).to be_valid
     end
   end
 end

data/spec/app/models/mdm/exploited_host_spec.rb

@@ -1,26 +1,24 @@
-require 'spec_helper'
-
-describe Mdm::ExploitedHost do
+RSpec.describe Mdm::ExploitedHost, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:host).class_name('Mdm::Host') }
-    it { should belong_to(:service).class_name('Mdm::Service') }
+    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
+    it { is_expected.to belong_to(:service).class_name('Mdm::Service') }
   end
 
   context 'database' do
 
     context 'timestamps'do
-      it { should have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
-      it { should have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
+      it { is_expected.to have_db_column(:created_at).of_type(:datetime).with_options(:null => false) }
+      it { is_expected.to have_db_column(:updated_at).of_type(:datetime).with_options(:null => false) }
     end
 
     context 'columns' do
-      it { should have_db_column(:host_id).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:service_id).of_type(:integer) }
-      it { should have_db_column(:name).of_type(:string) }
-      it { should have_db_column(:session_uuid).of_type(:string) }
-      it { should have_db_column(:payload).of_type(:string) }
+      it { is_expected.to have_db_column(:host_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:service_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:name).of_type(:string) }
+      it { is_expected.to have_db_column(:session_uuid).of_type(:string) }
+      it { is_expected.to have_db_column(:payload).of_type(:string) }
     end
   end
 
@@ -39,7 +37,7 @@ describe Mdm::ExploitedHost do
   context 'factory' do
     it 'should be valid' do
       exploited_host = FactoryGirl.build(:mdm_exploited_host)
-      exploited_host.should be_valid
+      expect(exploited_host).to be_valid
     end
   end
 

data/spec/app/models/mdm/host_detail_spec.rb

@@ -1,37 +1,35 @@
-require 'spec_helper'
-
-describe Mdm::HostDetail do
+RSpec.describe Mdm::HostDetail, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:host).class_name('Mdm::Host') }
+    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
   end
 
   context 'database' do
-    it { should have_db_column(:host_id).of_type(:integer) }
-    it { should have_db_column(:nx_console_id).of_type(:integer) }
-    it { should have_db_column(:nx_device_id).of_type(:integer) }
-    it { should have_db_column(:src).of_type(:string) }
-    it { should have_db_column(:nx_site_name).of_type(:string) }
-    it { should have_db_column(:nx_site_importance).of_type(:string) }
-    it { should have_db_column(:src).of_type(:string) }
-    it { should have_db_column(:nx_site_name).of_type(:string) }
-    it { should have_db_column(:nx_scan_template).of_type(:string) }
-    it { should have_db_column(:nx_risk_score).of_type(:float) }
+    it { is_expected.to have_db_column(:host_id).of_type(:integer) }
+    it { is_expected.to have_db_column(:nx_console_id).of_type(:integer) }
+    it { is_expected.to have_db_column(:nx_device_id).of_type(:integer) }
+    it { is_expected.to have_db_column(:src).of_type(:string) }
+    it { is_expected.to have_db_column(:nx_site_name).of_type(:string) }
+    it { is_expected.to have_db_column(:nx_site_importance).of_type(:string) }
+    it { is_expected.to have_db_column(:src).of_type(:string) }
+    it { is_expected.to have_db_column(:nx_site_name).of_type(:string) }
+    it { is_expected.to have_db_column(:nx_scan_template).of_type(:string) }
+    it { is_expected.to have_db_column(:nx_risk_score).of_type(:float) }
   end
 
   context 'validations' do
     it 'should only be valid with a host_id' do
       orphan_detail = FactoryGirl.build(:mdm_host_detail, :host => nil)
-      orphan_detail.should_not be_valid
-      orphan_detail.errors[:host_id].should include("can't be blank")
+      expect(orphan_detail).not_to be_valid
+      expect(orphan_detail.errors[:host_id]).to include("can't be blank")
     end
   end
 
   context 'factory' do
     it 'should be valid' do
       host_detail = FactoryGirl.build(:mdm_host_detail)
-      host_detail.should be_valid
+      expect(host_detail).to be_valid
     end
   end
 

data/spec/app/models/mdm/host_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Mdm::Host do
+RSpec.describe Mdm::Host, type: :model do
   subject(:host) do
     FactoryGirl.build(:mdm_host)
   end
@@ -41,15 +39,18 @@ describe Mdm::Host do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
-    it 'should be valid' do
-      host = FactoryGirl.build(:mdm_host)
-      host.should be_valid
+    context 'mdm_host' do
+      subject(:mdm_host) {
+        FactoryGirl.build(:mdm_host)
+      }
+
+      it { is_expected.to be_valid }
     end
   end
 
   context 'Constants' do
     subject(:max_nmap_certainty) { described_class::MAX_NMAP_CERTAINTY }
-    it { should eq(0.84) }
+    it { is_expected.to eq(0.84) }
   end
 
   context '#destroy' do
@@ -103,19 +104,19 @@ describe Mdm::Host do
   end
 
   context 'associations' do
-    it { should have_many(:creds).class_name('Mdm::Cred').through(:services) }
-    it { should have_many(:clients).class_name('Mdm::Client').dependent(:destroy) }
-    it { should have_many(:exploit_attempts).class_name('Mdm::ExploitAttempt').dependent(:destroy) }
-    it { should have_many(:exploited_hosts).class_name('Mdm::ExploitedHost').dependent(:destroy) }
-    it { should have_many(:host_details).class_name('Mdm::HostDetail').dependent(:destroy) }
-    it { should have_many(:hosts_tags).class_name('Mdm::HostTag') }
-    it { should have_many(:loots).class_name('Mdm::Loot').dependent(:destroy).order('loots.created_at DESC') }
-    it { should have_many(:module_runs).class_name('MetasploitDataModels::ModuleRun') }
-    it { should have_many(:task_hosts).class_name('Mdm::TaskHost').dependent(:destroy) }
-    it { should have_many(:tasks).class_name('Mdm::Task').through(:task_hosts) }
+    it { is_expected.to have_many(:creds).class_name('Mdm::Cred').through(:services) }
+    it { is_expected.to have_many(:clients).class_name('Mdm::Client').dependent(:destroy) }
+    it { is_expected.to have_many(:exploit_attempts).class_name('Mdm::ExploitAttempt').dependent(:destroy) }
+    it { is_expected.to have_many(:exploited_hosts).class_name('Mdm::ExploitedHost').dependent(:destroy) }
+    it { is_expected.to have_many(:host_details).class_name('Mdm::HostDetail').dependent(:destroy) }
+    it { is_expected.to have_many(:hosts_tags).class_name('Mdm::HostTag') }
+    it { is_expected.to have_many(:loots).class_name('Mdm::Loot').dependent(:destroy).order('loots.created_at DESC') }
+    it { is_expected.to have_many(:module_runs).class_name('MetasploitDataModels::ModuleRun') }
+    it { is_expected.to have_many(:task_hosts).class_name('Mdm::TaskHost').dependent(:destroy) }
+    it { is_expected.to have_many(:tasks).class_name('Mdm::Task').through(:task_hosts) }
 
     context 'module_details' do
-      it { should have_many(:module_details).class_name('Mdm::Module::Detail').through(:module_refs) }
+      it { is_expected.to have_many(:module_details).class_name('Mdm::Module::Detail').through(:module_refs) }
 
       context 'with Mdm::Vulns' do
         let!(:vulns) do
@@ -188,8 +189,8 @@ describe Mdm::Host do
                     module_details << module_ref.detail
                   end
 
-                  host.module_details.count.should < module_details.length
-                  module_details.uniq.count.should == host.module_details.count
+        expect(architectures).to include('mips')
+                  expect(module_details.uniq.count).to eq(host.module_details.count)
                 end
               end
             end
@@ -198,17 +199,17 @@ describe Mdm::Host do
       end
     end
 
-    it { should have_many(:module_refs).class_name('Mdm::Module::Ref').through(:refs) }
-    it { should have_many(:notes).class_name('Mdm::Note').dependent(:delete_all).order('notes.created_at') }
-    it { should have_many(:refs).class_name('Mdm::Ref').through(:vuln_refs) }
-    it { should have_many(:services).class_name('Mdm::Service').dependent(:destroy).order('services.port, services.proto') }
-    it { should have_many(:service_notes).through(:services) }
-    it { should have_many(:sessions).class_name('Mdm::Session').dependent(:destroy).order('sessions.opened_at') }
-    it { should have_many(:tags).class_name('Mdm::Tag').through(:hosts_tags) }
-    it { should have_many(:vulns).class_name('Mdm::Vuln').dependent(:delete_all) }
-    it { should have_many(:vuln_refs).class_name('Mdm::VulnRef') }
-    it { should have_many(:web_sites).class_name('Mdm::WebSite').through(:services) }
-    it { should belong_to(:workspace).class_name('Mdm::Workspace') }
+    it { is_expected.to have_many(:module_refs).class_name('Mdm::Module::Ref').through(:refs) }
+    it { is_expected.to have_many(:notes).class_name('Mdm::Note').dependent(:delete_all).order('notes.created_at') }
+    it { is_expected.to have_many(:refs).class_name('Mdm::Ref').through(:vuln_refs) }
+    it { is_expected.to have_many(:services).class_name('Mdm::Service').dependent(:destroy).order('services.port, services.proto') }
+    it { is_expected.to have_many(:service_notes).through(:services) }
+    it { is_expected.to have_many(:sessions).class_name('Mdm::Session').dependent(:destroy).order('sessions.opened_at') }
+    it { is_expected.to have_many(:tags).class_name('Mdm::Tag').through(:hosts_tags) }
+    it { is_expected.to have_many(:vulns).class_name('Mdm::Vuln').dependent(:delete_all) }
+    it { is_expected.to have_many(:vuln_refs).class_name('Mdm::VulnRef') }
+    it { is_expected.to have_many(:web_sites).class_name('Mdm::WebSite').through(:services) }
+    it { is_expected.to belong_to(:workspace).class_name('Mdm::Workspace') }
   end
 
   context 'CONSTANTS' do
@@ -218,70 +219,70 @@ describe Mdm::Host do
       end
 
       it 'should be an Array<String>' do
-        architectures.should be_an Array
+        expect(architectures).to include('mips')
 
         architectures.each do |architecture|
-          architecture.should be_a String
+        expect(architectures).to include('mips')
         end
       end
 
       it 'should include both endians of ARM' do
-        architectures.should include('armbe')
-        architectures.should include('armle')
+        expect(architectures).to include('mips')
+        expect(architectures).to include('mips')
       end
 
       it 'should include 32-bit and 64-bit versions of Cell Broadband Engine Architecture' do
-        architectures.should include('cbea')
-        architectures.should include('cbea64')
+        expect(architectures).to include('mips')
+        expect(architectures).to include('mips')
       end
 
       it 'should include cmd for command shell' do
-        architectures.should include('cmd')
+        expect(architectures).to include('mips')
       end
 
       it 'should include java for Java Virtual Machine' do
-        architectures.should include('java')
+        expect(architectures).to include('mips')
       end
 
       it 'should include plain and endian-ware MIPS' do
-        architectures.should include('mips')
-        architectures.should include('mipsbe')
-        architectures.should include('mipsle')
+        expect(architectures).to include('mips')
+        expect(architectures).to include('mipsbe')
+        expect(architectures).to include('mipsle')
       end
 
       it 'should include php for PHP code' do
-        architectures.should include('php')
+        expect(architectures).to include('php')
       end
 
       it 'should include 32-bit and 64-bit PowerPC' do
-        architectures.should include('ppc')
-        architectures.should include('ppc64')
+        expect(architectures).to include('ppc')
+        expect(architectures).to include('ppc64')
       end
 
       it 'should include ruby for Ruby code' do
-        architectures.should include('ruby')
+        expect(architectures).to include('ruby')
       end
 
       it 'should include sparc for Sparc' do
-        architectures.should include('sparc')
+        expect(architectures).to include('sparc')
       end
 
       it 'should include tty for Terminals' do
-        architectures.should include('tty')
+        expect(architectures).to include('tty')
       end
 
       it 'should include 32-bit and 64-bit x86' do
-        architectures.should include('x64')
-        architectures.should include('x86')
-        architectures.should include('x86_64')
+        expect(architectures).to include('x64')
+        expect(architectures).to include('x86')
+        expect(architectures).to include('x86_64')
       end
 
       it 'should include blank string to indicate no detection has happened' do
-        architectures.should include('')
+        expect(architectures).to include('')
       end
 
       it 'should include "Unknown" for failed detection attempts' do
-        architectures.should include('Unknown')
+        expect(architectures).to include('Unknown')
       end
 
     end
@@ -292,71 +293,71 @@ describe Mdm::Host do
       end
 
       it 'should be an Array<String>' do
-        search_fields.should be_an Array
+        expect(search_fields).to be_an Array
 
         search_fields.each { |search_field|
-          search_field.should be_a String
+          expect(search_field).to be_a String
         }
       end
 
       it 'should cast address to text' do
-        search_fields.should include('address::text')
+        expect(search_fields).to include('address::text')
       end
 
-      it { should include('comments') }
-      it { should include('mac') }
-      it { should include('name') }
-      it { should include('os_flavor') }
-      it { should include('os_name') }
-      it { should include('os_sp') }
-      it { should include('purpose') }
+      it { is_expected.to include('comments') }
+      it { is_expected.to include('mac') }
+      it { is_expected.to include('name') }
+      it { is_expected.to include('os_flavor') }
+      it { is_expected.to include('os_name') }
+      it { is_expected.to include('os_sp') }
+      it { is_expected.to include('purpose') }
     end
 
     it 'should define STATES in any order' do
-      described_class::STATES.should =~ states
+      expect(described_class::STATES).to match_array(states)
     end
   end
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:address).of_type(:string).with_options(:null => false) }
-      it { should have_db_column(:arch).of_type(:string) }
-      it { should have_db_column(:comm).of_type(:string) }
-      it { should have_db_column(:comments).of_type(:text) }
-      it { should have_db_column(:info).of_type(:string).with_options(:limit => 2 ** 16) }
-      it { should have_db_column(:mac).of_type(:string) }
-      it { should have_db_column(:name).of_type(:string) }
-      it { should have_db_column(:os_flavor).of_type(:string) }
-      it { should have_db_column(:os_lang).of_type(:string) }
-      it { should have_db_column(:os_name).of_type(:string) }
-      it { should have_db_column(:os_sp).of_type(:string) }
-      it { should have_db_column(:purpose).of_type(:text) }
-      it { should have_db_column(:scope).of_type(:text) }
-      it { should have_db_column(:state).of_type(:string) }
-      it { should have_db_column(:virtual_host).of_type(:text) }
-      it { should have_db_column(:workspace_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:address).of_type(:string).with_options(:null => false) }
+      it { is_expected.to have_db_column(:arch).of_type(:string) }
+      it { is_expected.to have_db_column(:comm).of_type(:string) }
+      it { is_expected.to have_db_column(:comments).of_type(:text) }
+      it { is_expected.to have_db_column(:info).of_type(:string).with_options(:limit => 2 ** 16) }
+      it { is_expected.to have_db_column(:mac).of_type(:string) }
+      it { is_expected.to have_db_column(:name).of_type(:string) }
+      it { is_expected.to have_db_column(:os_flavor).of_type(:string) }
+      it { is_expected.to have_db_column(:os_lang).of_type(:string) }
+      it { is_expected.to have_db_column(:os_name).of_type(:string) }
+      it { is_expected.to have_db_column(:os_sp).of_type(:string) }
+      it { is_expected.to have_db_column(:purpose).of_type(:text) }
+      it { is_expected.to have_db_column(:scope).of_type(:text) }
+      it { is_expected.to have_db_column(:state).of_type(:string) }
+      it { is_expected.to have_db_column(:virtual_host).of_type(:text) }
+      it { is_expected.to have_db_column(:workspace_id).of_type(:integer).with_options(:null => false) }
 
       context 'counter caches' do
-        it { should have_db_column(:exploit_attempt_count).of_type(:integer).with_options(:default => 0) }
-        it { should have_db_column(:host_detail_count).of_type(:integer).with_options(:default => 0) }
-        it { should have_db_column(:note_count).of_type(:integer).with_options(:default => 0) }
-        it { should have_db_column(:service_count).of_type(:integer).with_options(:default => 0) }
-        it { should have_db_column(:vuln_count).of_type(:integer).with_options(:default => 0) }
+        it { is_expected.to have_db_column(:exploit_attempt_count).of_type(:integer).with_options(:default => 0) }
+        it { is_expected.to have_db_column(:host_detail_count).of_type(:integer).with_options(:default => 0) }
+        it { is_expected.to have_db_column(:note_count).of_type(:integer).with_options(:default => 0) }
+        it { is_expected.to have_db_column(:service_count).of_type(:integer).with_options(:default => 0) }
+        it { is_expected.to have_db_column(:vuln_count).of_type(:integer).with_options(:default => 0) }
       end
 
       context 'timestamps' do
-        it { should have_db_column(:created_at).of_type(:datetime) }
-        it { should have_db_column(:updated_at).of_type(:datetime) }
+        it { is_expected.to have_db_column(:created_at).of_type(:datetime) }
+        it { is_expected.to have_db_column(:updated_at).of_type(:datetime) }
       end
     end
 
     context 'indices' do
-      it { should have_db_index([:workspace_id, :address]).unique(true) }
-      it { should have_db_index(:name) }
-      it { should have_db_index(:os_flavor) }
-      it { should have_db_index(:os_name) }
-      it { should have_db_index(:purpose) }
-      it { should have_db_index(:state) }
+      it { is_expected.to have_db_index([:workspace_id, :address]).unique(true) }
+      it { is_expected.to have_db_index(:name) }
+      it { is_expected.to have_db_index(:os_flavor) }
+      it { is_expected.to have_db_index(:os_name) }
+      it { is_expected.to have_db_index(:purpose) }
+      it { is_expected.to have_db_index(:state) }
     end
   end
 
@@ -366,7 +367,7 @@ describe Mdm::Host do
         FactoryGirl.build(:full_mdm_host)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
 
     context 'mdm_host' do
@@ -374,14 +375,14 @@ describe Mdm::Host do
         FactoryGirl.build(:mdm_host)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
   context 'validations' do
     context 'address' do
-      it { should ensure_exclusion_of(:address).in_array(['127.0.0.1']) }
-      it { should validate_presence_of(:address) }
+      it { is_expected.to ensure_exclusion_of(:address).in_array(['127.0.0.1']) }
+      it { is_expected.to validate_presence_of(:address) }
 
       # can't use validate_uniqueness_of(:address).scoped_to(:workspace_id) because it will attempt to set workspace_id
       # to `nil`, which will make the `:null => false` constraint on hosts.workspace_id to fail.
@@ -393,8 +394,8 @@ describe Mdm::Host do
 
         duplicate_host = FactoryGirl.build(:mdm_host, :address => address, :workspace => workspace)
 
-        duplicate_host.should_not be_valid
-        duplicate_host.errors[:address].should include('has already been taken')
+        expect(duplicate_host).not_to be_valid
+        expect(duplicate_host.errors[:address]).to include('has already been taken')
       end
     end
 
@@ -405,19 +406,19 @@ describe Mdm::Host do
       context 'with an unknown architecture' do
         let(:arch) { "asdfasdf" }
         it 'should normalize to Unknown' do
-          host.should be_valid
-          host.arch.should be described_class::UNKNOWN_ARCHITECTURE
+          expect(host).to be_valid
+          expect(host.arch).to be described_class::UNKNOWN_ARCHITECTURE
         end
       end
       described_class::ARCHITECTURES.each do |arch|
         context "with known architecture '#{arch}'" do
           let(:arch) { arch }
-          it { should be_valid }
+          it { is_expected.to be_valid }
         end
       end
     end
-    it { should ensure_inclusion_of(:state).in_array(states).allow_nil }
-    it { should validate_presence_of(:workspace) }
+    it { is_expected.to ensure_inclusion_of(:state).in_array(states).allow_nil }
+    it { is_expected.to validate_presence_of(:workspace) }
   end
 
   context 'search scope' do
@@ -431,13 +432,13 @@ describe Mdm::Host do
 
     context 'searching for an empty string' do
       it 'should return any hosts in the database' do
-        search_for('').should include(subject)
+        expect(search_for('')).to include(subject)
       end
     end
 
     context 'searching for an existing Host\'s name' do
       it 'should return the host' do
-        search_for(subject.name).should include(subject)
+        expect(search_for(subject.name)).to include(subject)
       end
     end
   end
@@ -446,139 +447,139 @@ describe Mdm::Host do
     context '#get_arch_from_string' do
       context "should return 'x64'" do
         it "when the string contains 'x64'" do
-          host.send(:get_arch_from_string, 'blahx64blah').should == 'x64'
+          expect(host.send(:get_arch_from_string, 'blahx64blah')).to eq('x64')
         end
 
         it "when the string contains 'X64'" do
-          host.send(:get_arch_from_string, 'blahX64blah').should == 'x64'
+          expect(host.send(:get_arch_from_string, 'blahX64blah')).to eq('x64')
         end
 
         it "when the string contains 'x86_64'" do
-          host.send(:get_arch_from_string, 'blahx86_64blah').should == 'x64'
+          expect(host.send(:get_arch_from_string, 'blahx86_64blah')).to eq('x64')
         end
 
         it "when the string contains 'X86_64'" do
-          host.send(:get_arch_from_string, 'blahX86_64blah').should == 'x64'
+          expect(host.send(:get_arch_from_string, 'blahX86_64blah')).to eq('x64')
         end
 
         it "when the string contains 'amd64'" do
-          host.send(:get_arch_from_string, 'blahamd64blah').should == 'x64'
+          expect(host.send(:get_arch_from_string, 'blahamd64blah')).to eq('x64')
         end
 
         it "when the string contains 'AMD64'" do
-          host.send(:get_arch_from_string, 'blahAMD64blah').should == 'x64'
+          expect(host.send(:get_arch_from_string, 'blahAMD64blah')).to eq('x64')
         end
 
         it "when the string contains 'aMd64'" do
-          host.send(:get_arch_from_string, 'blahamd64blah').should == 'x64'
+          expect(host.send(:get_arch_from_string, 'blahamd64blah')).to eq('x64')
         end
       end
 
       context "should return 'x86'" do
         it "when the string contains 'x86'" do
-          host.send(:get_arch_from_string, 'blahx86blah').should == 'x86'
+          expect(host.send(:get_arch_from_string, 'blahx86blah')).to eq('x86')
         end
 
         it "when the string contains 'X86'" do
-          host.send(:get_arch_from_string, 'blahX86blah').should == 'x86'
+          expect(host.send(:get_arch_from_string, 'blahX86blah')).to eq('x86')
         end
 
         it "when the string contains 'i386'" do
-          host.send(:get_arch_from_string, 'blahi386blah').should == 'x86'
+          expect(host.send(:get_arch_from_string, 'blahi386blah')).to eq('x86')
         end
 
         it "when the string contains 'I386'" do
-          host.send(:get_arch_from_string, 'blahI386blah').should == 'x86'
+          expect(host.send(:get_arch_from_string, 'blahI386blah')).to eq('x86')
         end
 
         it "when the string contains 'i486'" do
-          host.send(:get_arch_from_string, 'blahi486blah').should == 'x86'
+          expect(host.send(:get_arch_from_string, 'blahi486blah')).to eq('x86')
         end
 
         it "when the string contains 'i586'" do
-          host.send(:get_arch_from_string, 'blahi586blah').should == 'x86'
+          expect(host.send(:get_arch_from_string, 'blahi586blah')).to eq('x86')
         end
 
         it "when the string contains 'i686'" do
-          host.send(:get_arch_from_string, 'blahi386blah').should == 'x86'
+          expect(host.send(:get_arch_from_string, 'blahi386blah')).to eq('x86')
         end
       end
 
       context "should return 'ppc'" do
         it "when the string contains 'PowerPC'" do
-          host.send(:get_arch_from_string, 'blahPowerPCblah').should == 'ppc'
+          expect(host.send(:get_arch_from_string, 'blahPowerPCblah')).to eq('ppc')
         end
 
         it "when the string contains 'PPC'" do
-          host.send(:get_arch_from_string, 'blahPPCblah').should == 'ppc'
+          expect(host.send(:get_arch_from_string, 'blahPPCblah')).to eq('ppc')
         end
 
         it "when the string contains 'POWER'" do
-          host.send(:get_arch_from_string, 'blahPOWERblah').should == 'ppc'
+          expect(host.send(:get_arch_from_string, 'blahPOWERblah')).to eq('ppc')
         end
 
         it "when the string contains 'ppc'" do
-          host.send(:get_arch_from_string, 'blahppcblah').should == 'ppc'
+          expect(host.send(:get_arch_from_string, 'blahppcblah')).to eq('ppc')
         end
       end
 
       context 'should return nil' do
         it 'when PowerPC is cased incorrectly' do
-          host.send(:get_arch_from_string, 'powerPC').should == nil
-          host.send(:get_arch_from_string, 'Powerpc').should == nil
+          expect(host.send(:get_arch_from_string, 'powerPC')).to eq(nil)
+          expect(host.send(:get_arch_from_string, 'Powerpc')).to eq(nil)
         end
 
         it 'when no recognized arch string is present' do
-          host.send(:get_arch_from_string, 'blahblah').should == nil
+          expect(host.send(:get_arch_from_string, 'blahblah')).to eq(nil)
         end
       end
 
       it "should return 'sparc' if the string contains SPARC, regardless of case" do
-        host.send(:get_arch_from_string, 'blahSPARCblah').should == 'sparc'
-        host.send(:get_arch_from_string, 'blahSPaRCblah').should == 'sparc'
-        host.send(:get_arch_from_string, 'blahsparcblah').should == 'sparc'
+        expect(host.send(:get_arch_from_string, 'blahSPARCblah')).to eq('sparc')
+        expect(host.send(:get_arch_from_string, 'blahSPaRCblah')).to eq('sparc')
+        expect(host.send(:get_arch_from_string, 'blahsparcblah')).to eq('sparc')
       end
 
       it "should return 'arm' if the string contains 'ARM', regardless of case" do
-        host.send(:get_arch_from_string, 'blahARMblah').should == 'arm'
-        host.send(:get_arch_from_string, 'blahArMblah').should == 'arm'
-        host.send(:get_arch_from_string, 'blaharmblah').should == 'arm'
+        expect(host.send(:get_arch_from_string, 'blahARMblah')).to eq('arm')
+        expect(host.send(:get_arch_from_string, 'blahArMblah')).to eq('arm')
+        expect(host.send(:get_arch_from_string, 'blaharmblah')).to eq('arm')
       end
 
       it "should return 'mips' if the string contains 'MIPS', regardless of case" do
-        host.send(:get_arch_from_string, 'blahMIPSblah').should == 'mips'
-        host.send(:get_arch_from_string, 'blahMiPslah').should == 'mips'
-        host.send(:get_arch_from_string, 'blahmipsblah').should == 'mips'
+        expect(host.send(:get_arch_from_string, 'blahMIPSblah')).to eq('mips')
+        expect(host.send(:get_arch_from_string, 'blahMiPslah')).to eq('mips')
+        expect(host.send(:get_arch_from_string, 'blahmipsblah')).to eq('mips')
       end
     end
 
     context '#parse_windows_os_str' do
       it 'should always return the os_name as Windows' do
         result = host.send(:parse_windows_os_str, '')
-        result['os.product'].should == 'Windows'
+        expect(result['os.product']).to eq('Windows')
       end
 
       context 'arch' do
         it 'should return a value for arch if there is one' do
           result = host.send(:parse_windows_os_str, 'Windows x64')
-          result['os.arch'].should == 'x64'
+          expect(result['os.arch']).to eq('x64')
         end
 
         it "should not have an arch key if we don't know the arch" do
           result = host.send(:parse_windows_os_str, 'Windows')
-          result.has_key?('os.arch').should == false
+          expect(result.has_key?('os.arch')).to eq(false)
         end
       end
 
       context 'Service Pack' do
         it 'should be returned if we see Service Pack X' do
           result = host.send(:parse_windows_os_str, 'Windows XP Service Pack 1')
-          result['os.version'].should == 'SP1'
+          expect(result['os.version']).to eq('SP1')
         end
 
         it 'should be returned if we see SPX' do
           result = host.send(:parse_windows_os_str, 'Windows XP SP3')
-          result['os.version'].should == 'SP3'
+          expect(result['os.version']).to eq('SP3')
         end
       end
 
@@ -586,141 +587,137 @@ describe Mdm::Host do
 
          it "should appear as Windows 95 for 'Windows 95" do
           result = host.send(:parse_windows_os_str, 'Windows 95')
-          result['os.product'].should == 'Windows 95'
+          expect(result['os.product']).to eq('Windows 95')
         end
 
         it "should appear as Windows NT 3.51 for 'Windows NT 3.51" do
           result = host.send(:parse_windows_os_str, 'Windows NT 3.51')
-          result['os.product'].should == 'Windows NT 3.51'
+          expect(result['os.product']).to eq('Windows NT 3.51')
         end
 
         it "should appear as Windows NT 4.0 for 'Windows NT 4.0" do
           result = host.send(:parse_windows_os_str, 'Windows NT 4.0')
-          result['os.product'].should == 'Windows NT 4.0'
+          expect(result['os.product']).to eq('Windows NT 4.0')
         end
 
         it "should appear as Windows 98 for 'Windows 98" do
           result = host.send(:parse_windows_os_str, 'Windows 98')
-          result['os.product'].should == 'Windows 98'
+          expect(result['os.product']).to eq('Windows 98')
         end
 
         it "should appear as Windows ME for 'Windows ME" do
           result = host.send(:parse_windows_os_str, 'Windows ME')
-          result['os.product'].should == 'Windows ME'
+          expect(result['os.product']).to eq('Windows ME')
         end
 
         it "should appear as Windows 2003 for '.NET Server'" do
           result = host.send(:parse_windows_os_str, 'Windows .NET Server')
-          result['os.product'].should == 'Windows Server 2003'
+          expect(result['os.product']).to eq('Windows Server 2003')
         end
 
         it 'should be recognized for Windows XP' do
           result = host.send(:parse_windows_os_str, 'Windows XP')
-          result['os.product'].should == 'Windows XP'
+          expect(result['os.product']).to eq('Windows XP')
         end
 
         it 'should be recognized for Windows Server 2000' do
           result = host.send(:parse_windows_os_str, 'Windows 2000')
-          result['os.product'].should == 'Windows Server 2000'
+          expect(result['os.product']).to eq('Windows Server 2000')
         end
 
         it 'should be recognized for Windows Server 2003' do
           result = host.send(:parse_windows_os_str, 'Windows 2003')
-          result['os.product'].should == 'Windows Server 2003'
+          expect(result['os.product']).to eq('Windows Server 2003')
         end
 
         it 'should be recognized for Windows 2008' do
           result = host.send(:parse_windows_os_str, 'Windows 2008')
-          result['os.product'].should == 'Windows Server 2008'
+          expect(result['os.product']).to eq('Windows Server 2008')
         end
 
         it 'should be recognized for Windows 2012' do
           result = host.send(:parse_windows_os_str, 'Windows 2012')
-          result['os.product'].should == 'Windows Server 2012'
+          expect(result['os.product']).to eq('Windows Server 2012')
         end
 
         it 'should be recognized for Windows Vista' do
           result = host.send(:parse_windows_os_str, 'Windows Vista')
-          result['os.product'].should == 'Windows Vista'
+          expect(result['os.product']).to eq('Windows Vista')
         end
 
         it 'should be recognized for Windows Server 2000' do
           result = host.send(:parse_windows_os_str, 'Windows 2000 Advanced Server')
-          result['os.product'].should == 'Windows Server 2000'
+          expect(result['os.product']).to eq('Windows Server 2000')
         end
 
         it 'should be recognized for Windows 7' do
           result = host.send(:parse_windows_os_str, 'Windows 7')
-          result['os.product'].should == 'Windows 7'
+          expect(result['os.product']).to eq('Windows 7')
         end
 
         it 'should be recognized for Windows 7 Ultimate Edition' do
           result = host.send(:parse_windows_os_str, 'Windows 7 Ultimate Edition')
-          result['os.product'].should == 'Windows 7'
-          result['os.edition'].should == 'Ultimate'
+          expect(result['os.product']).to eq('Windows 7')
+          expect(result['os.edition']).to eq('Ultimate')
         end
 
         it 'should be recognized for Windows 8' do
           result = host.send(:parse_windows_os_str, 'Windows 8')
-          result['os.product'].should == 'Windows 8'
+          expect(result['os.product']).to eq('Windows 8')
         end
 
         it 'should be recognized for Windows 8.1' do
           result = host.send(:parse_windows_os_str, 'Windows 8.1')
-          result['os.product'].should == 'Windows 8.1'
+          expect(result['os.product']).to eq('Windows 8.1')
         end
 
         it 'should be recognized for Windows 8.2' do
           result = host.send(:parse_windows_os_str, 'Windows 8.2')
-          result['os.product'].should == 'Windows 8.2'
+          expect(result['os.product']).to eq('Windows 8.2')
         end
 
         it 'should be recognized as Windows XP, Build 2600, SP3' do
           result = host.send(:parse_windows_os_str, 'Windows XP (Build 2600, Service Pack 3).')
-          result['os.product'].should == 'Windows XP'
-          result['os.build'].should == '2600'
-          result['os.version'].should == 'SP3'
+          expect(result['os.product']).to eq('Windows XP')
+          expect(result['os.build']).to eq('2600')
+          expect(result['os.version']).to eq('SP3')
         end
 
         it 'should be recognized as Windows Server 2003, Build 3790' do
           result = host.send(:parse_windows_os_str, 'Windows .NET Server (Build 3790).')
-          result['os.product'].should == 'Windows Server 2003'
-          result['os.build'].should == '3790'
+          expect(result['os.product']).to eq('Windows Server 2003')
+          expect(result['os.build']).to eq('3790')
         end
 
         it 'should be recognized as Windows Server 2008, Build 6001, SP1' do
           result = host.send(:parse_windows_os_str, 'Windows 2008 (Build 6001, Service Pack 1).')
-          result['os.product'].should == 'Windows Server 2008'
-          result['os.build'].should == '6001'
-          result['os.version'].should == 'SP1'
+          expect(result['os.product']).to eq('Windows Server 2008')
+          expect(result['os.build']).to eq('6001')
+          expect(result['os.version']).to eq('SP1')
         end
 
         it 'should default to Windows <name> if all else fails' do
             result = host.send(:parse_windows_os_str, 'Windows Foobar Service Pack 3')
-            result['os.product'].should == 'Windows Foobar'
-            result['os.version'].should == 'SP3'
+            expect(result['os.product']).to eq('Windows Foobar')
+            expect(result['os.version']).to eq('SP3')
         end
       end
     end
 
     context '#validate_fingerprint_data' do
-      before(:each) do
-        host.stub(:dlog)
-      end
-
       it 'should return false for an empty hash' do
         fingerprint= FactoryGirl.build(:mdm_note, :data => {})
-        host.validate_fingerprint_data(fingerprint).should == false
+        expect(host.validate_fingerprint_data(fingerprint)).to eq(false)
       end
 
       it 'should return false for postgresql fingerprints' do
         fingerprint= FactoryGirl.build(:mdm_note, :ntype => 'postgresql.fingerprint', :data => {})
-        host.validate_fingerprint_data(fingerprint).should == false
+        expect(host.validate_fingerprint_data(fingerprint)).to eq(false)
       end
 
       it 'should return false if the fingerprint does not contain a hash' do
         fingerprint= FactoryGirl.build(:mdm_note, :data => 'this is not a fingerprint')
-        host.validate_fingerprint_data(fingerprint).should == false
+        expect(host.validate_fingerprint_data(fingerprint)).to eq(false)
       end
     end
 
@@ -728,91 +725,95 @@ describe Mdm::Host do
     context '#apply_match_to_host' do
 
       before(:each) do
-        stub_const('Rex::Text', Module.new)
-        allow(Rex::Text).to receive(:ascii_safe_hex) do |unsanitized|
-          # Pass back the sanitized value for the stub
-          unsanitized.unpack("C*").pack("C*").gsub(/([\x00-\x08\x0b\x0c\x0e-\x1f\x80-\xFF])/n){ |x| "\\x%.2x" % x.unpack("C*")[0]}
-        end
+        stub_const(
+            'Rex::Text',
+            Module.new do
+              def self.ascii_safe_hex(unsanitized)
+                # Pass back the sanitized value for the stub
+                unsanitized.unpack("C*").pack("C*").gsub(/([\x00-\x08\x0b\x0c\x0e-\x1f\x80-\xFF])/n){ |x| "\\x%.2x" % x.unpack("C*")[0]}
+              end
+            end
+        )
       end
 
       it 'should set host.mac when host.mac is present' do
         match = { 'host.mac' => '00:11:22:33:44:55' }
         host.send(:apply_match_to_host, match)
-        host.mac.should == '00:11:22:33:44:55'
+        expect(host.mac).to eq('00:11:22:33:44:55')
       end
 
       it 'should set host.name when host.name is present' do
         match = { 'host.name' => 'webbyweb' }
         host.send(:apply_match_to_host, match)
-        host.name.should == 'webbyweb'
+        expect(host.name).to eq('webbyweb')
       end
 
       it 'should set host.arch when os.arch is present' do
         match = { 'os.arch' => 'x86' }
         host.send(:apply_match_to_host, match)
-        host.arch.should == 'x86'
+        expect(host.arch).to eq('x86')
       end
 
       it 'should set host.name to an escaped hex value when host.name contains high bytes' do
         match = { 'host.name' => "HighBytes\xff\xf0".force_encoding('binary') }
         host.send(:apply_match_to_host, match)
-        host.name.should == "HighBytes\\xff\\xf0"
+        expect(host.name).to eq("HighBytes\\xff\\xf0")
       end
 
       it 'should set host.purpose to client when os.product is Windows XP' do
         match = { 'os.product' => 'Windows XP' }
         host.send(:apply_match_to_host, match)
-        host.os_name.should == 'Windows XP'
-        host.purpose.should == 'client'
+        expect(host.os_name).to eq('Windows XP')
+        expect(host.purpose).to eq('client')
       end
 
       it 'should set host.purpose to server when os.product is Windows 2012' do
         match = { 'os.product' => 'Windows 2012' }
         host.send(:apply_match_to_host, match)
-        host.os_name.should == 'Windows 2012'
-        host.purpose.should == 'server'
+        expect(host.os_name).to eq('Windows 2012')
+        expect(host.purpose).to eq('server')
       end
 
       it 'should set host.purpose to printer when os.device is Print server' do
         match = { 'os.device' => 'Print server' }
         host.send(:apply_match_to_host, match)
-        host.purpose.should == 'printer'
+        expect(host.purpose).to eq('printer')
       end
 
       it 'should set host.os_lang to English when os.language is English' do
         match = { 'os.language' => 'English' }
         host.send(:apply_match_to_host, match)
-        host.os_lang.should == 'English'
+        expect(host.os_lang).to eq('English')
       end
 
       it 'should set host.os_name to Windows 8.1 when os.product is Windows 8.1' do
         match = { 'os.product' => 'Windows 8.1' }
         host.send(:apply_match_to_host, match)
-        host.os_name.should == 'Windows 8.1'
+        expect(host.os_name).to eq('Windows 8.1')
       end
 
       it 'should set host.os_name to Windows when os.product is not set and os.family is Windows' do
         match = { 'os.family' => 'Windows' }
         host.send(:apply_match_to_host, match)
-        host.os_name.should == 'Windows'
+        expect(host.os_name).to eq('Windows')
       end
 
       it 'should set host.os_flavor to Professional when os.edition is Professional' do
         match = { 'os.edition' => 'Professional' }
         host.send(:apply_match_to_host, match)
-        host.os_flavor.should == 'Professional'
+        expect(host.os_flavor).to eq('Professional')
       end
 
       it 'should set host.os_sp to SP2 when os.version is SP2' do
         match = { 'os.version' => 'SP2' }
         host.send(:apply_match_to_host, match)
-        host.os_sp.should == 'SP2'
+        expect(host.os_sp).to eq('SP2')
       end
 
       it 'should set host.os_sp to 3.2.11 when os.version is nil and linux.kernel.version is 3.2.11' do
         match = { 'linux.kernel.version' => '3.2.11' }
         host.send(:apply_match_to_host, match)
-        host.os_sp.should == '3.2.11'
+        expect(host.os_sp).to eq('3.2.11')
       end
     end
 
@@ -821,33 +822,33 @@ describe Mdm::Host do
       it 'should convert Service Pack X to SPX' do
         match = { 'os.version' => 'Service Pack 2' }
         result = host.send(:normalize_match, match)
-        result['os.version'].should == 'SP2'
+        expect(result['os.version']).to eq('SP2')
       end
 
       it 'should not convert No Service Pack to SP' do
         match = { 'os.version' => 'No Service Pack' }
         result = host.send(:normalize_match, match)
-        result['os.version'].should == 'No Service Pack'
+        expect(result['os.version']).to eq('No Service Pack')
       end
 
       it 'should convert Apple Mac OS X to Mac OS X' do
         match = { 'os.product' => 'Apple Mac OS X' }
         result = host.send(:normalize_match, match)
-        result['os.product'].should == 'Mac OS X'
-        result['os.vendor'].should == 'Apple'
+        expect(result['os.product']).to eq('Mac OS X')
+        expect(result['os.vendor']).to eq('Apple')
       end
 
       it 'should convert Microsoft Windows to Windows' do
         match = { 'os.product' => 'Microsoft Windows 7' }
         result = host.send(:normalize_match, match)
-        result['os.product'].should == 'Windows 7'
-        result['os.vendor'].should == 'Microsoft'
+        expect(result['os.product']).to eq('Windows 7')
+        expect(result['os.vendor']).to eq('Microsoft')
       end
 
       it 'should convert Windows Server 2012 to Windows 2012' do
         match = { 'os.product' => 'Windows Server 2012' }
         result = host.send(:normalize_match, match)
-        result['os.product'].should == 'Windows 2012'
+        expect(result['os.product']).to eq('Windows 2012')
       end
     end
 
@@ -856,55 +857,55 @@ describe Mdm::Host do
       it 'should detect Windows XP as a client' do
         match = { 'os.product' => 'Windows XP' }
         result = host.send(:guess_purpose_from_match, match)
-        result.should == 'client'
+        expect(result).to eq('client')
       end
 
       it 'should detect Windows 8.1 as a client' do
         match = { 'os.product' => 'Windows 8.1' }
         result = host.send(:guess_purpose_from_match, match)
-        result.should == 'client'
+        expect(result).to eq('client')
       end
 
       it 'should detect Windows 2000 as a server' do
         match = { 'os.product' => 'Windows 2000' }
         result = host.send(:guess_purpose_from_match, match)
-        result.should == 'server'
+        expect(result).to eq('server')
       end
 
       it 'should detect Windows Server 2012 as a server' do
         match = { 'os.product' => 'Windows Server 2012' }
         result = host.send(:guess_purpose_from_match, match)
-        result.should == 'server'
+        expect(result).to eq('server')
       end
 
       it 'should detect Linux as a server' do
         match = { 'os.product' => 'Linux' }
         result = host.send(:guess_purpose_from_match, match)
-        result.should == 'server'
+        expect(result).to eq('server')
       end
 
       it 'should detect JetDirect as a printer' do
         match = { 'os.product' => 'JetDirect', 'os.device' => 'Print server' }
         result = host.send(:guess_purpose_from_match, match)
-        result.should == 'printer'
+        expect(result).to eq('printer')
       end
 
       it 'should detect Unknown Printer as a printer' do
         match = { 'os.product' => 'Unknown Printer' }
         result = host.send(:guess_purpose_from_match, match)
-        result.should == 'printer'
+        expect(result).to eq('printer')
       end
 
       it 'should detect Linksys Router as a router' do
         match = { 'os.product' => 'Linksys', 'os.device' => 'Router' }
         result = host.send(:guess_purpose_from_match, match)
-        result.should == 'router'
+        expect(result).to eq('router')
       end
 
       it 'should detect CheckPoint Firewall-1 as a firewall' do
         match = { 'os.vendor' => 'Check Point', 'os.product' => 'Firewall-1' }
         result = host.send(:guess_purpose_from_match, match)
-        result.should == 'firewall'
+        expect(result).to eq('firewall')
       end
     end
 
@@ -913,22 +914,22 @@ describe Mdm::Host do
         it 'should return all the correct data for Windows XP SP3 x86' do
           fingerprint = FactoryGirl.build(:mdm_session_fingerprint, :host => host)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should == 'Windows XP'
-          result['os.version'].should == 'SP3'
-          result['os.arch'].should == 'x86'
-          result['host.name'].should == nil
-          result['os.certainty'].to_f.should == 0.8
+          expect(result['os.product']).to eq('Windows XP')
+          expect(result['os.version']).to eq('SP3')
+          expect(result['os.arch']).to eq('x86')
+          expect(result['host.name']).to eq(nil)
+          expect(result['os.certainty'].to_f).to eq(0.8)
         end
 
         it 'should return all the correct data for Windows 2008 SP1 x64' do
           fp_data = { :os => 'Microsoft Windows 2008 SP1', :arch => 'x64'}
           fingerprint = FactoryGirl.build(:mdm_session_fingerprint, :host => host, :data => fp_data)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should == 'Windows Server 2008'
-          result['os.version'].should == 'SP1'
-          result['os.arch'].should == 'x64'
-          result['host.name'].should == nil
-          result['os.certainty'].to_f.should == 0.8
+          expect(result['os.product']).to eq('Windows Server 2008')
+          expect(result['os.version']).to eq('SP1')
+          expect(result['os.arch']).to eq('x64')
+          expect(result['host.name']).to eq(nil)
+          expect(result['os.certainty'].to_f).to eq(0.8)
         end
 
         it 'should fingerprint Metasploitable correctly' do
@@ -936,21 +937,21 @@ describe Mdm::Host do
           fp_data = { :os => 'Linux 2.6.24-16-server (i386)', :name => 'metasploitable'}
           fingerprint = FactoryGirl.build(:mdm_session_fingerprint, :host => host, :data => fp_data)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should == 'Linux'
-          result['host.name'].should == 'metasploitable'
-          result['os.version'].should == '2.6.24-16-server'
-          result['os.arch'].should == 'x86'
-          result['os.certainty'].to_f.should == 0.8
+          expect(result['os.product']).to eq('Linux')
+          expect(result['host.name']).to eq('metasploitable')
+          expect(result['os.version']).to eq('2.6.24-16-server')
+          expect(result['os.arch']).to eq('x86')
+          expect(result['os.certainty'].to_f).to eq(0.8)
         end
 
         it 'should just populate os_name if it is unsure' do
           fp_data = { :os => 'Darwin 12.3.0 x86_64 i386'}
           fingerprint = FactoryGirl.build(:mdm_session_fingerprint, :host => host, :data => fp_data)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should == 'Darwin 12.3.0 x86_64 i386'
-          result['os.version'].should == nil
-          result['os.arch'].should == nil
-          result['os.certainty'].should == 0.8
+          expect(result['os.product']).to eq('Darwin 12.3.0 x86_64 i386')
+          expect(result['os.version']).to eq(nil)
+          expect(result['os.arch']).to eq(nil)
+          expect(result['os.certainty']).to eq(0.8)
         end
       end
 
@@ -958,27 +959,27 @@ describe Mdm::Host do
         it 'should return OS name for a Windows XP fingerprint' do
           fingerprint = FactoryGirl.build(:mdm_nmap_fingerprint, :host => host)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should == 'Windows XP'
-          result['os.certainty'].to_f.should == described_class::MAX_NMAP_CERTAINTY
+          expect(result['os.product']).to eq('Windows XP')
+          expect(result['os.certainty'].to_f).to eq(described_class::MAX_NMAP_CERTAINTY)
         end
 
         it 'should return OS name for a Metasploitable fingerprint' do
           fp_data = {:os_vendor=>"Linux", :os_family=>"Linux", :os_version=>"2.6.X", :os_accuracy=>100}
           fingerprint = FactoryGirl.build(:mdm_nmap_fingerprint, :host => host, :data => fp_data)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should == 'Linux'
-          result['os.version'].should == '2.6.X'
-          result['os.certainty'].to_f.should == described_class::MAX_NMAP_CERTAINTY
+          expect(result['os.product']).to eq('Linux')
+          expect(result['os.version']).to eq('2.6.X')
+          expect(result['os.certainty'].to_f).to eq(described_class::MAX_NMAP_CERTAINTY)
         end
 
         it 'should return OS name and flavor fo an OSX fingerprint' do
           fp_data = {:os_vendor=>"Apple", :os_family=>"Mac OS X", :os_version=>"10.8.X", :os_accuracy=>100}
           fingerprint = FactoryGirl.build(:mdm_nmap_fingerprint, :host => host, :data => fp_data)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should == 'Mac OS X'
-          result['os.vendor'].should == 'Apple'
-          result['os.version'].should == '10.8.X'
-          result['os.certainty'].to_f.should == described_class::MAX_NMAP_CERTAINTY
+          expect(result['os.product']).to eq('Mac OS X')
+          expect(result['os.vendor']).to eq('Apple')
+          expect(result['os.version']).to eq('10.8.X')
+          expect(result['os.certainty'].to_f).to eq(described_class::MAX_NMAP_CERTAINTY)
         end
       end
 
@@ -987,19 +988,19 @@ describe Mdm::Host do
           it 'should return a generic Windows fingerprint with no product info' do
             fingerprint = FactoryGirl.build(:mdm_nexpose_fingerprint, :host => host)
             result = host.send(:normalize_scanner_fp, fingerprint).first
-            result['os.product'].should == 'Windows'
-            result['os.arch'].should == 'x86'
-            result['os.certainty'].to_f.should == 0.67
+            expect(result['os.product']).to eq('Windows')
+            expect(result['os.arch']).to eq('x86')
+            expect(result['os.certainty'].to_f).to eq(0.67)
           end
 
           it 'should recognize a Windows 7 fingerprint' do
             fp_data = {:family=>"Windows", :certainty=>"0.67", :vendor=>"Microsoft", :arch=>"x86", :product => 'Windows 7', :version => 'SP1'}
             fingerprint = FactoryGirl.build(:mdm_nexpose_fingerprint, :host => host, :data => fp_data)
             result = host.send(:normalize_scanner_fp, fingerprint).first
-            result['os.product'].should == 'Windows 7'
-            result['os.version'].should == 'SP1'
-            result['os.arch'].should == 'x86'
-            result['os.certainty'].to_f.should == 0.67
+            expect(result['os.product']).to eq('Windows 7')
+            expect(result['os.version']).to eq('SP1')
+            expect(result['os.arch']).to eq('x86')
+            expect(result['os.certainty'].to_f).to eq(0.67)
           end
         end
 
@@ -1007,30 +1008,30 @@ describe Mdm::Host do
           fp_data = {:family=>"Mac OS X", :certainty=>"0.80", :vendor=>"Apple"}
           fingerprint = FactoryGirl.build(:mdm_nexpose_fingerprint, :host => host, :data => fp_data)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should == 'Mac OS X'
-          result['os.vendor'].should == "Apple"
+          expect(result['os.product']).to eq('Mac OS X')
+          expect(result['os.vendor']).to eq("Apple")
         end
 
         it 'should recognize a Cisco fingerprint' do
           fp_data = {:family=>"IOS", :certainty=>"1.00", :vendor=>"Cisco", :version=>"11.2(8)SA2"}
           fingerprint = FactoryGirl.build(:mdm_nexpose_fingerprint, :host => host, :data => fp_data)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should == 'IOS'
-          result['os.vendor'].should == 'Cisco'
+          expect(result['os.product']).to eq('IOS')
+          expect(result['os.vendor']).to eq('Cisco')
         end
 
         it 'should recognize an embedded fingerprint' do
           fp_data = {:family=>"embedded", :certainty=>"1.00", :vendor=>"Footek"}
           fingerprint = FactoryGirl.build(:mdm_nexpose_fingerprint, :host => host, :data => fp_data)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should == 'Footek'
+          expect(result['os.product']).to eq('Footek')
         end
 
         it 'should handle an unknown fingerprint' do
           fp_data = {:certainty=>"1.00", :vendor=>"Footek"}
           fingerprint = FactoryGirl.build(:mdm_nexpose_fingerprint, :host => host, :data => fp_data)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should == 'Footek'
+          expect(result['os.product']).to eq('Footek')
         end
 
 
@@ -1040,18 +1041,18 @@ describe Mdm::Host do
         it 'should recognize a Windows fingerprint' do
           fingerprint = FactoryGirl.build(:mdm_retina_fingerprint, :host => host)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should ==  'Windows Server 2003'
-          result['os.arch'].should == 'x64'
-          result['os.version'].should == 'SP2'
-          result['os.certainty'].to_f.should == 0.8
+          expect(result['os.product']).to eq( 'Windows Server 2003')
+          expect(result['os.arch']).to eq('x64')
+          expect(result['os.version']).to eq('SP2')
+          expect(result['os.certainty'].to_f).to eq(0.8)
         end
 
         it 'should otherwise jsut copy the fingerprint to os_name' do
           fp_data = { :os => 'Linux 2.6.X (i386)'}
           fingerprint = FactoryGirl.build(:mdm_retina_fingerprint, :host => host, :data => fp_data)
           result = host.send(:normalize_scanner_fp, fingerprint).first
-          result['os.product'].should ==  'Linux 2.6.X (i386)'
-          result['os.certainty'].to_f.should == 0.8
+          expect(result['os.product']).to eq( 'Linux 2.6.X (i386)')
+          expect(result['os.certainty'].to_f).to eq(0.8)
         end
       end
     end