1 files changed, 18 insertions, 2 deletions
diff --git a/spec/models/merge_request_diff_spec.rb b/spec/models/merge_request_diff_spec.rb
index 5fff880c44e..afe7251f59a 100644
--- a/spec/models/merge_request_diff_spec.rb
+++ b/spec/models/merge_request_diff_spec.rb
@@ -240,8 +240,8 @@ RSpec.describe MergeRequestDiff do
       stub_external_diffs_setting(enabled: true)
 
       expect(diff).not_to receive(:save!)
-      expect(Gitlab::Database.main)
-        .to receive(:bulk_insert)
+      expect(ApplicationRecord)
+        .to receive(:legacy_bulk_insert)
         .with('merge_request_diff_files', anything)
         .and_raise(ActiveRecord::Rollback)
 
@@ -1080,6 +1080,22 @@ RSpec.describe MergeRequestDiff do
     end
   end
 
+  describe '#commits' do
+    include ProjectForksHelper
+
+    let_it_be(:target) { create(:project, :test_repo) }
+    let_it_be(:forked) { fork_project(target, nil, repository: true) }
+    let_it_be(:mr) { create(:merge_request, source_project: forked, target_project: target) }
+
+    it 'returns a CommitCollection whose container points to the target project' do
+      expect(mr.merge_request_diff.commits.container).to eq(target)
+    end
+
+    it 'returns a non-empty CommitCollection' do
+      expect(mr.merge_request_diff.commits.commits.size).to be > 0
+    end
+  end
+
   describe '.latest_diff_for_merge_requests' do
     let_it_be(:merge_request_1) { create(:merge_request_without_merge_request_diff) }
     let_it_be(:merge_request_1_diff_1) { create(:merge_request_diff, merge_request: merge_request_1, created_at: 3.days.ago) }