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

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Mdm::VulnRef do
+RSpec.describe Mdm::VulnRef, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factories' do
@@ -9,27 +7,27 @@ describe Mdm::VulnRef do
         FactoryGirl.build(:mdm_vuln_ref)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:id).of_type(:integer) }
-      it { should have_db_column(:ref_id).of_type(:integer) }
-      it { should have_db_column(:vuln_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:id).of_type(:integer) }
+      it { is_expected.to have_db_column(:ref_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:vuln_id).of_type(:integer) }
     end
   end
 
   context 'associations' do
-    it { should belong_to(:vuln).class_name('Mdm::Vuln') }
-    it { should belong_to(:ref).class_name('Mdm::Ref') }
+    it { is_expected.to belong_to(:vuln).class_name('Mdm::Vuln') }
+    it { is_expected.to belong_to(:ref).class_name('Mdm::Ref') }
   end
 
   context 'factory' do
     it 'should be valid' do
       vuln_ref = FactoryGirl.build(:mdm_vuln_ref)
-      vuln_ref.should be_valid
+      expect(vuln_ref).to be_valid
     end
   end
 

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Mdm::Vuln do
+RSpec.describe Mdm::Vuln, type: :model do
   subject(:vuln) do
     FactoryGirl.build(:mdm_vuln)
   end
@@ -44,7 +42,7 @@ describe Mdm::Vuln do
     it { is_expected.to have_many(:notes).class_name('Mdm::Note').dependent(:delete_all).order('notes.created_at') }
 
     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::Refs' do
         let(:names) do
@@ -114,8 +112,8 @@ describe Mdm::Vuln do
                   module_details << module_ref.detail
                 end
 
-                vuln.module_details.count.should < module_details.length
-                module_details.uniq.count.should == vuln.module_details.count
+                expect(vuln.module_details.count).to be < module_details.length
+                expect(module_details.uniq.count).to eq(vuln.module_details.count)
               end
             end
           end
@@ -126,20 +124,20 @@ describe Mdm::Vuln do
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:exploited_at).of_type(:datetime) }
-      it { should have_db_column(:host_id).of_type(:integer) }
-      it { should have_db_column(:info).of_type(:string) }
-      it { should have_db_column(:name).of_type(:string) }
-      it { should have_db_column(:service_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:exploited_at).of_type(:datetime) }
+      it { is_expected.to have_db_column(:host_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:info).of_type(:string) }
+      it { is_expected.to have_db_column(:name).of_type(:string) }
+      it { is_expected.to have_db_column(:service_id).of_type(:integer) }
 
       context 'counter caches' do
-        it { should have_db_column(:vuln_attempt_count).of_type(:integer).with_options(:default => 0) }
-        it { should have_db_column(:vuln_detail_count).of_type(:integer).with_options(:default => 0) }
+        it { is_expected.to have_db_column(:vuln_attempt_count).of_type(:integer).with_options(:default => 0) }
+        it { is_expected.to have_db_column(:vuln_detail_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
   end
@@ -150,7 +148,7 @@ describe Mdm::Vuln do
         FactoryGirl.build(:mdm_host_vuln)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
 
     context 'mdm_service_vuln' do
@@ -158,7 +156,7 @@ describe Mdm::Vuln do
         FactoryGirl.build(:mdm_service_vuln)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
 
     context 'mdm_vuln' do
@@ -166,7 +164,7 @@ describe Mdm::Vuln do
         FactoryGirl.build(:mdm_vuln)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
@@ -197,7 +195,7 @@ describe Mdm::Vuln do
               end
 
               it 'should match Mdm::Vuln' do
-                results.should =~ [vuln]
+                expect(results).to match_array [vuln]
               end
             end
 
@@ -207,7 +205,7 @@ describe Mdm::Vuln do
               end
 
               it 'should not match Mdm::Vuln' do
-                results.should be_empty
+                expect(results).to be_empty
               end
             end
           end
@@ -219,7 +217,7 @@ describe Mdm::Vuln do
               end
 
               it 'should match Mdm::Vuln' do
-                results.should =~ [vuln]
+                expect(results).to match_array [vuln]
               end
             end
 
@@ -229,7 +227,7 @@ describe Mdm::Vuln do
               end
 
               it 'should not match Mdm::Vuln' do
-                results.should be_empty
+                expect(results).to be_empty
               end
             end
 
@@ -239,7 +237,7 @@ describe Mdm::Vuln do
               end
 
               it 'should match Mdm::Vuln' do
-                results.should =~ [vuln]
+                expect(results).to match_array [vuln]
               end
             end
 
@@ -249,7 +247,7 @@ describe Mdm::Vuln do
               end
 
               it 'should not match Mdm::Vuln' do
-                results.should be_empty
+                expect(results).to be_empty
               end
             end
           end
@@ -259,7 +257,7 @@ describe Mdm::Vuln do
   end
 
   context 'validations' do
-    it { should validate_presence_of :name }
+    it { is_expected.to validate_presence_of :name }
 
     context "invalid" do
       let(:mdm_vuln) do
@@ -270,7 +268,7 @@ describe Mdm::Vuln do
         str = Faker::Lorem.characters(256)
         mdm_vuln.name = str
         mdm_vuln.valid?
-        mdm_vuln.errors[:name][0].should include "is too long"
+        expect(mdm_vuln.errors[:name][0]).to include "is too long"
       end
     end
   end

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

@@ -1,36 +1,34 @@
-require 'spec_helper'
-
-describe Mdm::WebForm do
+RSpec.describe Mdm::WebForm, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:web_site).class_name('Mdm::WebSite') }
+    it { is_expected.to belong_to(:web_site).class_name('Mdm::WebSite') }
   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(:web_site_id).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:path).of_type(:text) }
-      it { should have_db_column(:method).of_type(:string) }
-      it { should have_db_column(:params).of_type(:text) }
-      it { should have_db_column(:query).of_type(:text) }
+      it { is_expected.to have_db_column(:web_site_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:path).of_type(:text) }
+      it { is_expected.to have_db_column(:method).of_type(:string) }
+      it { is_expected.to have_db_column(:params).of_type(:text) }
+      it { is_expected.to have_db_column(:query).of_type(:text) }
     end
 
     context 'indices' do
-      it { should have_db_index(:path) }
+      it { is_expected.to have_db_index(:path) }
     end
   end
 
   context 'factory' do
     it 'should be valid' do
       web_form = FactoryGirl.build(:mdm_web_form)
-      web_form.should be_valid
+      expect(web_form).to be_valid
     end
   end
 

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

@@ -1,44 +1,42 @@
-require 'spec_helper'
-
-describe Mdm::WebPage do
+RSpec.describe Mdm::WebPage, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:web_site).class_name('Mdm::WebSite') }
+    it { is_expected.to belong_to(:web_site).class_name('Mdm::WebSite') }
   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 { should have_db_column(:mtime).of_type(:datetime) }
+      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) }
+      it { is_expected.to have_db_column(:mtime).of_type(:datetime) }
     end
 
     context 'columns' do
-      it { should have_db_column(:web_site_id).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:path).of_type(:text) }
-      it { should have_db_column(:query).of_type(:text) }
-      it { should have_db_column(:code).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:cookie).of_type(:text) }
-      it { should have_db_column(:auth).of_type(:text) }
-      it { should have_db_column(:ctype).of_type(:text) }
-      it { should have_db_column(:location).of_type(:text) }
-      it { should have_db_column(:headers).of_type(:text) }
-      it { should have_db_column(:body).of_type(:binary) }
-      it { should have_db_column(:request).of_type(:binary) }
+      it { is_expected.to have_db_column(:web_site_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:path).of_type(:text) }
+      it { is_expected.to have_db_column(:query).of_type(:text) }
+      it { is_expected.to have_db_column(:code).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:cookie).of_type(:text) }
+      it { is_expected.to have_db_column(:auth).of_type(:text) }
+      it { is_expected.to have_db_column(:ctype).of_type(:text) }
+      it { is_expected.to have_db_column(:location).of_type(:text) }
+      it { is_expected.to have_db_column(:headers).of_type(:text) }
+      it { is_expected.to have_db_column(:body).of_type(:binary) }
+      it { is_expected.to have_db_column(:request).of_type(:binary) }
     end
 
     context 'indices' do
-      it { should have_db_index(:path) }
-      it { should have_db_index(:query) }
+      it { is_expected.to have_db_index(:path) }
+      it { is_expected.to have_db_index(:query) }
     end
   end
 
   context 'factory' do
     it 'should be valid' do
       web_page = FactoryGirl.build(:mdm_web_page)
-      web_page.should be_valid
+      expect(web_page).to be_valid
     end
   end
 

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

@@ -1,33 +1,31 @@
-require 'spec_helper'
-
-describe Mdm::WebSite do
+RSpec.describe Mdm::WebSite, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do
       web_site = FactoryGirl.build(:mdm_web_site)
-      web_site.should be_valid
+      expect(web_site).to be_valid
     end
   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(:service_id).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:vhost).of_type(:string) }
-      it { should have_db_column(:comments).of_type(:text) }
-      it { should have_db_column(:options).of_type(:text) }
+      it { is_expected.to have_db_column(:service_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:vhost).of_type(:string) }
+      it { is_expected.to have_db_column(:comments).of_type(:text) }
+      it { is_expected.to have_db_column(:options).of_type(:text) }
     end
 
     context 'indices' do
-      it { should have_db_index(:comments) }
-      it { should have_db_index(:options) }
-      it { should have_db_index(:vhost) }
+      it { is_expected.to have_db_index(:comments) }
+      it { is_expected.to have_db_index(:options) }
+      it { is_expected.to have_db_index(:vhost) }
     end
   end
 
@@ -44,10 +42,10 @@ describe Mdm::WebSite do
   end
   
   context 'associations' do
-    it { should belong_to(:service).class_name('Mdm::Service') }
-    it { should have_many(:web_forms).class_name('Mdm::WebForm').dependent(:destroy) }
-    it { should have_many(:web_pages).class_name('Mdm::WebPage').dependent(:destroy) }
-    it { should have_many(:web_vulns).class_name('Mdm::WebVuln').dependent(:destroy) }
+    it { is_expected.to belong_to(:service).class_name('Mdm::Service') }
+    it { is_expected.to have_many(:web_forms).class_name('Mdm::WebForm').dependent(:destroy) }
+    it { is_expected.to have_many(:web_pages).class_name('Mdm::WebPage').dependent(:destroy) }
+    it { is_expected.to have_many(:web_vulns).class_name('Mdm::WebVuln').dependent(:destroy) }
   end
 
   context 'methods' do
@@ -56,9 +54,9 @@ describe Mdm::WebSite do
         mysite = FactoryGirl.create(:mdm_web_site)
         FactoryGirl.create(:mdm_web_form, :web_site => mysite)
         FactoryGirl.create(:mdm_web_form, :web_site => mysite)
-        mysite.form_count.should == 2
+        expect(mysite.form_count).to eq(2)
         FactoryGirl.create(:mdm_web_form, :web_site => mysite)
-        mysite.form_count.should == 3
+        expect(mysite.form_count).to eq(3)
       end
     end
 
@@ -67,9 +65,9 @@ describe Mdm::WebSite do
         mysite = FactoryGirl.create(:mdm_web_site)
         FactoryGirl.create(:mdm_web_page, :web_site => mysite)
         FactoryGirl.create(:mdm_web_page, :web_site => mysite)
-        mysite.page_count.should == 2
+        expect(mysite.page_count).to eq(2)
         FactoryGirl.create(:mdm_web_page, :web_site => mysite)
-        mysite.page_count.should == 3
+        expect(mysite.page_count).to eq(3)
       end
     end
 
@@ -78,9 +76,9 @@ describe Mdm::WebSite do
         mysite = FactoryGirl.create(:mdm_web_site)
         FactoryGirl.create(:mdm_web_vuln, :web_site => mysite)
         FactoryGirl.create(:mdm_web_vuln, :web_site => mysite)
-        mysite.vuln_count.should == 2
+        expect(mysite.vuln_count).to eq(2)
         FactoryGirl.create(:mdm_web_vuln, :web_site => mysite)
-        mysite.vuln_count.should == 3
+        expect(mysite.vuln_count).to eq(3)
       end
     end
   end

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Mdm::WebVuln do
+RSpec.describe Mdm::WebVuln, type: :model do
   let(:confidence_range) do
     0 .. 100
   end
@@ -29,20 +27,20 @@ describe Mdm::WebVuln do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:web_site).class_name('Mdm::WebSite') }
+    it { is_expected.to belong_to(:web_site).class_name('Mdm::WebSite') }
   end
 
   context 'CONSTANTS' do
     it 'should define CONFIDENCE_RANGE' do
-      described_class::CONFIDENCE_RANGE.should == confidence_range
+      expect(described_class::CONFIDENCE_RANGE).to eq(confidence_range)
     end
 
     it 'should define METHODS in any order' do
-      described_class::METHODS.should =~ methods
+      expect(described_class::METHODS).to match_array methods
     end
 
     it 'should define RISK_RANGE' do
-      described_class::RISK_RANGE.should == risk_range
+      expect(described_class::RISK_RANGE).to eq(risk_range)
     end
   end
 
@@ -60,33 +58,33 @@ describe Mdm::WebVuln do
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:blame).of_type(:text) }
-      it { should have_db_column(:category).of_type(:text).with_options(:null => false) }
-      it { should have_db_column(:confidence).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:description).of_type(:text) }
-      it { should have_db_column(:method).of_type(:string).with_options(:limit => 1024, :null => false) }
-      it { should have_db_column(:name).of_type(:string).with_options(:limit => 1024, :null => false) }
-      it { should have_db_column(:owner).of_type(:string) }
-      it { should have_db_column(:params).of_type(:text).with_options(:null => false) }
-      it { should have_db_column(:path).of_type(:text).with_options(:null => false) }
-      it { should have_db_column(:payload).of_type(:text) }
-      it { should have_db_column(:pname).of_type(:text) }
-      it { should have_db_column(:proof).of_type(:binary).with_options(:null => false) }
-      it { should have_db_column(:query).of_type(:text) }
-      it { should have_db_column(:request).of_type(:binary) }
-      it { should have_db_column(:risk).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:web_site_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:blame).of_type(:text) }
+      it { is_expected.to have_db_column(:category).of_type(:text).with_options(:null => false) }
+      it { is_expected.to have_db_column(:confidence).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:description).of_type(:text) }
+      it { is_expected.to have_db_column(:method).of_type(:string).with_options(:limit => 1024, :null => false) }
+      it { is_expected.to have_db_column(:name).of_type(:string).with_options(:limit => 1024, :null => false) }
+      it { is_expected.to have_db_column(:owner).of_type(:string) }
+      it { is_expected.to have_db_column(:params).of_type(:text).with_options(:null => false) }
+      it { is_expected.to have_db_column(:path).of_type(:text).with_options(:null => false) }
+      it { is_expected.to have_db_column(:payload).of_type(:text) }
+      it { is_expected.to have_db_column(:pname).of_type(:text) }
+      it { is_expected.to have_db_column(:proof).of_type(:binary).with_options(:null => false) }
+      it { is_expected.to have_db_column(:query).of_type(:text) }
+      it { is_expected.to have_db_column(:request).of_type(:binary) }
+      it { is_expected.to have_db_column(:risk).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:web_site_id).of_type(:integer).with_options(:null => false) }
 
       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
     end
 
     context 'indices' do
-      it { should have_db_index(:method) }
-      it { should have_db_index(:name) }
-      it { should have_db_index(:path) }
+      it { is_expected.to have_db_index(:method) }
+      it { is_expected.to have_db_index(:name) }
+      it { is_expected.to have_db_index(:path) }
     end
   end
 
@@ -96,7 +94,7 @@ describe Mdm::WebVuln do
         FactoryGirl.build(:mdm_web_vuln)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       context 'after reloading' do
         before(:each) do
@@ -104,21 +102,21 @@ describe Mdm::WebVuln do
           mdm_web_vuln.reload
         end
 
-        it { should be_valid }
+        it { is_expected.to be_valid }
       end
     end
   end
 
   context 'validations' do
-    it { should validate_presence_of :category }
-    it { should ensure_inclusion_of(:confidence).in_range(confidence_range) }
-    it { should ensure_inclusion_of(:method).in_array(methods) }
-    it { should validate_presence_of :name }
-    it { should validate_presence_of :path }
+    it { is_expected.to validate_presence_of :category }
+    it { is_expected.to ensure_inclusion_of(:confidence).in_range(confidence_range) }
+    it { is_expected.to ensure_inclusion_of(:method).in_array(methods) }
+    it { is_expected.to validate_presence_of :name }
+    it { is_expected.to validate_presence_of :path }
 
     context 'params' do
       it 'should not validate presence of params because it default to [] and can never be nil' do
-        web_vuln.should_not validate_presence_of(:params)
+        expect(web_vuln).not_to validate_presence_of(:params)
       end
 
       context 'validates parameters' do
@@ -129,9 +127,9 @@ describe Mdm::WebVuln do
         it 'should validate params is an Array' do
           web_vuln.params = ''
 
-          web_vuln.params.should_not be_an Array
-          web_vuln.should_not be_valid
-          web_vuln.errors[:params].should include(
+          expect(web_vuln.params).not_to be_an Array
+          expect(web_vuln).not_to be_valid
+          expect(web_vuln.errors[:params]).to include(
                                               "is not an Array.  #{type_signature_sentence}"
                                           )
         end
@@ -140,7 +138,7 @@ describe Mdm::WebVuln do
           web_vuln.params = []
           web_vuln.valid?
 
-          web_vuln.errors[:params].should be_empty
+          expect(web_vuln.errors[:params]).to be_empty
         end
 
         context 'with bad element' do
@@ -158,12 +156,12 @@ describe Mdm::WebVuln do
             end
 
             it 'should not be an Array' do
-              web_vuln.params.first.should_not be_an Array
+              expect(web_vuln.params.first).not_to be_an Array
             end
 
             it 'should validate elements of params are Arrays' do
-              web_vuln.should_not be_valid
-              web_vuln.errors[:params].should include(
+              expect(web_vuln).not_to be_valid
+              expect(web_vuln.errors[:params]).to include(
                                                   "has non-Array at index #{index} (#{element.inspect}).  " \
                                                   "#{type_signature_sentence}"
                                               )
@@ -176,12 +174,12 @@ describe Mdm::WebVuln do
             end
 
             it 'should have length < 2' do
-              web_vuln.params.first.length.should < 2
+              expect(web_vuln.params.first.length).to be < 2
             end
 
             it 'should validate elements of params are not too short' do
-              web_vuln.should_not be_valid
-              web_vuln.errors[:params].should include(
+              expect(web_vuln).not_to be_valid
+              expect(web_vuln.errors[:params]).to include(
                                                   "has too few elements at index #{index} (#{element.inspect}).  " \
                                                   "#{type_signature_sentence}"
                                               )
@@ -194,12 +192,12 @@ describe Mdm::WebVuln do
             end
 
             it 'should have length > 2' do
-              web_vuln.params.first.length.should > 2
+              expect(web_vuln.params.first.length).to be > 2
             end
 
             it 'should validate elements of params are not too long' do
-              web_vuln.should_not be_valid
-              web_vuln.errors[:params].should include(
+              expect(web_vuln).not_to be_valid
+              expect(web_vuln.errors[:params]).to include(
                                                   "has too many elements at index #{index} (#{element.inspect}).  " \
                                                   "#{type_signature_sentence}"
                                               )
@@ -218,12 +216,12 @@ describe Mdm::WebVuln do
                 end
 
                 it 'should have blank parameter name' do
-                  web_vuln.params.first.first.should be_empty
+                  expect(web_vuln.params.first.first).to be_empty
                 end
 
                 it 'should validate that parameter name is not empty' do
-                  web_vuln.should_not be_valid
-                  web_vuln.errors[:params].should include(
+                  expect(web_vuln).not_to be_valid
+                  expect(web_vuln.errors[:params]).to include(
                                                       "has blank parameter name at index #{index} " \
                                                       "(#{element.inspect}).  " \
                                                       "#{type_signature_sentence}"
@@ -238,12 +236,12 @@ describe Mdm::WebVuln do
               end
 
               it 'should not have String for parameter name' do
-                web_vuln.params.first.first.should_not be_a String
+                expect(web_vuln.params.first.first).not_to be_a String
               end
 
               it 'should validate that parameter name is a String' do
-                web_vuln.should_not be_valid
-                web_vuln.errors[:params].should include(
+                expect(web_vuln).not_to be_valid
+                expect(web_vuln.errors[:params]).to include(
                                                     "has non-String parameter name (#{parameter_name.inspect}) " \
                                                     "at index #{index} (#{element.inspect}).  " \
                                                     "#{type_signature_sentence}"
@@ -263,12 +261,12 @@ describe Mdm::WebVuln do
               end
 
               it 'should not have String for parameter name' do
-                web_vuln.params.first.second.should_not be_a String
+                expect(web_vuln.params.first.second).not_to be_a String
               end
 
               it 'should validate that parameter value is a String' do
-                web_vuln.should_not be_valid
-                web_vuln.errors[:params].should include(
+                expect(web_vuln).not_to be_valid
+                expect(web_vuln.errors[:params]).to include(
                                                     "has non-String parameter value (#{parameter_value}) " \
                                                     "at index #{index} (#{element.inspect}).  " \
                                                     "#{type_signature_sentence}"
@@ -280,13 +278,13 @@ describe Mdm::WebVuln do
       end
     end
 
-    it { should validate_presence_of :proof }
-    it { should ensure_inclusion_of(:risk).in_range(risk_range) }
-    it { should validate_presence_of :web_site }
+    it { is_expected.to validate_presence_of :proof }
+    it { is_expected.to ensure_inclusion_of(:risk).in_range(risk_range) }
+    it { is_expected.to validate_presence_of :web_site }
   end
 
   context 'serializations' do
-    it { should serialize(:params).as_instance_of(MetasploitDataModels::Base64Serializer) }
+    it { is_expected.to serialize(:params).as_instance_of(MetasploitDataModels::Base64Serializer) }
   end
 
   context '#params' do
@@ -299,12 +297,12 @@ describe Mdm::WebVuln do
     end
 
     it 'should default to []' do
-      params.should == default
+      expect(params).to eq(default)
     end
 
     it 'should return default if set to nil' do
       web_vuln.params = nil
-      web_vuln.params.should == default
+      expect(web_vuln.params).to eq(default)
     end
 
     it 'should return default if set to nil and saved' do
@@ -312,7 +310,7 @@ describe Mdm::WebVuln do
       web_vuln.params = nil
       web_vuln.save!
 
-      web_vuln.params.should == default
+      expect(web_vuln.params).to eq(default)
     end
   end
 end