summaryrefslogtreecommitdiffstats
path: root/test/application_system_test_case.rb
diff options
context:
space:
mode:
Diffstat (limited to 'test/application_system_test_case.rb')
-rw-r--r--test/application_system_test_case.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 363e78a12..7a4e04348 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -30,7 +30,7 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
# Allow running tests using a remote Selenium hub
options[:url] = ENV['SELENIUM_REMOTE_URL'] if ENV['SELENIUM_REMOTE_URL']
options[:desired_capabilities] = Selenium::WebDriver::Remote::Capabilities.chrome(
- 'chromeOptions' => {
+ 'goog:chromeOptions' => {
'prefs' => {
'download.default_directory' => DOWNLOADS_PATH,
'download.prompt_for_download' => false,
@@ -76,14 +76,11 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
end
def clear_downloaded_files
- # https://github.com/SeleniumHQ/selenium/issues/5292
- FileUtils.rm downloaded_files if Redmine::Platform.mswin?
+ FileUtils.rm downloaded_files
end
def downloaded_files(filename='*')
- # https://github.com/SeleniumHQ/selenium/issues/5292
- downloaded_path = Redmine::Platform.mswin? ? DOWNLOADS_PATH : "#{ENV['HOME']}/Downloads"
- Dir.glob("#{downloaded_path}/#{filename}").
+ Dir.glob("#{DOWNLOADS_PATH}/#{filename}").
reject{|f| f=~/\.(tmp|crdownload)$/}.sort_by{|f| File.mtime(f)}
end