Performance/RedundantMerge

Author: tamird

.rubocop_todo.yml

@@ -51,14 +51,6 @@ Naming/HeredocDelimiterNaming:
   Exclude:
     - 'tasks/compile.rake'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: MaxKeyValuePairs.
-Performance/RedundantMerge:
-  Exclude:
-    - 'spec/mysql2/client_spec.rb'
-    - 'spec/mysql2/statement_spec.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect.

spec/mysql2/client_spec.rb

@@ -493,7 +493,7 @@ def run_gc
     end
 
     it "should allow changing query options for subsequent queries" do
-      @client.query_options.merge!(:something => :else)
+      @client.query_options[:something] = :else
       result = @client.query "SELECT 1"
       expect(@client.query_options[:something]).to eql(:else)
       expect(result.instance_variable_get('@query_options')[:something]).to eql(:else)

spec/mysql2/statement_spec.rb

@@ -196,7 +196,7 @@ def stmt_count
   end
 
   it "should warn but still work if cache_rows is set to false" do
-    @client.query_options.merge!(:cache_rows => false)
+    @client.query_options[:cache_rows] = false
     statement = @client.prepare 'SELECT 1'
     result = nil
     expect { result = statement.execute.to_a }.to output(/:cache_rows is forced for prepared statements/).to_stderr