diff --git a/.travis.yml b/.travis.yml index 513f3c15ad4..b999ae51002 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,4 +55,4 @@ install: - bash -c "if [ '$RAILS_MASTER' == '1' ]; then bundle update --retry=3 --jobs=3 arel rails rails-observers seed-fu; fi" - bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3; fi" -script: 'bundle exec rspec && bundle exec rake plugin:spec && bundle exec rake qunit:test' +script: 'bundle exec rspec && bundle exec rake plugin:spec && bundle exec rake qunit:test['200000']' diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake index 70ff6d5e458..b4e9e228875 100644 --- a/lib/tasks/qunit.rake +++ b/lib/tasks/qunit.rake @@ -1,6 +1,6 @@ desc "Runs the qunit test suite" -task "qunit:test" => :environment do +task "qunit:test", [:timeout] => :environment do |_, args| require "rack" require "socket" @@ -35,7 +35,7 @@ task "qunit:test" => :environment do begin success = true test_path = "#{Rails.root}/vendor/assets/javascripts" - cmd = "phantomjs #{test_path}/run-qunit.js http://localhost:#{port}/qunit" + cmd = "phantomjs #{test_path}/run-qunit.js http://localhost:#{port}/qunit #{args[:timeout]}" options = {}