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

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

@@ -1,16 +1,14 @@
-require 'spec_helper'
-
-describe Mdm::Route do
+RSpec.describe Mdm::Route, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:session).class_name('Mdm::Session') }
+    it { is_expected.to belong_to(:session).class_name('Mdm::Session') }
   end
 
   context 'factory' do
     it 'should be valid' do
       route = FactoryGirl.build(:mdm_route)
-      route.should be_valid
+      expect(route).to be_valid
     end
   end
 
@@ -28,9 +26,9 @@ describe Mdm::Route do
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:session_id).of_type(:integer) }
-      it { should have_db_column(:subnet).of_type(:string) }
-      it { should have_db_column(:netmask).of_type(:string) }
+      it { is_expected.to have_db_column(:session_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:subnet).of_type(:string) }
+      it { is_expected.to have_db_column(:netmask).of_type(:string) }
     end
   end
 

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Mdm::Service do
+RSpec.describe Mdm::Service, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'CONSTANTS' do
@@ -9,8 +7,8 @@ describe Mdm::Service do
         described_class::PROTOS
       }
 
-      it { should include 'tcp' }
-      it { should include 'udp' }
+      it { is_expected.to include 'tcp' }
+      it { is_expected.to include 'udp' }
     end
 
     context 'STATES' do
@@ -18,40 +16,40 @@ describe Mdm::Service do
         described_class::STATES
       }
 
-      it { should include 'closed' }
-      it { should include 'filtered' }
-      it { should include 'open' }
-      it { should include 'unknown' }
+      it { is_expected.to include 'closed' }
+      it { is_expected.to include 'filtered' }
+      it { is_expected.to include 'open' }
+      it { is_expected.to include 'unknown' }
     end
   end
 
   context "Associations" do
 
-    it { should have_many(:task_services).class_name('Mdm::TaskService').dependent(:destroy) }
-    it { should have_many(:tasks).class_name('Mdm::Task').through(:task_services) }
-    it { should have_many(:creds).class_name('Mdm::Cred').dependent(:destroy) }
-    it { should have_many(:exploited_hosts).class_name('Mdm::ExploitedHost').dependent(:destroy) }
-    it { should have_many(:notes).class_name('Mdm::Note').dependent(:destroy) }
-    it { should have_many(:vulns).class_name('Mdm::Vuln').dependent(:destroy) }
-    it { should have_many(:web_sites).class_name('Mdm::WebSite').dependent(:destroy) }
-    it { should have_many(:web_pages).class_name('Mdm::WebPage').through(:web_sites) }
-    it { should have_many(:web_forms).class_name('Mdm::WebForm').through(:web_sites) }
-    it { should have_many(:web_vulns).class_name('Mdm::WebVuln').through(:web_sites) }
-    it { should belong_to(:host).class_name('Mdm::Host') }
+    it { is_expected.to have_many(:task_services).class_name('Mdm::TaskService').dependent(:destroy) }
+    it { is_expected.to have_many(:tasks).class_name('Mdm::Task').through(:task_services) }
+    it { is_expected.to have_many(:creds).class_name('Mdm::Cred').dependent(:destroy) }
+    it { is_expected.to have_many(:exploited_hosts).class_name('Mdm::ExploitedHost').dependent(:destroy) }
+    it { is_expected.to have_many(:notes).class_name('Mdm::Note').dependent(:destroy) }
+    it { is_expected.to have_many(:vulns).class_name('Mdm::Vuln').dependent(:destroy) }
+    it { is_expected.to have_many(:web_sites).class_name('Mdm::WebSite').dependent(:destroy) }
+    it { is_expected.to have_many(:web_pages).class_name('Mdm::WebPage').through(:web_sites) }
+    it { is_expected.to have_many(:web_forms).class_name('Mdm::WebForm').through(:web_sites) }
+    it { is_expected.to have_many(:web_vulns).class_name('Mdm::WebVuln').through(:web_sites) }
+    it { is_expected.to belong_to(:host).class_name('Mdm::Host') }
   end
 
   context 'scopes' do
     context "inactive" do
       it "should exclude open services" do
         open_service = FactoryGirl.create(:mdm_service, :state => 'open')
-        Mdm::Service.inactive.should_not include(open_service)
+        expect(Mdm::Service.inactive).not_to include(open_service)
       end
     end
 
     context "with_state open" do
       it "should exclude closed services" do
         closed_service = FactoryGirl.create(:mdm_service, :state => 'closed')
-        Mdm::Service.with_state('open').should_not include(closed_service)
+        expect(Mdm::Service.with_state('open')).not_to include(closed_service)
       end
     end
 
@@ -60,8 +58,8 @@ describe Mdm::Service do
         tcp_service   = FactoryGirl.create(:mdm_service, proto: 'tcp')
         udp_service    =  FactoryGirl.create(:mdm_service, proto: 'udp')
         search_results = Mdm::Service.search('tcp')
-        search_results.should     include(tcp_service)
-        search_results.should_not include(udp_service)
+        expect(search_results).to     include(tcp_service)
+        expect(search_results).not_to include(udp_service)
       end
     end
   end
@@ -70,7 +68,7 @@ describe Mdm::Service do
     context 'after_save' do
       it 'should call #normalize_host_os' do
         svc = FactoryGirl.create(:mdm_service)
-        svc.should_receive(:normalize_host_os)
+        expect(svc).to receive(:normalize_host_os)
         svc.run_callbacks(:save)
       end
     end
@@ -79,7 +77,7 @@ describe Mdm::Service do
   context 'factory' do
     it 'should be valid' do
       service = FactoryGirl.build(:mdm_service)
-      service.should be_valid
+      expect(service).to be_valid
     end
   end
 
@@ -98,24 +96,24 @@ describe Mdm::Service do
   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(:host_id).of_type(:integer) }
-      it { should have_db_column(:port).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:proto).of_type(:string).with_options(:null => false) }
-      it { should have_db_column(:state).of_type(:string) }
-      it { should have_db_column(:name).of_type(:string) }
-      it { should have_db_column(:info).of_type(:text) }
+      it { is_expected.to have_db_column(:host_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:port).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:proto).of_type(:string).with_options(:null => false) }
+      it { is_expected.to have_db_column(:state).of_type(:string) }
+      it { is_expected.to have_db_column(:name).of_type(:string) }
+      it { is_expected.to have_db_column(:info).of_type(:text) }
     end
 
     context 'indices' do
-      it { should have_db_index(:name) }
-      it { should have_db_index(:port) }
-      it { should have_db_index(:proto) }
-      it { should have_db_index(:state) }
+      it { is_expected.to have_db_index(:name) }
+      it { is_expected.to have_db_index(:port) }
+      it { is_expected.to have_db_index(:proto) }
+      it { is_expected.to have_db_index(:state) }
     end
   end
 
@@ -151,8 +149,8 @@ describe Mdm::Service do
       FactoryGirl.build(:mdm_service)
     }
 
-    it { should validate_numericality_of(:port).only_integer }
-    it { should validate_inclusion_of(:proto).in_array(described_class::PROTOS) }
+    it { is_expected.to validate_numericality_of(:port).only_integer }
+    it { is_expected.to validate_inclusion_of(:proto).in_array(described_class::PROTOS) }
 
     context 'when a duplicate service already exists' do
       let(:service1) { FactoryGirl.create(:mdm_service)}

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

@@ -1,16 +1,14 @@
-require 'spec_helper'
-
-describe Mdm::SessionEvent do
+RSpec.describe Mdm::SessionEvent, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:session).class_name('Mdm::Session') }
+    it { is_expected.to belong_to(:session).class_name('Mdm::Session') }
   end
 
   context 'factory' do
     it 'should be valid' do
       session_event = FactoryGirl.build(:mdm_session_event)
-      session_event.should be_valid
+      expect(session_event).to be_valid
     end
   end
 
@@ -28,16 +26,16 @@ describe Mdm::SessionEvent do
 
   context 'database' do
     context 'timestamps'do
-      it { should have_db_column(:created_at).of_type(:datetime) }
+      it { is_expected.to have_db_column(:created_at).of_type(:datetime) }
     end
 
     context 'columns' do
-      it { should have_db_column(:session_id).of_type(:integer) }
-      it { should have_db_column(:etype).of_type(:string) }
-      it { should have_db_column(:command).of_type(:binary) }
-      it { should have_db_column(:output).of_type(:binary) }
-      it { should have_db_column(:remote_path).of_type(:string) }
-      it { should have_db_column(:local_path).of_type(:string) }
+      it { is_expected.to have_db_column(:session_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:etype).of_type(:string) }
+      it { is_expected.to have_db_column(:command).of_type(:binary) }
+      it { is_expected.to have_db_column(:output).of_type(:binary) }
+      it { is_expected.to have_db_column(:remote_path).of_type(:string) }
+      it { is_expected.to have_db_column(:local_path).of_type(:string) }
     end
   end
 

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

@@ -1,12 +1,10 @@
-require 'spec_helper'
-
-describe Mdm::Session do
+RSpec.describe Mdm::Session, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do
       session = FactoryGirl.build(:mdm_session)
-      session.should be_valid
+      expect(session).to be_valid
     end
   end
 
@@ -61,8 +59,8 @@ describe Mdm::Session do
         alive_session = FactoryGirl.create(:mdm_session)
         dead_session = FactoryGirl.create(:mdm_session, :closed_at => Time.now)
         alive_set = Mdm::Session.alive
-        alive_set.should include(alive_session)
-        alive_set.should_not include(dead_session)
+        expect(alive_set).to include(alive_session)
+        expect(alive_set).not_to include(dead_session)
       end
     end
 
@@ -71,8 +69,8 @@ describe Mdm::Session do
         alive_session = FactoryGirl.create(:mdm_session)
         dead_session = FactoryGirl.create(:mdm_session, :closed_at => Time.now)
         dead_set = Mdm::Session.dead
-        dead_set.should_not include(alive_session)
-        dead_set.should include(dead_session)
+        expect(dead_set).not_to include(alive_session)
+        expect(dead_set).to include(dead_session)
       end
     end
 
@@ -82,9 +80,9 @@ describe Mdm::Session do
         linux_shell = FactoryGirl.create(:mdm_session, :stype => 'shell', :platform => 'Linux')
         win_meterp = FactoryGirl.create(:mdm_session, :stype => 'meterpreter', :platform => 'Windows')
         upgrade_set = Mdm::Session.upgradeable
-        upgrade_set.should include(win_shell)
-        upgrade_set.should_not include(linux_shell)
-        upgrade_set.should_not include(win_meterp)
+        expect(upgrade_set).to include(win_shell)
+        expect(upgrade_set).not_to include(linux_shell)
+        expect(upgrade_set).not_to include(win_meterp)
       end
     end
   end
@@ -93,7 +91,7 @@ describe Mdm::Session do
     context 'before_destroy' do
       it 'should call #stop' do
         mysession = FactoryGirl.create(:mdm_session)
-        mysession.should_receive(:stop)
+        expect(mysession).to receive(:stop)
         mysession.destroy
       end
     end
@@ -103,17 +101,17 @@ describe Mdm::Session do
     context '#upgradeable?' do
       it 'should return true for windows shells' do
         win_shell = FactoryGirl.create(:mdm_session, :stype => 'shell', :platform => 'Windows')
-        win_shell.upgradeable?.should == true
+        expect(win_shell.upgradeable?).to eq(true)
       end
 
       it 'should return false for non-windows shells' do
         linux_shell = FactoryGirl.create(:mdm_session, :stype => 'shell', :platform => 'Linux')
-        linux_shell.upgradeable?.should == false
+        expect(linux_shell.upgradeable?).to eq(false)
       end
 
       it 'should return false for Windows Meterpreter Sessions' do
         win_meterp = FactoryGirl.create(:mdm_session, :stype => 'meterpreter', :platform => 'Windows')
-        win_meterp.upgradeable?.should == false
+        expect(win_meterp.upgradeable?).to eq(false)
       end
     end
   end

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

@@ -1,29 +1,28 @@
-require 'spec_helper'
 require 'securerandom'
 
-describe Mdm::Tag do
+RSpec.describe Mdm::Tag, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should have_many(:hosts_tags).class_name('Mdm::HostTag') }
-    it { should have_many(:hosts).class_name('Mdm::Host').through(:hosts_tags) }
-    it { should belong_to(:user).class_name('Mdm::User') }
+    it { is_expected.to have_many(:hosts_tags).class_name('Mdm::HostTag') }
+    it { is_expected.to have_many(:hosts).class_name('Mdm::Host').through(:hosts_tags) }
+    it { is_expected.to belong_to(:user).class_name('Mdm::User') }
   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(:user_id).of_type(:integer) }
-      it { should have_db_column(:name).of_type(:string) }
-      it { should have_db_column(:desc).of_type(:text) }
-      it { should have_db_column(:report_summary).of_type(:boolean).with_options(:null => false, :default =>false) }
-      it { should have_db_column(:report_detail).of_type(:boolean).with_options(:null => false, :default =>false) }
-      it { should have_db_column(:critical).of_type(:boolean).with_options(:null => false, :default =>false) }
+      it { is_expected.to have_db_column(:user_id).of_type(:integer) }
+      it { is_expected.to have_db_column(:name).of_type(:string) }
+      it { is_expected.to have_db_column(:desc).of_type(:text) }
+      it { is_expected.to have_db_column(:report_summary).of_type(:boolean).with_options(:null => false, :default =>false) }
+      it { is_expected.to have_db_column(:report_detail).of_type(:boolean).with_options(:null => false, :default =>false) }
+      it { is_expected.to have_db_column(:critical).of_type(:boolean).with_options(:null => false, :default =>false) }
     end
   end
 
@@ -32,37 +31,37 @@ describe Mdm::Tag do
       it 'should not ba valid for a length over 8k' do
         desc = SecureRandom.hex(9001) #over 9000?!
         large_tag = FactoryGirl.build(:mdm_tag, :desc => desc)
-        large_tag.should_not be_valid
-        large_tag.errors[:desc].should include('desc must be less than 8k.')
+        expect(large_tag).not_to be_valid
+        expect(large_tag.errors[:desc]).to include('desc must be less than 8k.')
       end
     end
 
     context 'name' do
       it 'must be present' do
         nameless_tag = FactoryGirl.build(:mdm_tag, :name => nil)
-        nameless_tag.should_not be_valid
-        nameless_tag.errors[:name].should include("can't be blank")
+        expect(nameless_tag).not_to be_valid
+        expect(nameless_tag.errors[:name]).to include("can't be blank")
       end
 
       it 'may only contain alphanumerics, dot, dashes, and underscores' do
         mytag = FactoryGirl.build(:mdm_tag, :name => 'A.1-B_2')
-        mytag.should be_valid
+        expect(mytag).to be_valid
         #Test for various bad inputs we should never allow
         mytag = FactoryGirl.build(:mdm_tag, :name => "A'1")
-        mytag.should_not be_valid
-        mytag.errors[:name].should include('must be alphanumeric, dots, dashes, or underscores')
+        expect(mytag).not_to be_valid
+        expect(mytag.errors[:name]).to include('must be alphanumeric, dots, dashes, or underscores')
         mytag = FactoryGirl.build(:mdm_tag, :name => "A;1")
-        mytag.should_not be_valid
-        mytag.errors[:name].should include('must be alphanumeric, dots, dashes, or underscores')
+        expect(mytag).not_to be_valid
+        expect(mytag.errors[:name]).to include('must be alphanumeric, dots, dashes, or underscores')
         mytag = FactoryGirl.build(:mdm_tag, :name => "A%1")
-        mytag.should_not be_valid
-        mytag.errors[:name].should include('must be alphanumeric, dots, dashes, or underscores')
+        expect(mytag).not_to be_valid
+        expect(mytag.errors[:name]).to include('must be alphanumeric, dots, dashes, or underscores')
         mytag = FactoryGirl.build(:mdm_tag, :name => "A=1")
-        mytag.should_not be_valid
-        mytag.errors[:name].should include('must be alphanumeric, dots, dashes, or underscores')
+        expect(mytag).not_to be_valid
+        expect(mytag.errors[:name]).to include('must be alphanumeric, dots, dashes, or underscores')
         mytag = FactoryGirl.build(:mdm_tag, :name => "#A1")
-        mytag.should_not be_valid
-        mytag.errors[:name].should include('must be alphanumeric, dots, dashes, or underscores')
+        expect(mytag).not_to be_valid
+        expect(mytag.errors[:name]).to include('must be alphanumeric, dots, dashes, or underscores')
       end
     end
   end
@@ -71,7 +70,7 @@ describe Mdm::Tag do
     context '#to_s' do
       it 'should return the name of the tag as a string' do
         mytag = FactoryGirl.build(:mdm_tag, :name => 'mytag')
-        mytag.to_s.should == 'mytag'
+        expect(mytag.to_s).to eq('mytag')
       end
     end
   end
@@ -82,7 +81,7 @@ describe Mdm::Tag do
         FactoryGirl.build(:mdm_tag)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 

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

@@ -1,25 +1,23 @@
-require 'spec_helper'
-
-describe Mdm::TaskCred do
+RSpec.describe Mdm::TaskCred, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'factory' do
     it 'should be valid' do
       task_cred = FactoryGirl.build(:mdm_task_cred)
-      task_cred.should be_valid
+      expect(task_cred).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(:task_id).of_type(:integer).with_options(:null => false) }
-      it { should have_db_column(:cred_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:task_id).of_type(:integer).with_options(:null => false) }
+      it { is_expected.to have_db_column(:cred_id).of_type(:integer).with_options(:null => false) }
     end
   end
 
@@ -36,8 +34,8 @@ describe Mdm::TaskCred do
   end
 
   context "Associations" do
-    it { should belong_to(:task).class_name('Mdm::Task') }
-    it { should belong_to(:cred).class_name('Mdm::Cred') }
+    it { is_expected.to belong_to(:task).class_name('Mdm::Task') }
+    it { is_expected.to belong_to(:cred).class_name('Mdm::Cred') }
   end
 
   context "validations" do
@@ -46,7 +44,7 @@ describe Mdm::TaskCred do
       cred = FactoryGirl.build(:mdm_cred)
       FactoryGirl.create(:mdm_task_cred, :task => task, :cred => cred)
       task_cred2 = FactoryGirl.build(:mdm_task_cred, :task => task, :cred => cred)
-      task_cred2.should_not be_valid
+      expect(task_cred2).not_to be_valid
     end
   end