kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'rails5-fix-import-merge-request-creator' into 'master' 

Rails5: fix can't quote ActiveSupport::HashWithIndifferentAccess

See merge request gitlab-org/gitlab-ce!21397
This commit is contained in:
Rémy Coutable 2018-08-28 10:08:29 +00:00
parent 3b9eb5631f 83739b8b43
commit c3e01c7b7b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/rails5-fix-import-merge-request-creator.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: 'Rails5: fix can''t quote ActiveSupport::HashWithIndifferentAccess'
merge_request: 21397
author: Jasper Maes
type: other

4
spec/lib/gitlab/import/merge_request_creator_spec.rb
View File

@ -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)