Merge pull request #4719 from rimian/patch-3

fix malformed qunit url

lib/tasks/qunit.rake

@@ -35,7 +35,7 @@ task "qunit:test", [:timeout] => :environment do |_, args|
   begin
     success = true
     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 = {}
 
@@ -47,6 +47,10 @@ task "qunit:test", [:timeout] => :environment do |_, args|
       cmd += "?#{options.to_query.gsub('+', '%20')}"
     end
 
+    if args[:timeout].present?
+      cmd += " #{args[:timeout]}"
+    end
+
     # wait for server to respond, will exception out on failure
     tries = 0
     begin