Merge remote-tracking branch 'origin' into bug/MSP-12700/workspace-oom

* Bumping version after recent release
rapid7 · Jun 12, 2015 · 6fc2d7c · 6fc2d7c
2 parents 82e6a0f + 540fc05
commit 6fc2d7c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/app/models/mdm/module/detail.rb b/app/models/mdm/module/detail.rb
@@ -71,7 +71,6 @@ class Mdm::Module::Detail < ActiveRecord::Base
   #   @return [ActiveRecord::Relation<MetasploitDataModels::AutomaticExploitation::Match>]
   has_many :matches,
            :class_name => 'MetasploitDataModels::AutomaticExploitation::Match',
-           :dependent => :destroy,
            :primary_key => :fullname,
            :foreign_key => :module_fullname,
            :inverse_of => :module_detail

diff --git a/lib/metasploit_data_models/version.rb b/lib/metasploit_data_models/version.rb
@@ -10,7 +10,7 @@ module Version
     # The minor version number, scoped to the {MAJOR} version number.
     MINOR = 2
     # The patch version number, scoped to the {MAJOR} and {MINOR} version numbers.
-    PATCH = 2
+    PATCH = 3
     # The prerelease version, scoped to the {PATCH} version number.
     PRERELEASE = 'workspace-oom'
 

diff --git a/spec/app/models/metasploit_data_models/automatic_exploitation/match_spec.rb b/spec/app/models/metasploit_data_models/automatic_exploitation/match_spec.rb
@@ -8,7 +8,7 @@
 
       subject(:automatic_exploitation_match){ described_class.new }
 
-      before(:each ) do
+      before(:each) do
         automatic_exploitation_match.matchable = vuln
         automatic_exploitation_match.module_fullname = module_detail.fullname
         automatic_exploitation_match.save!
@@ -17,7 +17,21 @@
       it 'should point to the Mdm::Module::Detail with a fullname corresponding to #module_fullname' do
         expect(automatic_exploitation_match.module_detail).to eq(module_detail)
       end
+    end
+
+    describe "deleting the associated Mdm::Module::Detail" do
+      subject(:automatic_exploitation_match){ FactoryGirl.create(:automatic_exploitation_match) }
+      let(:match_id){ automatic_exploitation_match.id }
+
+      before(:each) do
+        automatic_exploitation_match.module_detail.destroy
+      end
 
+      it 'should still exist in the DB' do
+        the_match = MetasploitDataModels::AutomaticExploitation::Match.find(match_id)
+        expect(the_match).to_not be_blank
+      end
     end
+
   end
 end
diff --git a/spec/factories/metasploit_data_models/automatic_exploitation/matches.rb b/spec/factories/metasploit_data_models/automatic_exploitation/matches.rb
@@ -2,5 +2,6 @@
   factory :automatic_exploitation_match, :class => MetasploitDataModels::AutomaticExploitation::Match do
     association :module_detail, factory: :mdm_module_detail
     association :match_set, factory: :automatic_exploitation_match_set
+    association :matchable, factory: :mdm_vuln
   end
 end