mirror of
https://github.com/redmine/redmine.git
synced 2025-10-26 07:46:17 +01:00
detect Chrome downloaded file more strictly
git-svn-id: http://svn.redmine.org/redmine/trunk@18536 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -66,15 +66,21 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
|
||||
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}").reject {|f| f=~/\.(tmp|crdownload)$/}
|
||||
Dir.glob("#{downloaded_path}/#{filename}").
|
||||
reject{|f| f=~/\.(tmp|crdownload)$/}.sort_by{|f| File.mtime(f)}
|
||||
end
|
||||
|
||||
# Returns the path of the download file
|
||||
def downloaded_file(filename='*')
|
||||
files = []
|
||||
Timeout.timeout(5) do
|
||||
sleep 0.2 while downloaded_files(filename).empty?
|
||||
loop do
|
||||
files = downloaded_files(filename)
|
||||
break if files.present?
|
||||
sleep 0.2
|
||||
end
|
||||
end
|
||||
downloaded_files(filename).first
|
||||
files.last
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -335,7 +335,9 @@ class IssuesTest < ApplicationSystemTestCase
|
||||
click_on 'CSV'
|
||||
click_on 'Export'
|
||||
|
||||
csv = CSV.read(downloaded_file("issues.csv"))
|
||||
# https://github.com/SeleniumHQ/selenium/issues/5292
|
||||
# if issues.csv exists, Chrome creates issues (1).csv, issues (2).csv ...
|
||||
csv = CSV.read(downloaded_file("issues*.csv"))
|
||||
subject_index = csv.shift.index('Subject')
|
||||
subjects = csv.map {|row| row[subject_index]}
|
||||
assert_equal subjects.sort, subjects
|
||||
|
||||
Reference in New Issue
Block a user