Merge branch 'bvl-codeowner-rules-model-ce' into 'master'

Adds helper for `find_or_create_by` in transaction

See merge request gitlab-org/gitlab-ce!24913

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/models/application_record_spec.rb b/spec/models/application_record_spec.rb
index 68aed387bfc..ca23f581fdc 100644
--- a/spec/models/application_record_spec.rb
+++ b/spec/models/application_record_spec.rb
@@ -10,4 +10,14 @@ describe ApplicationRecord do
       expect(User.id_in(records.last(2).map(&:id))).to eq(records.last(2))
     end
   end
+
+  describe '#safe_find_or_create_by' do
+    it 'creates the user avoiding race conditions' do
+      expect(Suggestion).to receive(:find_or_create_by).and_raise(ActiveRecord::RecordNotUnique)
+      allow(Suggestion).to receive(:find_or_create_by).and_call_original
+
+      expect { Suggestion.safe_find_or_create_by(build(:suggestion).attributes) }
+        .to change { Suggestion.count }.by(1)
+    end
+  end
 end