metasploit_data_models 1.0.0.pre.rails.pre.4.0b → 1.0.0

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

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

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

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

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

@@ -1,11 +1,9 @@
-require 'spec_helper'
-
-describe Mdm::Module::Ref do
+RSpec.describe Mdm::Module::Ref, type: :model do
 
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:detail).class_name('Mdm::Module::Detail') }
+    it { is_expected.to belong_to(:detail).class_name('Mdm::Module::Detail') }
 
     # shoulda matchers don't have support for :primary_key option, so need
     # to test this association manually
@@ -34,12 +32,12 @@ describe Mdm::Module::Ref do
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:detail_id).of_type(:integer) }
-      it { should have_db_column(:name) }
+      it { is_expected.to have_db_column(:detail_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:name) }
     end
 
     context 'indices' do
-      it { should have_db_column(:detail_id) }
+      it { is_expected.to have_db_column(:detail_id) }
     end
   end
 
@@ -49,12 +47,12 @@ describe Mdm::Module::Ref do
         FactoryGirl.build :mdm_module_ref
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
   context 'validations' do
-    it { should validate_presence_of(:detail) }
-    it { should validate_presence_of(:name) }
+    it { is_expected.to validate_presence_of(:detail) }
+    it { is_expected.to validate_presence_of(:name) }
   end
 end

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

@@ -1,22 +1,20 @@
-require 'spec_helper'
-
-describe Mdm::Module::Target do
+RSpec.describe Mdm::Module::Target, type: :model do
 
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:detail).class_name('Mdm::Module::Detail') }
+    it { is_expected.to belong_to(:detail).class_name('Mdm::Module::Detail') }
   end
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:detail_id).of_type(:integer) }
-      it { should have_db_column(:index).of_type(:integer) }
-      it { should have_db_column(:name).of_type(:text) }
+      it { is_expected.to have_db_column(:detail_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:index).of_type(:integer) }
+      it { is_expected.to have_db_column(:name).of_type(:text) }
     end
 
     context 'indices' do
-      it { should have_db_index(:detail_id) }
+      it { is_expected.to have_db_index(:detail_id) }
     end
   end
 
@@ -26,13 +24,13 @@ describe Mdm::Module::Target do
         FactoryGirl.build :mdm_module_target
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
   context 'validations' do
-    it { should validate_presence_of(:detail) }
-    it { should validate_presence_of(:index) }
-    it { should validate_presence_of(:name) }
+    it { is_expected.to validate_presence_of(:detail) }
+    it { is_expected.to validate_presence_of(:index) }
+    it { is_expected.to validate_presence_of(:name) }
   end
 end

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

@@ -1,34 +1,32 @@
-require 'spec_helper'
-
-describe Mdm::NexposeConsole do
+RSpec.describe Mdm::NexposeConsole, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do
       nexpose_console = FactoryGirl.build(:mdm_nexpose_console)
-      nexpose_console.should be_valid
+      expect(nexpose_console).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(:enabled).of_type(:boolean).with_options(:default => true) }
-      it { should have_db_column(:owner).of_type(:text) }
-      it { should have_db_column(:address).of_type(:text) }
-      it { should have_db_column(:port).of_type(:integer).with_options(:default => 3780) }
-      it { should have_db_column(:username).of_type(:text) }
-      it { should have_db_column(:password).of_type(:text) }
-      it { should have_db_column(:status).of_type(:text) }
-      it { should have_db_column(:version).of_type(:text) }
-      it { should have_db_column(:cert).of_type(:text) }
-      it { should have_db_column(:cached_sites).of_type(:binary) }
-      it { should have_db_column(:name).of_type(:text) }
+      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(:address).of_type(:text) }
+      it { is_expected.to have_db_column(:port).of_type(:integer).with_options(:default => 3780) }
+      it { is_expected.to have_db_column(:username).of_type(:text) }
+      it { is_expected.to have_db_column(:password).of_type(:text) }
+      it { is_expected.to have_db_column(:status).of_type(:text) }
+      it { is_expected.to have_db_column(:version).of_type(:text) }
+      it { is_expected.to have_db_column(:cert).of_type(:text) }
+      it { is_expected.to have_db_column(:cached_sites).of_type(:binary) }
+      it { is_expected.to have_db_column(:name).of_type(:text) }
     end
   end
 
@@ -48,74 +46,74 @@ describe Mdm::NexposeConsole do
     context 'address' do
       it 'should require an address' do
         addressless_nexpose_console = FactoryGirl.build(:mdm_nexpose_console, :address => nil)
-        addressless_nexpose_console.should_not be_valid
-        addressless_nexpose_console.errors[:address].should include("can't be blank")
+        expect(addressless_nexpose_console).not_to be_valid
+        expect(addressless_nexpose_console.errors[:address]).to include("can't be blank")
       end
 
       it 'should be valid for IPv4 format' do
         ipv4_nexpose_console = FactoryGirl.build(:mdm_nexpose_console, :address => '192.168.1.120')
-        ipv4_nexpose_console.should be_valid
+        expect(ipv4_nexpose_console).to be_valid
       end
 
       it 'should be valid for IPv6 format' do
         ipv6_nexpose_console = FactoryGirl.build(:mdm_nexpose_console, :address => '2001:0db8:85a3:0000:0000:8a2e:0370:7334')
-        ipv6_nexpose_console.should be_valid
+        expect(ipv6_nexpose_console).to be_valid
       end
     end
 
     context 'port' do
       it 'should require a port' do
         portless_nexpose_console = FactoryGirl.build(:mdm_nexpose_console, :port => nil)
-        portless_nexpose_console.should_not be_valid
-        portless_nexpose_console.errors[:port].should include("is not included in the list")
+        expect(portless_nexpose_console).not_to be_valid
+        expect(portless_nexpose_console.errors[:port]).to include("is not included in the list")
       end
 
       it 'should not be valid for out-of-range numbers' do
         out_of_range = FactoryGirl.build(:mdm_nexpose_console, :port => 70000)
-        out_of_range.should_not be_valid
-        out_of_range.errors[:port].should include("is not included in the list")
+        expect(out_of_range).not_to be_valid
+        expect(out_of_range.errors[:port]).to include("is not included in the list")
       end
 
       it 'should not be valid for port 0' do
         out_of_range = FactoryGirl.build(:mdm_nexpose_console, :port => 0)
-        out_of_range.should_not be_valid
-        out_of_range.errors[:port].should include("is not included in the list")
+        expect(out_of_range).not_to be_valid
+        expect(out_of_range.errors[:port]).to include("is not included in the list")
       end
 
       it 'should not be valid for decimal numbers' do
         out_of_range = FactoryGirl.build(:mdm_nexpose_console, :port => 5.67)
-        out_of_range.should_not be_valid
-        out_of_range.errors[:port].should include("must be an integer")
+        expect(out_of_range).not_to be_valid
+        expect(out_of_range.errors[:port]).to include("must be an integer")
       end
 
       it 'should not be valid for a negative number' do
         out_of_range = FactoryGirl.build(:mdm_nexpose_console, :port => -8)
-        out_of_range.should_not be_valid
-        out_of_range.errors[:port].should include("is not included in the list")
+        expect(out_of_range).not_to be_valid
+        expect(out_of_range.errors[:port]).to include("is not included in the list")
       end
     end
 
     context 'name' do
       it 'should require a name' do
         unnamed_console = FactoryGirl.build(:mdm_nexpose_console, :name => nil)
-        unnamed_console.should_not be_valid
-        unnamed_console.errors[:name].should include("can't be blank")
+        expect(unnamed_console).not_to be_valid
+        expect(unnamed_console.errors[:name]).to include("can't be blank")
       end
     end
 
     context 'username' do
       it 'should require a name' do
         console = FactoryGirl.build(:mdm_nexpose_console, :username => nil)
-        console.should_not be_valid
-        console.errors[:username].should include("can't be blank")
+        expect(console).not_to be_valid
+        expect(console.errors[:username]).to include("can't be blank")
       end
     end
 
     context 'password' do
       it 'should require a password' do
         console = FactoryGirl.build(:mdm_nexpose_console, :password => nil)
-        console.should_not be_valid
-        console.errors[:password].should include("can't be blank")
+        expect(console).not_to be_valid
+        expect(console.errors[:password]).to include("can't be blank")
       end
     end
 

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

@@ -1,31 +1,29 @@
-require 'spec_helper'
-
-describe Mdm::Note do
+RSpec.describe Mdm::Note, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do
       note = FactoryGirl.build(:mdm_note)
-      note.should be_valid
+      expect(note).to be_valid
     end
   end
 
   context 'database' do
 
     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
 
     context 'columns' do
-      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(:vuln_id).of_type(:integer) }
-      it { should have_db_column(:ntype).of_type(:string) }
-      it { should have_db_column(:critical).of_type(:boolean) }
-      it { should have_db_column(:seen).of_type(:boolean) }
-      it { should have_db_column(:data).of_type(:text) }
+      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(:vuln_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:ntype).of_type(:string) }
+      it { is_expected.to have_db_column(:critical).of_type(:boolean) }
+      it { is_expected.to have_db_column(:seen).of_type(:boolean) }
+      it { is_expected.to have_db_column(:data).of_type(:text) }
     end
   end
 
@@ -42,10 +40,10 @@ describe Mdm::Note do
   end
 
   context 'associations' do
-    it { should belong_to(:workspace).class_name('Mdm::Workspace') }
-    it { should belong_to(:host).class_name('Mdm::Host') }
-    it { should belong_to(:service).class_name('Mdm::Service') }
-    it { should belong_to(:vuln).class_name('Mdm::Vuln') }
+    it { is_expected.to belong_to(:workspace).class_name('Mdm::Workspace') }
+    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
+    it { is_expected.to belong_to(:service).class_name('Mdm::Service') }
+    it { is_expected.to belong_to(:vuln).class_name('Mdm::Vuln') }
   end
 
   context 'scopes' do
@@ -54,16 +52,16 @@ describe Mdm::Note do
         flagged_note = FactoryGirl.create(:mdm_note, :critical => true, :seen => false)
         non_critical_note = FactoryGirl.create(:mdm_note, :critical => false, :seen => false)
         flagged_set = Mdm::Note.flagged
-        flagged_set.should include(flagged_note)
-        flagged_set.should_not include(non_critical_note)
+        expect(flagged_set).to include(flagged_note)
+        expect(flagged_set).not_to include(non_critical_note)
       end
 
       it 'should exclude seen notes' do
         flagged_note = FactoryGirl.create(:mdm_note, :critical => true, :seen => false)
         non_critical_note = FactoryGirl.create(:mdm_note, :critical => false, :seen => true)
         flagged_set = Mdm::Note.flagged
-        flagged_set.should include(flagged_note)
-        flagged_set.should_not include(non_critical_note)
+        expect(flagged_set).to include(flagged_note)
+        expect(flagged_set).not_to include(non_critical_note)
       end
     end
 
@@ -72,15 +70,15 @@ describe Mdm::Note do
         flagged_note = FactoryGirl.create(:mdm_note, :ntype => 'flag.me', :critical => true, :seen => false)
         webform_note = FactoryGirl.create(:mdm_note, :ntype => 'web.form', :critical => true, :seen => false)
         visible_set = Mdm::Note.visible
-        visible_set.should include(flagged_note)
-        visible_set.should_not include(webform_note)
+        expect(visible_set).to include(flagged_note)
+        expect(visible_set).not_to include(webform_note)
       end
     end
 
     context 'search' do
       it 'should match on ntype' do
         flagged_note = FactoryGirl.create(:mdm_note, :ntype => 'flag.me', :critical => true, :seen => false)
-        Mdm::Note.search('flag.me').should include(flagged_note)
+        expect(Mdm::Note.search('flag.me')).to include(flagged_note)
       end
     end
   end

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

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

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Mdm::Ref do
+RSpec.describe Mdm::Ref, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
@@ -29,23 +27,23 @@ describe Mdm::Ref do
     end
 
     # @todo https://www.pivotaltracker.com/story/show/48915453
-    it { should have_many(:vulns_refs).class_name('Mdm::VulnRef') }
-    it { should have_many(:vulns).class_name('Mdm::Vuln').through(:vulns_refs) }
+    it { is_expected.to have_many(:vulns_refs).class_name('Mdm::VulnRef') }
+    it { is_expected.to have_many(:vulns).class_name('Mdm::Vuln').through(:vulns_refs) }
   end
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:name).of_type(:string) }
-      it { should have_db_column(:ref_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:name).of_type(:string) }
+      it { is_expected.to have_db_column(:ref_id).of_type(:integer) }
 
       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(:name) }
+      it { is_expected.to have_db_index(:name) }
     end
   end
 
@@ -55,7 +53,7 @@ describe Mdm::Ref do
         FactoryGirl.build :mdm_ref
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
@@ -70,5 +68,4 @@ describe Mdm::Ref do
       }.to raise_error(ActiveRecord::RecordNotFound)
     end
   end
-
 end