github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-29 17:04:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

change the *correct* timeout value

Browse Source
This commit is contained in:
Régis Hanol 2017-07-24 11:44:33 +02:00
parent 2779fde565
commit 28a397398f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -62,4 +62,4 @@ install:
- bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3; fi" - bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3; fi"
script: 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"

2
vendor/assets/javascripts/run-qunit.js vendored
View File

@ -36,7 +36,7 @@ page.open(args[0], function(status) {
} else { } else {
page.evaluate(logQUnit); page.evaluate(logQUnit);
var timeout = parseInt(args[1] || 360000, 10), var timeout = parseInt(args[1] || 300000, 10),
start = Date.now(); start = Date.now();
var interval = setInterval(function() { var interval = setInterval(function() {