Fix RuboCop Performance/RedundantMerge due to r20428 (#34269).

git-svn-id: http://svn.redmine.org/redmine/trunk@20490 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index d5bbe7a4fc3115797cfb757930e369e13e0ebd1e..e71a231b40e8ae50f276a78083b05bb76eee8b3c 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -28,8 +28,8 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
 
   options = {}
   # Allow running tests using a remote Selenium hub
-  options.merge!(url: ENV['SELENIUM_REMOTE_URL']) if ENV['SELENIUM_REMOTE_URL']
-  options.merge!(desired_capabilities: Selenium::WebDriver::Remote::Capabilities.chrome(
+  options[:url] = ENV['SELENIUM_REMOTE_URL'] if ENV['SELENIUM_REMOTE_URL']
+  options[:desired_capabilities] = Selenium::WebDriver::Remote::Capabilities.chrome(
                   'chromeOptions' => {
                     'prefs' => {
                       'download.default_directory' => DOWNLOADS_PATH,
@@ -37,7 +37,7 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
                       'plugins.plugins_disabled' => ["Chrome PDF Viewer"]
                     }
                   }
-                ))
+                )
 
   driven_by(
     :selenium, using: :chrome, screen_size: [1024, 900],