diff options
Diffstat (limited to 'spec/models/merge_request_diff_commit_spec.rb')
-rw-r--r-- | spec/models/merge_request_diff_commit_spec.rb | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/spec/models/merge_request_diff_commit_spec.rb b/spec/models/merge_request_diff_commit_spec.rb index adddec7ced8..25e5e40feb7 100644 --- a/spec/models/merge_request_diff_commit_spec.rb +++ b/spec/models/merge_request_diff_commit_spec.rb @@ -46,11 +46,7 @@ RSpec.describe MergeRequestDiffCommit do { "message": "Add submodule from gitlab.com\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n", "authored_date": "2014-02-27T10:01:38.000+01:00".to_time, - "author_name": "Dmitriy Zaporozhets", - "author_email": "dmitriy.zaporozhets@gmail.com", "committed_date": "2014-02-27T10:01:38.000+01:00".to_time, - "committer_name": "Dmitriy Zaporozhets", - "committer_email": "dmitriy.zaporozhets@gmail.com", "commit_author_id": an_instance_of(Integer), "committer_id": an_instance_of(Integer), "merge_request_diff_id": merge_request_diff_id, @@ -61,11 +57,7 @@ RSpec.describe MergeRequestDiffCommit do { "message": "Change some files\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n", "authored_date": "2014-02-27T09:57:31.000+01:00".to_time, - "author_name": "Dmitriy Zaporozhets", - "author_email": "dmitriy.zaporozhets@gmail.com", "committed_date": "2014-02-27T09:57:31.000+01:00".to_time, - "committer_name": "Dmitriy Zaporozhets", - "committer_email": "dmitriy.zaporozhets@gmail.com", "commit_author_id": an_instance_of(Integer), "committer_id": an_instance_of(Integer), "merge_request_diff_id": merge_request_diff_id, @@ -79,7 +71,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.main).to receive(:bulk_insert) + expect(ApplicationRecord).to receive(:legacy_bulk_insert) .with(described_class.table_name, rows) subject @@ -111,11 +103,7 @@ RSpec.describe MergeRequestDiffCommit do [{ "message": "Weird commit date\n", "authored_date": timestamp, - "author_name": "Alejandro RodrÃguez", - "author_email": "alejorro70@gmail.com", "committed_date": timestamp, - "committer_name": "Alejandro RodrÃguez", - "committer_email": "alejorro70@gmail.com", "commit_author_id": an_instance_of(Integer), "committer_id": an_instance_of(Integer), "merge_request_diff_id": merge_request_diff_id, @@ -126,7 +114,7 @@ RSpec.describe MergeRequestDiffCommit do end it 'uses a sanitized date' do - expect(Gitlab::Database.main).to receive(:bulk_insert) + expect(ApplicationRecord).to receive(:legacy_bulk_insert) .with(described_class.table_name, rows) subject |