From 28a397398ff336e2705015aecf375e0c230352ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 24 Jul 2017 11:44:33 +0200 Subject: [PATCH] change the *correct* timeout value --- .travis.yml | 2 +- vendor/assets/javascripts/run-qunit.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e31fd1e742a..22c6b03e28a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,4 +62,4 @@ install: - bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3; fi" script: - - bash -c "if [ '$QUNIT_RUN' == '0' ]; then bundle exec rspec && bundle exec rake plugin:spec; else LOAD_PLUGINS=1 bundle exec rake qunit:test['200000']; fi" + - bash -c "if [ '$QUNIT_RUN' == '0' ]; then bundle exec rspec && bundle exec rake plugin:spec; else LOAD_PLUGINS=1 bundle exec rake qunit:test['300000']; fi" diff --git a/vendor/assets/javascripts/run-qunit.js b/vendor/assets/javascripts/run-qunit.js index 7baa09ad27c..d614ade7250 100644 --- a/vendor/assets/javascripts/run-qunit.js +++ b/vendor/assets/javascripts/run-qunit.js @@ -36,7 +36,7 @@ page.open(args[0], function(status) { } else { page.evaluate(logQUnit); - var timeout = parseInt(args[1] || 360000, 10), + var timeout = parseInt(args[1] || 300000, 10), start = Date.now(); var interval = setInterval(function() {