diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /spec/lib/gitlab/import | |
parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'spec/lib/gitlab/import')
-rw-r--r-- | spec/lib/gitlab/import/merge_request_helpers_spec.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/spec/lib/gitlab/import/merge_request_helpers_spec.rb b/spec/lib/gitlab/import/merge_request_helpers_spec.rb index f858ab934bb..9626b7b893f 100644 --- a/spec/lib/gitlab/import/merge_request_helpers_spec.rb +++ b/spec/lib/gitlab/import/merge_request_helpers_spec.rb @@ -37,11 +37,8 @@ RSpec.describe Gitlab::Import::MergeRequestHelpers, type: :helper do attributes.merge(iid: iid, source_branch: iid.to_s)) end - # does ensure that we only load object twice - # 1. by #insert_and_return_id - # 2. by project.merge_requests.find - expect_any_instance_of(MergeRequest).to receive(:attributes) - .twice.times.and_call_original + # ensures that we only load object once by project.merge_requests.find + expect(MergeRequest).to receive(:allocate).once.and_call_original expect(subject.first).not_to be_nil expect(subject.second).to eq(false) |