diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-29 15:09:48 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-29 15:09:48 +0000 |
commit | f4d51a9f71cf3d4b0874a3e1948fe3c1ea193c4d (patch) | |
tree | 7ae3da76e824c435167dd108721c0124ad2ee484 /spec/models/merge_request_diff_commit_spec.rb | |
parent | 2dedd78ef505a0ab0a379c7340a3fcba56ada663 (diff) | |
download | gitlab-ce-f4d51a9f71cf3d4b0874a3e1948fe3c1ea193c4d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/merge_request_diff_commit_spec.rb')
-rw-r--r-- | spec/models/merge_request_diff_commit_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/merge_request_diff_commit_spec.rb b/spec/models/merge_request_diff_commit_spec.rb index 6290468d4a7..adddec7ced8 100644 --- a/spec/models/merge_request_diff_commit_spec.rb +++ b/spec/models/merge_request_diff_commit_spec.rb @@ -79,7 +79,7 @@ RSpec.describe MergeRequestDiffCommit do subject { described_class.create_bulk(merge_request_diff_id, commits) } it 'inserts the commits into the database en masse' do - expect(Gitlab::Database).to receive(:bulk_insert) + expect(Gitlab::Database.main).to receive(:bulk_insert) .with(described_class.table_name, rows) subject @@ -126,7 +126,7 @@ RSpec.describe MergeRequestDiffCommit do end it 'uses a sanitized date' do - expect(Gitlab::Database).to receive(:bulk_insert) + expect(Gitlab::Database.main).to receive(:bulk_insert) .with(described_class.table_name, rows) subject |