diff --git a/.travis.yml b/.travis.yml index eeea09f..f0337a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,27 @@ +# sudo: required language: objective-c +# language: node_js node_js: - "0.10" + before_install: # Install phantomjs - - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.0.0-macosx.zip - - unzip phantomjs-2.0.0-macosx.zip - - export PATH="`pwd`/phantomjs-2.0.0-macosx/bin:${PATH}" + - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-macosx.zip + - unzip phantomjs-2.1.1-macosx.zip + - export PATH="`pwd`/phantomjs-2.1.1-macosx/bin:${PATH}" # Run Arunoda's script - - "curl -L http://git.io/ejPSng | /bin/sh" + - "curl -L https://git.io/ejPSng | /bin/sh" script: "make test" + +env: + - METEOR_RELEASE=1.3.5.1 + +# Later stuff for Meteor 1.4: see https://github.com/arunoda/travis-ci-meteor-packages/pull/45 +# env: +# - CXX=g++-4.8 METEOR_RELEASE=1.3.5.1 +# addons: +# apt: +# sources: +# - ubuntu-toolchain-r-test +# packages: +# - g++-4.8 diff --git a/server/timers_server.js b/server/timers_server.js index 4575505..4a00db0 100644 --- a/server/timers_server.js +++ b/server/timers_server.js @@ -106,9 +106,9 @@ class Timers { * @param {Function} func The function to call when a round ends. The * function will be called with a single argument indicating the reason * the round ended, either - * TurkServer.Timers.NEW_ROUND_TIMEOUT, - * TurkServer.Timers.NEW_ROUND_MANUAL, or - * TurkServer.Timers.NEW_ROUND_NEWROUND. + * TurkServer.Timers.ROUND_END_TIMEOUT, + * TurkServer.Timers.ROUND_END_MANUAL, or + * TurkServer.Timers.ROUND_END_NEWROUND. */ static onRoundEnd(func) { _round_handlers.push(func);