Add a failing spec for handling a race condition

The spec uses a hook method to simulate the insertion of an
acts_as_xapian_job in another process for the model.

Credit to: http://stackoverflow.com/questions/2017587/simulating-race-conditions-in-rspec-unit-tests

Conflicts:

    vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb

2 files changed, 37 insertions, 0 deletions

diff --git a/spec/models/xapian_spec.rb b/spec/models/xapian_spec.rb
index 7aab9cdc6..c7c21e3a0 100644
--- a/spec/models/xapian_spec.rb
+++ b/spec/models/xapian_spec.rb
@@ -400,3 +400,34 @@ describe ActsAsXapian::Search, "#words_to_highlight" do
     end
 
 end
+
+describe InfoRequestEvent, " when faced with a race condition during xapian_mark_needs_index" do
+
+    before(:each) do
+        load_raw_emails_data
+        get_fixtures_xapian_index
+        # Use the before create job hook to simulate a race condition with another process
+        # by creating an acts_as_xapian_job record for the same model
+        class InfoRequestEvent
+            def xapian_before_create_job_hook(action, model, model_id)
+                ActsAsXapian::ActsAsXapianJob.create!(:model => model,
+                                                      :model_id => model_id,
+                                                      :action => action)
+            end
+        end
+    end
+
+    after(:each) do
+        # Reset the before create job hook
+        class InfoRequestEvent
+            def xapian_before_create_job_hook(action, model, model_id)
+            end
+        end
+    end
+
+    it 'should not raise an error but should fail silently' do
+        ir = info_requests(:naughty_chicken_request)
+        ir.reindex_request_events
+    end
+
+end
diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
index e3659b629..a4447371e 100644
--- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
+++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
@@ -929,11 +929,17 @@ module ActsAsXapian
         def xapian_create_job(action, model, model_id)
             ActiveRecord::Base.transaction do
                 ActsAsXapianJob.delete_all([ "model = ? and model_id = ?", model, model_id])
+                xapian_before_create_job_hook(action, model, model_id)
                 ActsAsXapianJob.create!(:model => model,
                                         :model_id => model_id,
                                         :action => action)
             end
         end
+
+        # A hook method that can be used in tests to simulate e.g. an external process inserting a record
+        def xapian_before_create_job_hook(action, model, model_id)
+        end
+
      end
 
     ######################################################################