diff options
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/import/merge_request_creator_spec.rb | 4 |
1 files changed, 2 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 cd3359da341..7c73e9b39f7 100644 --- a/spec/lib/gitlab/import/merge_request_creator_spec.rb +++ b/spec/lib/gitlab/import/merge_request_creator_spec.rb @@ -11,7 +11,7 @@ describe Gitlab::Import::MergeRequestCreator do 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) } + let(:attributes) { HashWithIndifferentAccess.new(merge_request.attributes.except("merge_params")) } it 'updates the data' do commits_count = commits.count @@ -28,7 +28,7 @@ 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) } + let(:attributes) { HashWithIndifferentAccess.new(merge_request.attributes.except("merge_params")) } it 'creates a new merge request' do attributes.delete(:id) |