diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 02:50:22 +0300 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 18:31:57 +0300 |
commit | 030baf70d25a666b660b0024f000586631ee3daf (patch) | |
tree | 20dbdbb674e9a4fd0ad6d82161e34fd26aaf37cd /spec | |
parent | c5a49cc3c56283ae5f015c808327b1a29ca09ed9 (diff) |
Enable Performance/RedundantMerge
Diffstat (limited to 'spec')
-rw-r--r-- | spec/finders/notes_finder_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/projects/create_service_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/finders/notes_finder_spec.rb b/spec/finders/notes_finder_spec.rb index f8b05d4e9bc..77a04507be1 100644 --- a/spec/finders/notes_finder_spec.rb +++ b/spec/finders/notes_finder_spec.rb @@ -111,7 +111,7 @@ describe NotesFinder do end it 'raises an exception for an invalid target_type' do - params.merge!(target_type: 'invalid') + params[:target_type] = 'invalid' expect { described_class.new(project, user, params).execute }.to raise_error('invalid target_type') end diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb index af515ad2e0e..62f21049b0b 100644 --- a/spec/services/projects/create_service_spec.rb +++ b/spec/services/projects/create_service_spec.rb @@ -50,7 +50,7 @@ describe Projects::CreateService, '#execute', services: true do context 'error handling' do it 'handles invalid options' do - opts.merge!({ default_branch: 'master' } ) + opts[:default_branch] = 'master' expect(create_project(user, opts)).to eq(nil) end end @@ -67,7 +67,7 @@ describe Projects::CreateService, '#execute', services: true do context 'wiki_enabled false does not create wiki repository directory' do it do - opts.merge!(wiki_enabled: false) + opts[:wiki_enabled] = false project = create_project(user, opts) path = ProjectWiki.new(project, user).send(:path_to_repo) |