Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-06 20:41:27 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20490 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-11-23 00:54:33 +00:00
parent 8453d9bf57
commit 3896694b5f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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