Browse Source

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


git-svn-id: http://svn.redmine.org/redmine/trunk@20490 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.2.0
Go MAEDA 3 years ago
parent
commit
3896694b5f
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      test/application_system_test_case.rb

+ 3
- 3
test/application_system_test_case.rb View File

@@ -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],

Loading…
Cancel
Save