metasploit_data_models 0.24.4 → 0.24.5

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

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

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

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

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

@@ -1,4 +1,6 @@
-RSpec.describe Mdm::Workspace, type: :model do
+require 'spec_helper'
+
+describe Mdm::Workspace do
   subject(:workspace) do
     FactoryGirl.build(:mdm_workspace)
   end
@@ -12,7 +14,7 @@ RSpec.describe Mdm::Workspace, type: :model do
   context 'factory' do
     it 'should be valid' do
       workspace = FactoryGirl.build(:mdm_workspace)
-      expect(workspace).to be_valid
+      workspace.should be_valid
     end
   end
 
@@ -38,27 +40,27 @@ RSpec.describe Mdm::Workspace, type: :model do
   end
 
   context 'associations' do
-    it { is_expected.to have_many(:clients).class_name('Mdm::Client').through(:hosts) }
-    it { is_expected.to have_many(:creds).class_name('Mdm::Cred').through(:services) }
-    it { is_expected.to have_many(:events).class_name('Mdm::Event') }
-    it { is_expected.to have_many(:exploited_hosts).class_name('Mdm::ExploitedHost').through(:hosts) }
-    it { is_expected.to have_many(:hosts).class_name('Mdm::Host') }
-    it { is_expected.to have_many(:listeners).class_name('Mdm::Listener').dependent(:destroy) }
-    it { is_expected.to have_many(:loots).class_name('Mdm::Loot').through(:hosts) }
-    it { is_expected.to have_many(:notes).class_name('Mdm::Note') }
-    it { is_expected.to belong_to(:owner).class_name('Mdm::User').with_foreign_key('owner_id') }
-    it { is_expected.to have_many(:services).class_name('Mdm::Service').through(:hosts).with_foreign_key('service_id') }
-    it { is_expected.to have_many(:sessions).class_name('Mdm::Session').through(:hosts) }
-    it { is_expected.to have_many(:tasks).class_name('Mdm::Task').dependent(:destroy).order('created_at DESC') }
-    it { is_expected.to have_and_belong_to_many(:users).class_name('Mdm::User') }
-    it { is_expected.to have_many(:vulns).class_name('Mdm::Vuln').through(:hosts) }
+    it { should have_many(:clients).class_name('Mdm::Client').through(:hosts) }
+    it { should have_many(:creds).class_name('Mdm::Cred').through(:services) }
+    it { should have_many(:events).class_name('Mdm::Event') }
+    it { should have_many(:exploited_hosts).class_name('Mdm::ExploitedHost').through(:hosts) }
+    it { should have_many(:hosts).class_name('Mdm::Host') }
+    it { should have_many(:listeners).class_name('Mdm::Listener').dependent(:destroy) }
+    it { should have_many(:loots).class_name('Mdm::Loot').through(:hosts) }
+    it { should have_many(:notes).class_name('Mdm::Note') }
+    it { should belong_to(:owner).class_name('Mdm::User').with_foreign_key('owner_id') }
+    it { should have_many(:services).class_name('Mdm::Service').through(:hosts).with_foreign_key('service_id') }
+    it { should have_many(:sessions).class_name('Mdm::Session').through(:hosts) }
+    it { should have_many(:tasks).class_name('Mdm::Task').dependent(:destroy).order('created_at DESC') }
+    it { should have_and_belong_to_many(:users).class_name('Mdm::User') }
+    it { should have_many(:vulns).class_name('Mdm::Vuln').through(:hosts) }
   end
 
   context 'callbacks' do
     context 'before_save' do
       context '#normalize' do
         it 'should be called' do
-          expect(workspace).to receive(:normalize)
+          workspace.should_receive(:normalize)
           workspace.run_callbacks(:save, false)
         end
       end
@@ -66,21 +68,21 @@ RSpec.describe Mdm::Workspace, type: :model do
   end
 
   context 'columns' do
-    it { is_expected.to have_db_column(:boundary).of_type(:string).with_options(:limit => 4 * (2 ** 10)) }
-    it { is_expected.to have_db_column(:description).of_type(:string).with_options(:limit => 4 * (2 ** 10)) }
-    it { is_expected.to have_db_column(:limit_to_network).of_type(:boolean).with_options(:default => false, :null => false) }
-    it { is_expected.to have_db_column(:name).of_type(:string) }
-    it { is_expected.to have_db_column(:owner_id).of_type(:integer) }
+    it { should have_db_column(:boundary).of_type(:string).with_options(:limit => 4 * (2 ** 10)) }
+    it { should have_db_column(:description).of_type(:string).with_options(:limit => 4 * (2 ** 10)) }
+    it { should have_db_column(:limit_to_network).of_type(:boolean).with_options(:default => false, :null => false) }
+    it { should have_db_column(:name).of_type(:string) }
+    it { should have_db_column(:owner_id).of_type(:integer) }
 
     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
   end
 
   context 'CONSTANTS' do
     it 'should define the DEFAULT name' do
-      expect(described_class::DEFAULT).to eq(default)
+      described_class::DEFAULT.should == default
     end
   end
 
@@ -99,8 +101,8 @@ RSpec.describe Mdm::Workspace, type: :model do
         workspace.valid?
       end
 
-      it 'should validate using #valid_ip_or_range?' do
-        expect(workspace).to receive(:valid_ip_or_range?).with(boundary).and_return(false)
+      it 'should validate using #valid_ip_or_range?', :pending => 'https://www.pivotaltracker.com/story/show/43244445'  do
+        workspace.should_receive(:valid_ip_or_range?).with(boundary).and_return(false)
 
         workspace.valid?
       end
@@ -111,7 +113,7 @@ RSpec.describe Mdm::Workspace, type: :model do
         end
 
         it 'should not record an error' do
-          expect(workspace.errors[:boundary]).not_to include(error)
+          workspace.errors[:boundary].should_not include(error)
         end
       end
 
@@ -121,7 +123,7 @@ RSpec.describe Mdm::Workspace, type: :model do
         end
 
         it 'should not record an error' do
-          expect(workspace.errors[:boundary]).not_to include(error)
+          workspace.errors[:boundary].should_not include(error)
         end
       end
 
@@ -131,20 +133,20 @@ RSpec.describe Mdm::Workspace, type: :model do
         end
 
         it 'should record error that boundary must be a valid IP range', :pending => 'https://www.pivotaltracker.com/story/show/43171927' do
-          expect(workspace).not_to be_valid
-          expect(workkspace.errors[:boundary]).to include(error)
+          workspace.should_not be_valid
+          workkspace.errors[:boundary].should include(error)
         end
       end
     end
 
     context 'description' do
-      it { is_expected.to ensure_length_of(:description).is_at_most(4 * (2 ** 10)) }
+      it { should ensure_length_of(:description).is_at_most(4 * (2 ** 10)) }
     end
 
     context 'name' do
-      it { is_expected.to ensure_length_of(:name).is_at_most(2**8 - 1) }
-      it { is_expected.to validate_presence_of :name }
-      it { is_expected.to validate_uniqueness_of :name }
+      it { should ensure_length_of(:name).is_at_most(2**8 - 1) }
+      it { should validate_presence_of :name }
+      it { should validate_uniqueness_of :name }
     end
   end
 
@@ -210,25 +212,27 @@ RSpec.describe Mdm::Workspace, type: :model do
         # to_a to make query return instances
         found_creds = workspace.creds.to_a
 
-        expect(found_creds.length).to be > 0
+        found_creds.length.should > 0
+        found_cred = found_creds.first
+
+      end
+
+      it 'should include hosts' do
+        found_creds = workspace.creds.to_a
 
-        expect(
-            found_creds.none? { |found_cred|
-              found_cred.service.nil?
-            }
-        ).to eq(true)
+        found_creds.length.should > 0
+        found_cred = found_creds.first
+        service = found_cred.service
       end
 
       it 'should return only Mdm::Creds from hosts in workspace' do
         found_creds = workspace.creds
 
-        expect(found_creds.length).to eq(creds.length)
+        found_creds.length.should == creds.length
 
-        expect(
-            found_creds.all? { |cred|
-              cred.service.host.workspace == workspace
-            }
-        ).to eq(true)
+        found_creds.all? { |cred|
+          cred.service.host.workspace == workspace
+        }.should be_true
       end
     end
 
@@ -248,7 +252,7 @@ RSpec.describe Mdm::Workspace, type: :model do
             workspace = described_class.default
           }.to change(Mdm::Workspace, :count).by(0)
 
-          expect(workspace).to be_default
+          workspace.should be_default
         end
       end
 
@@ -260,7 +264,7 @@ RSpec.describe Mdm::Workspace, type: :model do
             workspace = described_class.default
           }.to change(Mdm::Workspace, :count).by(1)
 
-          expect(workspace).to be_default
+          workspace.should be_default
         end
       end
     end
@@ -275,18 +279,20 @@ RSpec.describe Mdm::Workspace, type: :model do
           workspace.name = default
         end
 
-        it { is_expected.to eq(true) }
+        it {
+          should be_true
+        }
       end
 
       context 'without DEFAULT name' do
-        it { is_expected.to eq(false) }
+        it { should be_false }
       end
     end
 
     context '#each_cred' do
       it 'should pass each of the #creds to the block' do
         creds = FactoryGirl.create_list(:mdm_cred, 2)
-        allow(workspace).to receive(:creds).and_return(creds)
+        workspace.stub(:creds => creds)
 
         expect { |block|
           workspace.each_cred(&block)
@@ -297,7 +303,7 @@ RSpec.describe Mdm::Workspace, type: :model do
     context '#each_host_tag' do
       it 'should pass each of the #host_tags to the block' do
         tags = FactoryGirl.create_list(:mdm_tag, 2)
-        expect(workspace).to receive(:host_tags).and_return(tags)
+        workspace.stub(:host_tags => tags)
 
         expect { |block|
           workspace.each_host_tag(&block)
@@ -306,14 +312,6 @@ RSpec.describe Mdm::Workspace, type: :model do
     end
 
     context '#host_tags' do
-      subject(:host_tags) do
-        workspace.host_tags
-      end
-
-      #
-      # lets
-      #
-
       let(:other_tags) do
         FactoryGirl.create_list(
             :mdm_tag,
@@ -328,11 +326,15 @@ RSpec.describe Mdm::Workspace, type: :model do
         )
       end
 
+      subject(:host_tags) do
+        workspace.host_tags
+      end
+
       #
       # Let!s (let + before(:each))
       #
 
-      let!(:first_host_tags) do
+      let!(:host_tags) do
         host_tags = []
 
         hosts.zip(tags) do |host, tag|
@@ -344,7 +346,7 @@ RSpec.describe Mdm::Workspace, type: :model do
         host_tags
       end
 
-      let!(:second_host_tags) do
+      let!(:other_host_tags) do
         host_tags = []
 
         other_hosts.zip(other_tags) do |host, tag|
@@ -360,16 +362,24 @@ RSpec.describe Mdm::Workspace, type: :model do
         should be_a ActiveRecord::Relation
       end
 
+      it 'should include hosts' do
+        found_tags = workspace.host_tags.to_a
+
+        found_tags.length.should > 0
+
+        tag = found_tags.first
+      end
+
       it 'should return only Mdm::Tags from hosts in the workspace' do
-        expect(host_tags.length).to eq(tags.length)
+        found_tags = workspace.host_tags
 
-        expect(
-            host_tags.all? { |tag|
-              tag.hosts.any? { |host|
-                host.workspace == workspace
-              }
-            }
-        ).to eq(true)
+        found_tags.length.should == tags.length
+
+        found_tags.all? { |tag|
+          tag.hosts.any? { |host|
+            host.workspace == workspace
+          }
+        }.should be_true
       end
     end
 
@@ -394,7 +404,7 @@ RSpec.describe Mdm::Workspace, type: :model do
         it "should remove spaces" do
           normalize
 
-          expect(workspace.boundary).to eq(stripped_boundary)
+          workspace.boundary.should == stripped_boundary
         end
       end
 
@@ -441,13 +451,11 @@ RSpec.describe Mdm::Workspace, type: :model do
       it 'should return only Mdm::WebPages from hosts in the workspace' do
         found_web_forms = workspace.web_forms
 
-        expect(found_web_forms.length).to eq(web_forms.length)
+        found_web_forms.length.should == web_forms.length
 
-        expect(
-            found_web_forms.all? { |web_form|
-              web_form.web_site.service.host.workspace == workspace
-            }
-        ).to eq(true)
+        found_web_forms.all? { |web_form|
+          web_form.web_site.service.host.workspace == workspace
+        }.should be_true
       end
     end
 
@@ -472,17 +480,15 @@ RSpec.describe Mdm::Workspace, type: :model do
 
       it 'should return only Mdm::WebVulns from hosts in the workspace' do
         # there are more web sites than those in the workspace
-        expect(Mdm::WebSite.count).to be > web_sites.count
+        Mdm::WebSite.count.should > web_sites.count
 
         found_web_sites = workspace.web_sites
 
-        expect(found_web_sites.length).to eq(web_sites.count)
+        found_web_sites.length.should == web_sites.count
 
-        expect(
-            found_web_sites.all? { |web_site|
-              web_site.service.host.workspace == workspace
-            }
-        ).to eq(true)
+        found_web_sites.all? { |web_site|
+          web_site.service.host.workspace == workspace
+        }.should be_true
       end
     end
 
@@ -513,17 +519,16 @@ RSpec.describe Mdm::Workspace, type: :model do
       end
 
       it 'should return only Mdm::WebVulns from hosts in the workspace' do
-        expect(Mdm::WebVuln.count).to be > web_vulns.length
+        Mdm::WebVuln.count.should > web_vulns.length
 
         found_web_vulns = workspace.web_vulns
 
-        expect(found_web_vulns.length).to eq(web_vulns.length)
+        found_web_vulns.length.should == web_vulns.length
+
+        found_web_vulns.all? { |web_vuln|
+          web_vuln.web_site.service.host.workspace == workspace
+        }.should be_true
 
-        expect(
-            found_web_vulns.all? { |web_vuln|
-              web_vuln.web_site.service.host.workspace == workspace
-            }
-        ).to eq(true)
       end
     end
 
@@ -544,11 +549,9 @@ RSpec.describe Mdm::Workspace, type: :model do
       it "should reject #unique_web_forms from host addresses that aren't in addresses" do
         web_forms = workspace.web_unique_forms([selected_address])
 
-        expect(
-            web_forms.all? { |web_form|
-              expect(web_form.web_site.service.host.address).to eq(selected_address)
-            }
-        ).to eq(true)
+        web_forms.all? { |web_form|
+          web_form.web_site.service.host.address.should == selected_address
+        }.should be_true
       end
     end
   end

data/spec/app/models/metasploit_data_models/automatic_exploitation/match_result_spec.rb

@@ -1,4 +1,6 @@
-RSpec.describe MetasploitDataModels::AutomaticExploitation::MatchResult, type: :model do
+require 'spec_helper'
+
+describe MetasploitDataModels::AutomaticExploitation::MatchResult do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context "database" do
@@ -9,8 +11,8 @@ RSpec.describe MetasploitDataModels::AutomaticExploitation::MatchResult, type: :
   end
 
   context 'associations' do
-    it { is_expected.to belong_to(:match).class_name('MetasploitDataModels::AutomaticExploitation::Match') }
-    it { is_expected.to belong_to(:run).class_name('MetasploitDataModels::AutomaticExploitation::Run') }
+    it { should belong_to(:match).class_name('MetasploitDataModels::AutomaticExploitation::Match') }
+    it { should belong_to(:run).class_name('MetasploitDataModels::AutomaticExploitation::Run') }
   end
 
   context 'scopes' do

data/spec/app/models/metasploit_data_models/automatic_exploitation/match_set_spec.rb

@@ -1,25 +1,27 @@
-RSpec.describe MetasploitDataModels::AutomaticExploitation::MatchSet, type: :model do
+require 'spec_helper'
+
+describe MetasploitDataModels::AutomaticExploitation::MatchSet do
   describe "database" do
     describe "foreign_keys" do
-      it { is_expected.to have_db_column(:workspace_id).of_type(:integer) }
-      it { is_expected.to have_db_column(:user_id).of_type(:integer) }
+      it { should have_db_column(:workspace_id).of_type(:integer) }
+      it { should have_db_column(:user_id).of_type(:integer) }
     end
 
     describe "indices" do
-      it { is_expected.to have_db_index(:user_id) }
-      it { is_expected.to have_db_index(:workspace_id) }
+      it { should have_db_index(:user_id) }
+      it { should have_db_index(:workspace_id) }
     end
   end
 
   describe "associations" do
-    it { is_expected.to have_many(:matches).class_name('MetasploitDataModels::AutomaticExploitation::Match') }
-    it { is_expected.to have_many(:matches).inverse_of(:match_set) }
-    it { is_expected.to have_many(:runs).class_name('MetasploitDataModels::AutomaticExploitation::Run') }
-    it { is_expected.to have_many(:runs).inverse_of(:match_set) }
-    it { is_expected.to belong_to(:user).class_name('Mdm::User') }
-    it { is_expected.to belong_to(:user).inverse_of(:automatic_exploitation_match_sets) }
-    it { is_expected.to belong_to(:workspace).class_name('Mdm::Workspace') }
-    it { is_expected.to belong_to(:workspace).inverse_of(:automatic_exploitation_match_sets) }
+    it { should have_many(:matches).class_name('MetasploitDataModels::AutomaticExploitation::Match') }
+    it { should have_many(:matches).inverse_of(:match_set) }
+    it { should have_many(:runs).class_name('MetasploitDataModels::AutomaticExploitation::Run') }
+    it { should have_many(:runs).inverse_of(:match_set) }
+    it { should belong_to(:user).class_name('Mdm::User') }
+    it { should belong_to(:user).inverse_of(:automatic_exploitation_match_sets) }
+    it { should belong_to(:workspace).class_name('Mdm::Workspace') }
+    it { should belong_to(:workspace).inverse_of(:automatic_exploitation_match_sets) }
   end
 
   describe "validations" do