Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 10 insertions, 1 deletions

diff --git a/spec/models/application_record_spec.rb b/spec/models/application_record_spec.rb
index d080b298e2f..6a0f2290b4c 100644
--- a/spec/models/application_record_spec.rb
+++ b/spec/models/application_record_spec.rb
@@ -67,7 +67,8 @@ RSpec.describe ApplicationRecord do
       end
 
       it 'raises a validation error if the record was not persisted' do
-        expect { Suggestion.find_or_create_by!(note: nil) }.to raise_error(ActiveRecord::RecordInvalid)
+        expect { Suggestion.safe_find_or_create_by!(note: nil) }
+          .to raise_error(ActiveRecord::RecordInvalid)
       end
 
       it 'passes a block to find_or_create_by' do
@@ -75,6 +76,14 @@ RSpec.describe ApplicationRecord do
           Suggestion.safe_find_or_create_by!(suggestion_attributes, &block)
         end.to yield_with_args(an_object_having_attributes(suggestion_attributes))
       end
+
+      it 'raises a record not found error in case of attributes mismatch' do
+        suggestion = Suggestion.safe_find_or_create_by!(suggestion_attributes)
+        attributes = suggestion_attributes.merge(outdated: !suggestion.outdated)
+
+        expect { Suggestion.safe_find_or_create_by!(attributes) }
+          .to raise_error(ActiveRecord::RecordNotFound)
+      end
     end
   end