diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-11-23 00:54:33 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-11-23 00:54:33 +0000 |
| commit | 3896694b5f3e2edefa11f471e966cd01a11ecf78 (patch) | |
| tree | 6b4e594db21e27bcd164c91bcdfe8f474f092e4c | |
| parent | 8453d9bf578cc13c0e3174b1fc94d10276403344 (diff) | |
| download | redmine-3896694b5f3e2edefa11f471e966cd01a11ecf78.tar.gz redmine-3896694b5f3e2edefa11f471e966cd01a11ecf78.zip | |
Fix RuboCop Performance/RedundantMerge due to r20428 (#34269).
git-svn-id: http://svn.redmine.org/redmine/trunk@20490 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | test/application_system_test_case.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb index d5bbe7a4f..e71a231b4 100644 --- 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], |