diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /spec/lib/gitlab/import/merge_request_creator_spec.rb | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'spec/lib/gitlab/import/merge_request_creator_spec.rb')
-rw-r--r-- | spec/lib/gitlab/import/merge_request_creator_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/lib/gitlab/import/merge_request_creator_spec.rb b/spec/lib/gitlab/import/merge_request_creator_spec.rb index 9aedca40f1b..8f502216294 100644 --- a/spec/lib/gitlab/import/merge_request_creator_spec.rb +++ b/spec/lib/gitlab/import/merge_request_creator_spec.rb @@ -8,10 +8,13 @@ RSpec.describe Gitlab::Import::MergeRequestCreator do subject { described_class.new(project) } describe '#execute' do + let(:attributes) do + HashWithIndifferentAccess.new(merge_request.attributes.except('merge_params', 'suggested_reviewers')) + end + context 'merge request already exists' do let(:merge_request) { create(:merge_request, target_project: project, source_project: project) } let(:commits) { merge_request.merge_request_diffs.first.commits } - let(:attributes) { HashWithIndifferentAccess.new(merge_request.attributes.except("merge_params")) } it 'updates the data' do commits_count = commits.count @@ -31,7 +34,6 @@ RSpec.describe Gitlab::Import::MergeRequestCreator do context 'new merge request' do let(:merge_request) { build(:merge_request, target_project: project, source_project: project) } - let(:attributes) { HashWithIndifferentAccess.new(merge_request.attributes.except("merge_params")) } it 'creates a new merge request' do attributes.delete(:id) |