Add latest changes from gitlab-org/gitlab@master

5 files changed, 77 insertions, 0 deletions

diff --git a/spec/models/concerns/bulk_insert_safe_spec.rb b/spec/models/concerns/bulk_insert_safe_spec.rb
new file mode 100644
index 00000000000..91884680738
--- /dev/null
+++ b/spec/models/concerns/bulk_insert_safe_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe BulkInsertSafe do
+  class BulkInsertItem < ApplicationRecord
+    include BulkInsertSafe
+  end
+
+  module InheritedUnsafeMethods
+    extend ActiveSupport::Concern
+
+    included do
+      after_save -> { "unsafe" }
+    end
+  end
+
+  module InheritedSafeMethods
+    extend ActiveSupport::Concern
+
+    included do
+      after_initialize -> { "safe" }
+    end
+  end
+
+  it_behaves_like 'a BulkInsertSafe model', BulkInsertItem
+
+  context 'when inheriting class methods' do
+    it 'raises an error when method is not bulk-insert safe' do
+      expect { BulkInsertItem.include(InheritedUnsafeMethods) }.to(
+        raise_error(subject::MethodNotAllowedError))
+    end
+
+    it 'does not raise an error when method is bulk-insert safe' do
+      expect { BulkInsertItem.include(InheritedSafeMethods) }.not_to raise_error
+    end
+  end
+end
diff --git a/spec/models/label_link_spec.rb b/spec/models/label_link_spec.rb
index b160e72e759..0a5cb5374b0 100644
--- a/spec/models/label_link_spec.rb
+++ b/spec/models/label_link_spec.rb
@@ -7,4 +7,6 @@ describe LabelLink do
 
   it { is_expected.to belong_to(:label) }
   it { is_expected.to belong_to(:target) }
+
+  it_behaves_like 'a BulkInsertSafe model', LabelLink
 end
diff --git a/spec/models/merge_request_diff_commit_spec.rb b/spec/models/merge_request_diff_commit_spec.rb
index a74c0b20642..a296122ae09 100644
--- a/spec/models/merge_request_diff_commit_spec.rb
+++ b/spec/models/merge_request_diff_commit_spec.rb
@@ -6,6 +6,8 @@ describe MergeRequestDiffCommit do
   let(:merge_request) { create(:merge_request) }
   let(:project) { merge_request.project }
 
+  it_behaves_like 'a BulkInsertSafe model', MergeRequestDiffCommit
+
   describe '#to_hash' do
     subject { merge_request.commits.first }
 
diff --git a/spec/models/merge_request_diff_file_spec.rb b/spec/models/merge_request_diff_file_spec.rb
index 84f9c9d06ba..6ecbc5bf832 100644
--- a/spec/models/merge_request_diff_file_spec.rb
+++ b/spec/models/merge_request_diff_file_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe MergeRequestDiffFile do
+  it_behaves_like 'a BulkInsertSafe model', MergeRequestDiffFile
+
   describe '#diff' do
     context 'when diff is not stored' do
       let(:unpacked) { 'unpacked' }
diff --git a/spec/support/shared_examples/models/concerns/bulk_insert_safe_shared_examples.rb b/spec/support/shared_examples/models/concerns/bulk_insert_safe_shared_examples.rb
new file mode 100644
index 00000000000..0a2b6616bb4
--- /dev/null
+++ b/spec/support/shared_examples/models/concerns/bulk_insert_safe_shared_examples.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'a BulkInsertSafe model' do |target_class|
+  # We consider all callbacks unsafe for bulk insertions unless we have explicitly
+  # whitelisted them (esp. anything related to :save, :create, :commit etc.)
+  let(:callback_method_blacklist) do
+    ActiveRecord::Callbacks::CALLBACKS.reject do |callback|
+      cb_name = callback.to_s.gsub(/(before_|after_|around_)/, '').to_sym
+      BulkInsertSafe::CALLBACK_NAME_WHITELIST.include?(cb_name)
+    end.to_set
+  end
+
+  context 'when calling class methods directly' do
+    it 'raises an error when method is not bulk-insert safe' do
+      callback_method_blacklist.each do |m|
+        expect { target_class.send(m, nil) }.to(
+          raise_error(BulkInsertSafe::MethodNotAllowedError),
+          "Expected call to #{m} to raise an error, but it didn't"
+        )
+      end
+    end
+
+    it 'does not raise an error when method is bulk-insert safe' do
+      BulkInsertSafe::CALLBACK_NAME_WHITELIST.each do |name|
+        expect { target_class.set_callback(name) {} }.not_to raise_error
+      end
+    end
+
+    it 'does not raise an error when the call is triggered by belongs_to' do
+      expect { target_class.belongs_to(:other_record) }.not_to raise_error
+    end
+  end
+end