metasploit_data_models 0.24.4 → 0.24.5

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

@@ -1,15 +1,17 @@
-RSpec.describe Mdm::HostTag, type: :model do
+require 'spec_helper'
+
+describe Mdm::HostTag do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
-    it { is_expected.to belong_to(:tag).class_name('Mdm::Tag') }
+    it { should belong_to(:host).class_name('Mdm::Host') }
+    it { should belong_to(:tag).class_name('Mdm::Tag') }
   end
 
   context 'database' do
     context 'columns' do
-      it { is_expected.to have_db_column(:host_id).of_type(:integer) }
-      it { is_expected.to have_db_column(:tag_id).of_type(:integer) }
+      it { should have_db_column(:host_id).of_type(:integer) }
+      it { should have_db_column(:tag_id).of_type(:integer) }
     end
   end
 
@@ -19,7 +21,7 @@ RSpec.describe Mdm::HostTag, type: :model do
         FactoryGirl.build(:mdm_host_tag)
       end
 
-      it { is_expected.to be_valid }
+      it { should be_valid }
     end
   end
 

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

@@ -1,35 +1,37 @@
-RSpec.describe Mdm::Listener, type: :model do
+require 'spec_helper'
+
+describe Mdm::Listener do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { is_expected.to belong_to(:workspace).class_name('Mdm::Workspace') }
-    it { is_expected.to belong_to(:task).class_name('Mdm::Task') }
+    it { should belong_to(:workspace).class_name('Mdm::Workspace') }
+    it { should belong_to(:task).class_name('Mdm::Task') }
   end
 
   context 'database' do
 
     context 'timestamps'do
-      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 { 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) }
     end
 
     context 'columns' do
-      it { is_expected.to have_db_column(:workspace_id).of_type(:integer).with_options(:null => false, :default =>1) }
-      it { is_expected.to have_db_column(:task_id).of_type(:integer) }
-      it { is_expected.to have_db_column(:enabled).of_type(:boolean).with_options(:default => true) }
-      it { is_expected.to have_db_column(:owner).of_type(:text) }
-      it { is_expected.to have_db_column(:payload).of_type(:text) }
-      it { is_expected.to have_db_column(:address).of_type(:text) }
-      it { is_expected.to have_db_column(:port).of_type(:integer) }
-      it { is_expected.to have_db_column(:options).of_type(:binary) }
-      it { is_expected.to have_db_column(:macro).of_type(:text) }
+      it { should have_db_column(:workspace_id).of_type(:integer).with_options(:null => false, :default =>1) }
+      it { should have_db_column(:task_id).of_type(:integer) }
+      it { should have_db_column(:enabled).of_type(:boolean).with_options(:default => true) }
+      it { should have_db_column(:owner).of_type(:text) }
+      it { should have_db_column(:payload).of_type(:text) }
+      it { should have_db_column(:address).of_type(:text) }
+      it { should have_db_column(:port).of_type(:integer) }
+      it { should have_db_column(:options).of_type(:binary) }
+      it { should have_db_column(:macro).of_type(:text) }
     end
   end
 
   context 'factory' do
     it 'should be valid' do
       listener = FactoryGirl.build(:mdm_listener)
-      expect(listener).to be_valid
+      listener.should be_valid
     end
   end
 
@@ -49,55 +51,55 @@ RSpec.describe Mdm::Listener, type: :model do
     context 'port' do
       it 'should require a port' do
         portless_listener = FactoryGirl.build(:mdm_listener, :port => nil)
-        expect(portless_listener).not_to be_valid
-        expect(portless_listener.errors[:port]).to include("can't be blank")
+        portless_listener.should_not be_valid
+        portless_listener.errors[:port].should include("can't be blank")
       end
 
       it 'should not be valid for out-of-range numbers' do
         out_of_range = FactoryGirl.build(:mdm_listener, :port => 70000)
-        expect(out_of_range).not_to be_valid
-        expect(out_of_range.errors[:port]).to include("is not included in the list")
+        out_of_range.should_not be_valid
+        out_of_range.errors[:port].should include("is not included in the list")
       end
 
       it 'should not be valid for port 0' do
         out_of_range = FactoryGirl.build(:mdm_listener, :port => 0)
-        expect(out_of_range).not_to be_valid
-        expect(out_of_range.errors[:port]).to include("is not included in the list")
+        out_of_range.should_not be_valid
+        out_of_range.errors[:port].should include("is not included in the list")
       end
 
       it 'should not be valid for decimal numbers' do
         out_of_range = FactoryGirl.build(:mdm_listener, :port => 5.67)
-        expect(out_of_range).not_to be_valid
-        expect(out_of_range.errors[:port]).to include("must be an integer")
+        out_of_range.should_not be_valid
+        out_of_range.errors[:port].should include("must be an integer")
       end
 
       it 'should not be valid for a negative number' do
         out_of_range = FactoryGirl.build(:mdm_listener, :port => -8)
-        expect(out_of_range).not_to be_valid
-        expect(out_of_range.errors[:port]).to include("is not included in the list")
+        out_of_range.should_not be_valid
+        out_of_range.errors[:port].should include("is not included in the list")
       end
     end
 
     context 'address' do
       it 'should require an address' do
         addressless_listener = FactoryGirl.build(:mdm_listener, :address => nil)
-        expect(addressless_listener).not_to be_valid
-        expect(addressless_listener.errors[:address]).to include("can't be blank")
+        addressless_listener.should_not be_valid
+        addressless_listener.errors[:address].should include("can't be blank")
       end
 
       it 'should be valid for IPv4 format' do
         ipv4_listener = FactoryGirl.build(:mdm_listener, :address => '192.168.1.120')
-        expect(ipv4_listener).to be_valid
+        ipv4_listener.should be_valid
       end
 
       it 'should be valid for IPv6 format' do
         ipv6_listener = FactoryGirl.build(:mdm_listener, :address => '2001:0db8:85a3:0000:0000:8a2e:0370:7334')
-        expect(ipv6_listener).to be_valid
+        ipv6_listener.should be_valid
       end
 
       it 'should not be valid for strings not conforming to IPv4 or IPv6' do
         invalid_listener = FactoryGirl.build(:mdm_listener, :address => '1234-fark')
-        expect(invalid_listener).not_to be_valid
+        invalid_listener.should_not be_valid
       end
 
     end

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

@@ -1,37 +1,39 @@
-RSpec.describe Mdm::Loot, type: :model do
+require 'spec_helper'
+
+describe Mdm::Loot do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { is_expected.to belong_to(:workspace).class_name('Mdm::Workspace') }
-    it { is_expected.to belong_to(:service).class_name('Mdm::Service') }
-    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
-    it { is_expected.to belong_to(:module_run).class_name('MetasploitDataModels::ModuleRun') }
+    it { should belong_to(:workspace).class_name('Mdm::Workspace') }
+    it { should belong_to(:service).class_name('Mdm::Service') }
+    it { should belong_to(:host).class_name('Mdm::Host') }
+    it { should belong_to(:module_run).class_name('MetasploitDataModels::ModuleRun') }
   end
 
   context 'database' do
 
     context 'timestamps'do
-      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 { 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) }
     end
 
     context 'columns' do
-      it { is_expected.to have_db_column(:workspace_id).of_type(:integer).with_options(:null => false, :default =>1) }
-      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(:ltype).of_type(:string) }
-      it { is_expected.to have_db_column(:path).of_type(:string) }
-      it { is_expected.to have_db_column(:data).of_type(:text) }
-      it { is_expected.to have_db_column(:content_type).of_type(:string) }
-      it { is_expected.to have_db_column(:name).of_type(:text) }
-      it { is_expected.to have_db_column(:info).of_type(:text) }
+      it { should have_db_column(:workspace_id).of_type(:integer).with_options(:null => false, :default =>1) }
+      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(:ltype).of_type(:string) }
+      it { should have_db_column(:path).of_type(:string) }
+      it { should have_db_column(:data).of_type(:text) }
+      it { should have_db_column(:content_type).of_type(:string) }
+      it { should have_db_column(:name).of_type(:text) }
+      it { should have_db_column(:info).of_type(:text) }
     end
   end
 
   context 'factory' do
     it 'should be valid' do
       loot = FactoryGirl.build(:mdm_loot)
-      expect(loot).to be_valid
+      loot.should be_valid
     end
   end
 
@@ -51,17 +53,17 @@ RSpec.describe Mdm::Loot, type: :model do
     context 'search' do
       it 'should match on ltype' do
         myloot = FactoryGirl.create(:mdm_loot, :ltype => 'find.this.ltype')
-        expect(Mdm::Loot.search('find.this.ltype')).to include(myloot)
+        Mdm::Loot.search('find.this.ltype').should include(myloot)
       end
 
       it 'should match on name' do
         myloot = FactoryGirl.create(:mdm_loot, :name => 'Find This')
-        expect(Mdm::Loot.search('Find This')).to include(myloot)
+        Mdm::Loot.search('Find This').should include(myloot)
       end
 
       it 'should match on info' do
         myloot = FactoryGirl.create(:mdm_loot, :info => 'Find This')
-        expect(Mdm::Loot.search('Find This')).to include(myloot)
+        Mdm::Loot.search('Find This').should include(myloot)
       end
     end
   end
@@ -70,7 +72,7 @@ RSpec.describe Mdm::Loot, type: :model do
     context 'before_destroy' do
       it 'should call #delete_file' do
         myloot =  FactoryGirl.create(:mdm_loot)
-        expect(myloot).to receive(:delete_file)
+        myloot.should_receive(:delete_file)
         myloot.destroy
       end
     end

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

@@ -1,3 +1,5 @@
-RSpec.describe Mdm::Macro, type: :model do
+require 'spec_helper'
+
+describe Mdm::Macro do
   it_should_behave_like 'Metasploit::Concern.run'
 end

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

@@ -1,3 +1,5 @@
-RSpec.describe Mdm::ModRef, type: :model do
+require 'spec_helper'
+
+describe Mdm::ModRef do
   it_should_behave_like 'Metasploit::Concern.run'
 end

data/spec/app/models/mdm/module/action_spec.rb

@@ -1,19 +1,21 @@
-RSpec.describe Mdm::Module::Action, type: :model do
+require 'spec_helper'
+
+describe Mdm::Module::Action do
 
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { is_expected.to belong_to(:detail).class_name('Mdm::Module::Detail') }
+    it { should belong_to(:detail).class_name('Mdm::Module::Detail') }
   end
 
   context 'database' do
     context 'columns' do
-      it { is_expected.to have_db_column(:detail_id).of_type(:integer) }
-      it { is_expected.to have_db_column(:name).of_type(:text) }
+      it { should have_db_column(:detail_id).of_type(:integer) }
+      it { should have_db_column(:name).of_type(:text) }
     end
 
     context 'indices' do
-      it { is_expected.to have_db_index(:detail_id) }
+      it { should have_db_index(:detail_id) }
     end
   end
 
@@ -23,17 +25,17 @@ RSpec.describe Mdm::Module::Action, type: :model do
         FactoryGirl.build(:mdm_module_action)
       end
 
-      it { is_expected.to be_valid }
+      it { should be_valid }
     end
   end
 
   context 'mass assignment security' do
-    it { is_expected.not_to allow_mass_assignment_of(:detail_id) }
-    it { is_expected.to allow_mass_assignment_of(:name) }
+    it { should_not allow_mass_assignment_of(:detail_id) }
+    it { should allow_mass_assignment_of(:name) }
   end
 
   context 'validations' do
-    it { is_expected.to validate_presence_of(:detail) }
-    it { is_expected.to validate_presence_of(:name) }
+    it { should validate_presence_of(:detail) }
+    it { should validate_presence_of(:name) }
   end
 end

data/spec/app/models/mdm/module/arch_spec.rb

@@ -1,19 +1,21 @@
-RSpec.describe Mdm::Module::Arch, type: :model do
+require 'spec_helper'
+
+describe Mdm::Module::Arch do
 
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { is_expected.to belong_to(:detail).class_name('Mdm::Module::Detail') }
+    it { should belong_to(:detail).class_name('Mdm::Module::Detail') }
   end
 
   context 'database' do
     context 'columns' do
-      it { is_expected.to have_db_column(:detail_id).of_type(:integer) }
-      it { is_expected.to have_db_column(:name).of_type(:text) }
+      it { should have_db_column(:detail_id).of_type(:integer) }
+      it { should have_db_column(:name).of_type(:text) }
     end
 
     context 'indices' do
-      it { is_expected.to have_db_index(:detail_id) }
+      it { should have_db_index(:detail_id) }
     end
   end
 
@@ -23,17 +25,17 @@ RSpec.describe Mdm::Module::Arch, type: :model do
         FactoryGirl.build(:mdm_module_arch)
       end
 
-      it { is_expected.to be_valid }
+      it { should be_valid }
     end
   end
 
   context 'mass assignment security' do
-    it { is_expected.not_to allow_mass_assignment_of(:detail_id) }
-    it { is_expected.to allow_mass_assignment_of(:name) }
+    it { should_not allow_mass_assignment_of(:detail_id) }
+    it { should allow_mass_assignment_of(:name) }
   end
 
   context 'validations' do
-    it { is_expected.to validate_presence_of(:detail) }
-    it { is_expected.to validate_presence_of(:name) }
+    it { should validate_presence_of(:detail) }
+    it { should validate_presence_of(:name) }
   end
 end

data/spec/app/models/mdm/module/author_spec.rb

@@ -1,20 +1,22 @@
-RSpec.describe Mdm::Module::Author, type: :model do
+require 'spec_helper'
+
+describe Mdm::Module::Author do
 
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { is_expected.to belong_to(:detail).class_name('Mdm::Module::Detail') }
+    it { should belong_to(:detail).class_name('Mdm::Module::Detail') }
   end
 
   context 'database' do
     context 'columns' do
-      it { is_expected.to have_db_column(:detail_id).of_type(:integer) }
-      it { is_expected.to have_db_column(:name).of_type(:text) }
-      it { is_expected.to have_db_column(:email).of_type(:text) }
+      it { should have_db_column(:detail_id).of_type(:integer) }
+      it { should have_db_column(:name).of_type(:text) }
+      it { should have_db_column(:email).of_type(:text) }
     end
 
     context 'indices' do
-      it { is_expected.to have_db_index(:detail_id) }
+      it { should have_db_index(:detail_id) }
     end
   end
 
@@ -24,15 +26,8 @@ RSpec.describe Mdm::Module::Author, type: :model do
         FactoryGirl.build :full_mdm_module_author
       end
 
-      it { is_expected.to be_valid }
-
-      context 'email' do
-        subject(:email) {
-          full_mdm_module_author.email
-        }
-
-        it { is_expected.not_to be_nil }
-      end
+      it { should be_valid }
+      its(:email) { should_not be_nil }
     end
 
     context 'mdm_module_author' do
@@ -40,19 +35,19 @@ RSpec.describe Mdm::Module::Author, type: :model do
         FactoryGirl.build :mdm_module_author
       end
 
-      it { is_expected.to be_valid }
+      it { should be_valid }
     end
   end
 
   context 'mass assignment security' do
-    it { is_expected.not_to allow_mass_assignment_of(:detail_id) }
-    it { is_expected.to allow_mass_assignment_of(:email) }
-    it { is_expected.to allow_mass_assignment_of(:name) }
+    it { should_not allow_mass_assignment_of(:detail_id) }
+    it { should allow_mass_assignment_of(:email) }
+    it { should allow_mass_assignment_of(:name) }
   end
 
   context 'validations' do
-    it { is_expected.to validate_presence_of(:detail) }
-    it { is_expected.not_to validate_presence_of(:email) }
-    it { is_expected.to validate_presence_of(:name) }
+    it { should validate_presence_of(:detail) }
+    it { should_not validate_presence_of(:email) }
+    it { should validate_presence_of(:name) }
   end
 end

data/spec/app/models/mdm/module/detail_spec.rb

@@ -1,4 +1,6 @@
-RSpec.describe Mdm::Module::Detail, type: :model do
+require 'spec_helper'
+
+describe Mdm::Module::Detail do
   subject(:detail) do
     FactoryGirl.build(
         :mdm_module_detail,
@@ -48,13 +50,13 @@ RSpec.describe Mdm::Module::Detail, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { is_expected.to have_many(:actions).class_name('Mdm::Module::Action').dependent(:destroy) }
-    it { is_expected.to have_many(:archs).class_name('Mdm::Module::Arch').dependent(:destroy) }
-    it { is_expected.to have_many(:authors).class_name('Mdm::Module::Author').dependent(:destroy) }
-    it { is_expected.to have_many(:mixins).class_name('Mdm::Module::Mixin').dependent(:destroy) }
-    it { is_expected.to have_many(:platforms).class_name('Mdm::Module::Platform').dependent(:destroy) }
-    it { is_expected.to have_many(:refs).class_name('Mdm::Module::Ref').dependent(:destroy) }
-    it { is_expected.to have_many(:targets).class_name('Mdm::Module::Target').dependent(:destroy) }
+    it { should have_many(:actions).class_name('Mdm::Module::Action').dependent(:destroy) }
+    it { should have_many(:archs).class_name('Mdm::Module::Arch').dependent(:destroy) }
+    it { should have_many(:authors).class_name('Mdm::Module::Author').dependent(:destroy) }
+    it { should have_many(:mixins).class_name('Mdm::Module::Mixin').dependent(:destroy) }
+    it { should have_many(:platforms).class_name('Mdm::Module::Platform').dependent(:destroy) }
+    it { should have_many(:refs).class_name('Mdm::Module::Ref').dependent(:destroy) }
+    it { should have_many(:targets).class_name('Mdm::Module::Target').dependent(:destroy) }
   end
 
   context 'CONSTANTS' do
@@ -63,29 +65,12 @@ RSpec.describe Mdm::Module::Detail, type: :model do
         described_class::DIRECTORY_BY_TYPE
       end
 
-      it "maps 'auxiliary' to 'auxiliary'" do
-        expect(directory_by_type['auxiliary']).to eq('auxiliary')
-      end
-      
-      it "maps 'encoder' to 'encoders'" do
-        expect(directory_by_type['encoder']).to eq('encoders')
-      end
-      
-      it "maps 'exploit' to 'exploits'" do
-        expect(directory_by_type['exploit']).to eq('exploits')
-      end
-      
-      it "maps 'nop' to 'nops'" do
-        expect(directory_by_type['nop']).to eq('nops')
-      end
-      
-      it "maps 'payload' to 'payloads'" do
-        expect(directory_by_type['payload']).to eq('payloads')
-      end
-      
-      it "maps 'post' to 'post'" do
-        expect(directory_by_type['post']).to eq('post')
-      end
+      its(['auxiliary']) { should == 'auxiliary' }
+      its(['encoder']) { should == 'encoders' }
+      its(['exploit']) { should == 'exploits' }
+      its(['nop']) { should == 'nops' }
+      its(['payload']) { should == 'payloads' }
+      its(['post']) { should == 'post' }
     end
 
     context 'PRIVILEGES' do
@@ -94,8 +79,8 @@ RSpec.describe Mdm::Module::Detail, type: :model do
       end
 
       it 'should contain both Boolean values' do
-        expect(privileges).to include(false)
-        expect(privileges).to include(true)
+        privileges.should include(false)
+        privileges.should include(true)
       end
     end
 
@@ -104,33 +89,13 @@ RSpec.describe Mdm::Module::Detail, type: :model do
         described_class::RANK_BY_NAME
       end
 
-      it "maps 'Manual' to 0" do
-        expect(rank_by_name['Manual']).to eq(0)
-      end
-
-      it "maps 'Low' to 100" do
-        expect(rank_by_name['Low']).to eq(100)
-      end
-
-      it "maps 'Average' to 200" do
-        expect(rank_by_name['Average']).to eq(200)
-      end
-
-      it "maps 'Normal' to 300" do
-        expect(rank_by_name['Normal']).to eq(300)
-      end
-
-      it "maps 'Good' to 400" do
-        expect(rank_by_name['Good']).to eq(400)
-      end
-
-      it "maps 'Great' to 500" do
-        expect(rank_by_name['Great']).to eq(500)
-      end
-
-      it "maps 'Excellent' to 600" do
-        expect(rank_by_name['Excellent']).to eq(600)
-      end
+      its(['Manual']) { should == 0 }
+      its(['Low']) { should == 100 }
+      its(['Average']) { should == 200 }
+      its(['Normal']) { should == 300 }
+      its(['Good']) { should == 400 }
+      its(['Great']) { should == 500 }
+      its(['Excellent']) { should == 600 }
     end
 
     context 'STANCES' do
@@ -138,34 +103,34 @@ RSpec.describe Mdm::Module::Detail, type: :model do
         described_class::STANCES
       end
 
-      it { is_expected.to include('aggressive') }
-      it { is_expected.to include('passive') }
+      it { should include('aggressive') }
+      it { should include('passive') }
     end
   end
 
   context 'database' do
     context 'columns' do
-      it { is_expected.to have_db_column(:default_target).of_type(:integer) }
-      it { is_expected.to have_db_column(:description).of_type(:text) }
-      it { is_expected.to have_db_column(:disclosure_date).of_type(:datetime)}
-      it { is_expected.to have_db_column(:file).of_type(:text) }
-      it { is_expected.to have_db_column(:fullname).of_type(:text) }
-      it { is_expected.to have_db_column(:license).of_type(:string) }
-      it { is_expected.to have_db_column(:mtime).of_type(:datetime) }
-      it { is_expected.to have_db_column(:mtype).of_type(:string) }
-      it { is_expected.to have_db_column(:name).of_type(:text) }
-      it { is_expected.to have_db_column(:privileged).of_type(:boolean) }
-      it { is_expected.to have_db_column(:rank).of_type(:integer) }
-      it { is_expected.to have_db_column(:ready).of_type(:boolean) }
-      it { is_expected.to have_db_column(:refname).of_type(:text) }
-      it { is_expected.to have_db_column(:stance).of_type(:string).with_options(:null => true) }
+      it { should have_db_column(:default_target).of_type(:integer) }
+      it { should have_db_column(:description).of_type(:text) }
+      it { should have_db_column(:disclosure_date).of_type(:datetime)}
+      it { should have_db_column(:file).of_type(:text) }
+      it { should have_db_column(:fullname).of_type(:text) }
+      it { should have_db_column(:license).of_type(:string) }
+      it { should have_db_column(:mtime).of_type(:datetime) }
+      it { should have_db_column(:mtype).of_type(:string) }
+      it { should have_db_column(:name).of_type(:text) }
+      it { should have_db_column(:privileged).of_type(:boolean) }
+      it { should have_db_column(:rank).of_type(:integer) }
+      it { should have_db_column(:ready).of_type(:boolean) }
+      it { should have_db_column(:refname).of_type(:text) }
+      it { should have_db_column(:stance).of_type(:string).with_options(:null => true) }
     end
 
     context 'indices' do
-      it { is_expected.to have_db_index(:description) }
-      it { is_expected.to have_db_index(:mtype) }
-      it { is_expected.to have_db_index(:name) }
-      it { is_expected.to have_db_index(:refname) }
+      it { should have_db_index(:description) }
+      it { should have_db_index(:mtype) }
+      it { should have_db_index(:name) }
+      it { should have_db_index(:refname) }
     end
   end
 
@@ -175,7 +140,7 @@ RSpec.describe Mdm::Module::Detail, type: :model do
         FactoryGirl.build(:mdm_module_detail)
       end
 
-      it { is_expected.to be_valid }
+      it { should be_valid }
 
       context 'stance' do
         subject(:mdm_module_detail) do
@@ -187,23 +152,10 @@ RSpec.describe Mdm::Module::Detail, type: :model do
             'exploit'
           end
 
-          it { is_expected.to be_valid }
-
-          context '#stance' do
-            subject(:stance) {
-              mdm_module_detail.stance
-            }
+          it { should be_valid }
 
-            it { is_expected.not_to be_nil }
-          end
-
-          context '#supports_stance?' do
-            subject(:supports_stance?) {
-              mdm_module_detail.supports_stance?
-            }
-
-            it { is_expected.to eq(true) }
-          end
+          its(:stance) { should_not be_nil }
+          its(:supports_stance?) { should be_true }
         end
 
         context 'without supports_stance?' do
@@ -211,40 +163,27 @@ RSpec.describe Mdm::Module::Detail, type: :model do
             'post'
           end
 
-          it { is_expected.to be_valid }
-
-          context '#stance' do
-            subject(:stance) {
-              mdm_module_detail.stance
-            }
+          it { should be_valid }
 
-            it { is_expected.to be_nil }
-          end
-
-          context '#supports_stance?' do
-            subject(:supports_stance?) {
-              mdm_module_detail.supports_stance?
-            }
-
-            it { is_expected.to eq(false) }
-          end
+          its(:stance) { should be_nil }
+          its(:supports_stance?) { should be_false }
         end
       end
     end
   end
 
   context 'validations' do
-    it { is_expected.to ensure_inclusion_of(:mtype).in_array(types) }
+    it { should ensure_inclusion_of(:mtype).in_array(types) }
 
     # Because the boolean field will cast most strings to false,
     # ensure_inclusion_of(:privileged).in_array([true, false]) will fail on the disallowed values check.
 
     context 'rank' do
-      it { is_expected.to validate_numericality_of(:rank).only_integer }
-      it { is_expected.to ensure_inclusion_of(:rank).in_array(ranks) }
+      it { should validate_numericality_of(:rank).only_integer }
+      it { should ensure_inclusion_of(:rank).in_array(ranks) }
     end
 
-    it { is_expected.to validate_presence_of(:refname) }
+    it { should validate_presence_of(:refname) }
 
     context 'stance' do
       context 'mtype' do
@@ -286,13 +225,9 @@ RSpec.describe Mdm::Module::Detail, type: :model do
           detail.actions.last
         end
 
-        it { is_expected.to be_valid }
+        it { should be_valid }
 
-        context '#name' do
-          it 'is name passed to add_action' do
-            expect(module_action.name).to eq(name)
-          end
-        end
+        its(:name) { should == name }
       end
     end
 
@@ -318,13 +253,9 @@ RSpec.describe Mdm::Module::Detail, type: :model do
           detail.archs.last
         end
 
-        it { is_expected.to be_valid }
+        it { should be_valid }
 
-        context '#name' do
-          it 'is name passed to add_arch' do
-            expect(module_arch.name).to eq(name)
-          end
-        end
+        its(:name) { should == name }
       end
     end
 
@@ -355,19 +286,10 @@ RSpec.describe Mdm::Module::Detail, type: :model do
             detail.authors.last
           end
 
-          it { is_expected.to be_valid }
+          it { should be_valid }
 
-          context '#email' do
-            it 'is email passed to add_author' do
-              expect(module_author.email).to eq(email)
-            end
-          end
-
-          context '#name' do
-            it 'is name passed to add_author' do
-              expect(module_author.name).to eq(name)
-            end
-          end
+          its(:email) { should == email }
+          its(:name) { should == name }
         end
       end
 
@@ -389,21 +311,10 @@ RSpec.describe Mdm::Module::Detail, type: :model do
             detail.authors.last
           end
 
-          it { is_expected.to be_valid }
-
-          context '#email' do
-            subject(:module_author_email) {
-              module_author.email
-            }
-
-            it { is_expected.to be_nil }
-          end
+          it { should be_valid }
 
-          context '#name' do
-            it 'is name passed to add_author' do
-              expect(module_author.name).to eq(name)
-            end
-          end
+          its(:email) { should be_nil }
+          its(:name) { should == name }
         end
       end
     end
@@ -424,19 +335,14 @@ RSpec.describe Mdm::Module::Detail, type: :model do
       end
 
       context 'new Mdm::ModuleMixin' do
-        subject(:mdm_module_mixin) do
+        subject do
           add_mixin
 
           detail.mixins.last
         end
 
-        it { is_expected.to be_valid }
-
-        context '#name' do
-          it 'is name passed to add_mixin' do
-            expect(mdm_module_mixin.name).to eq(name)
-          end
-        end
+        it { should be_valid }
+        its(:name) { should == name }
       end
     end
 
@@ -462,13 +368,8 @@ RSpec.describe Mdm::Module::Detail, type: :model do
           detail.platforms.last
         end
 
-        it { is_expected.to be_valid }
-
-        context '#name' do
-          it 'is name passed to add_platform' do
-            expect(module_platform.name).to eq(name)
-          end
-        end
+        it { should be_valid }
+        its(:name) { should == name }
       end
     end
 
@@ -494,13 +395,8 @@ RSpec.describe Mdm::Module::Detail, type: :model do
           detail.refs.last
         end
 
-        it { is_expected.to be_valid }
-
-        context '#name' do
-          it 'is name passed to add_ref' do
-            expect(module_ref.name).to eq(name)
-          end
-        end
+        it { should be_valid }
+        its(:name) { should == name }
       end
     end
 
@@ -530,13 +426,8 @@ RSpec.describe Mdm::Module::Detail, type: :model do
           detail.targets.last
         end
 
-        it { is_expected.to be_valid }
-
-        context '#name' do
-          it 'is name passed to add_target' do
-            expect(module_target.name).to eq(name)
-          end
-        end
+        it { should be_valid }
+        its(:name) { should == name }
       end
     end
   end