github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-25 19:05:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4719 from rimian/patch-3

Browse Source 
fix malformed qunit url
This commit is contained in:
Guo Xiang Tan 2017-02-24 11:32:01 +08:00 committed by GitHub
commit 889ab85431
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tasks/qunit.rake
View File

@ -35,7 +35,7 @@ task "qunit:test", [:timeout] => :environment do |_, args|
begin begin
success = true success = true
test_path = "#{Rails.root}/vendor/assets/javascripts" test_path = "#{Rails.root}/vendor/assets/javascripts"
cmd = "phantomjs #{test_path}/run-qunit.js http://localhost:#{port}/qunit #{args[:timeout]}" cmd = "phantomjs #{test_path}/run-qunit.js http://localhost:#{port}/qunit"
options = {} options = {}
@ -47,6 +47,10 @@ task "qunit:test", [:timeout] => :environment do |_, args|
cmd += "?#{options.to_query.gsub('+', '%20')}" cmd += "?#{options.to_query.gsub('+', '%20')}"
end end
if args[:timeout].present?
cmd += " #{args[:timeout]}"
end
# wait for server to respond, will exception out on failure # wait for server to respond, will exception out on failure
tries = 0 tries = 0
begin begin