summaryrefslogtreecommitdiff
path: root/spec/finders
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-21 17:50:22 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:31:57 -0600
commit030baf70d25a666b660b0024f000586631ee3daf (patch)
tree20dbdbb674e9a4fd0ad6d82161e34fd26aaf37cd /spec/finders
parentc5a49cc3c56283ae5f015c808327b1a29ca09ed9 (diff)
downloadgitlab-ce-030baf70d25a666b660b0024f000586631ee3daf.tar.gz
Enable Performance/RedundantMerge
Diffstat (limited to 'spec/finders')
-rw-r--r--spec/finders/notes_finder_spec.rb2
1 files changed, 1 insertions, 1 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