diff --git a/.travis.yml b/.travis.yml index 717fbcd..1f4631e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,9 @@ language: node_js node_js: - - 0.10 + - 4 + - 6 + +sudo: false before_script: # For Firefox support. @@ -9,15 +12,20 @@ before_script: env: global: - - secure: UDRdz65BGkiFPrTNbMUBaphFD9LJPB2bBOJ5fazgkZqms1VFA6tApPnYHnGrC3YUttW9GJPx2Y937HDZBDzv3CkglqZXo4wx+bBs3O/3LYvGu9jp3hCIpeG5AzqIs1hQvITB8YKtltBpFOptte6UHNkZlNeQl8X1THvT9dxFdCA= - - secure: W07zukbZKgNJMNaWUDDtScwAOScqpJfe7tBlh2GFBhVXwmzYKsVB+4qdl9JLFnWvDaHgU8U65M6GueqInjm8dz9rgsn9m5rXDQhx8KfhiRLHZq4tYE9UKBKW+cDK0s4qArUeUwTwi/UtGpfZHKlBrJohueC+dWAjVbNBWmMGQjY= - - secure: IT8jMoDJL1QysO4+UT5C1bUPWm6nxjicCCrN21N2/o8OcxZZEGYD/52/y9jWzClAjSmnenVOf+mT8kTvQHOfp95nL2EUPmHVtngzbuqrncRt+zQSIme255XUTksdR1tPI8fZ3nfMW+iZaPA09kLphB8Q7nbarOM6dXZdwaSydPM= - - secure: FiticJKWOlcxW4ze9h2sfRjY7RYAgnws87KMzCPEOrduAvpJFqCoGIsnHa7ZAL8LgLSiZOAl68R7lL4R6/lP9BHomqLTygj80ir4ix4HVf1ejIsbOUHxRxu/W+XbiTe5CPphrQhdOydISs2942mey/QtM+2l1w+V7mEGqdVg6s4= + - SAUCE_USERNAME=backbone-testing + - BROWSER_STACK_USERNAME=ryanroemer2 + # BROWSER_STACK_ACCESS_KEY + - secure: "NFY7urPFNJa2uS25vqSl4YSvp/Ux5vIN6KjJwH3UF6ptwPXBqdYk39aGxoIY2jq5Pm4APzxGOmkSMGWex/+4HrwvKyCW/cFOX6ENxLT2lBb72JEHpkDroZNYPW2zyNsiKDZNqki/XfvuPeNHNOM7Rb3HMPS7xOQJWc8hGO0gJbU=" matrix: - - BB_TESTING_CHECK=1 - - BB_TESTING_KARMA=ci - - BB_TESTING_KARMA=sauce - - BB_TESTING_KARMA=bs + # Disable BrowserStack + # https://github.com/ryan-roemer/backbone-testing/issues/27 + # - BB_TESTING_KARMA=bs + +addons: + jwt: + # SAUCE_ACCESS_KEY + secure: "CZP/T9XTQpI2y6fTqryKEPd3hE1e/69mNcFgDaTC6zwm6RxrevzcbnJlXnpLyiDvRoi1MIHhR0hpqQ2jaOYZAmkB2M69LXNFB8aGLvguwtByafmsQqtK9RMXwSWebGAIFvJP7RsMCWg1OzSSlkSbSB2wbAuBGqS/f2Nnu3TQk4I=" + script: - 'if [ "$BB_TESTING_CHECK" ]; then npm run-script check; fi' diff --git a/doc/site.js b/doc/site.js index 2a409af..8b9d524 100644 --- a/doc/site.js +++ b/doc/site.js @@ -50,7 +50,7 @@ $(function () { bookClass = [ "Book Cover" ], - logoClass = [, + logoClass = [ "Formidable Labs" ]; diff --git a/package.json b/package.json index 3db1d26..e25c11e 100644 --- a/package.json +++ b/package.json @@ -9,46 +9,46 @@ "url": "git://github.com/ryan-roemer/backbone-testing/" }, "dependencies": { - "express": "3.2.5", - "mongoose": "3.6.11" + "express": "4.15.2", + "mongoose": "4.3.6" }, "devDependencies": { - "bower": "1.2.7", - "grunt": "0.4.1", - "grunt-cli": "0.1.10", - "grunt-contrib-clean": "0.5.0", - "grunt-contrib-copy": "0.4.1", - "grunt-contrib-jade": "0.8.0", - "grunt-contrib-jshint": "0.7.1", - "grunt-contrib-uglify": "0.2.5", - "grunt-contrib-watch": "0.5.3", - "grunt-karma": "0.8.3", - "grunt-mocha-phantomjs": "0.3.1", - "http-server": "0.5.3", - "karma": "0.12.17", - "karma-coverage": "0.2.6", - "karma-coveralls": "0.1.4", - "karma-browserstack-launcher": "0.1.1", - "karma-chrome-launcher": "0.1.4", - "karma-firefox-launcher": "0.1.3", - "karma-ie-launcher": "0.1.5", - "karma-jasmine": "0.2.2", - "karma-mocha": "0.1.4", - "karma-mocha-reporter": "0.3.0", - "karma-phantomjs-launcher": "0.1.4", - "karma-requirejs": "0.2.2", - "karma-safari-launcher": "0.1.1", - "karma-sauce-launcher": "0.2.10", - "karma-spec-reporter": "0.0.13", - "markdown": "0.4.0", - "mocha": "1.17.1", - "mocha-phantomjs": "3.2.0", - "nodemon": "0.7.8", - "phantomjs": "1.9.2-2", - "requirejs": "2.1.11" + "bower": "1.8.0", + "grunt": "1.0.1", + "grunt-cli": "1.2.0", + "grunt-contrib-clean": "1.0.0", + "grunt-contrib-copy": "1.0.0", + "grunt-contrib-jade": "1.0.0", + "grunt-contrib-jshint": "1.1.0", + "grunt-contrib-uglify": "2.0.0", + "grunt-contrib-watch": "1.0.0", + "grunt-karma": "2.0.0", + "grunt-mocha-phantomjs": "4.0.0", + "http-server": "0.9.0", + "karma": "1.3.0", + "karma-coverage": "1.1.1", + "karma-coveralls": "1.1.2", + "karma-browserstack-launcher": "1.1.1", + "karma-chrome-launcher": "2.0.0", + "karma-firefox-launcher": "1.0.0", + "karma-ie-launcher": "1.0.0", + "karma-jasmine": "1.1.0", + "karma-mocha": "1.3.0", + "karma-mocha-reporter": "2.2.1", + "karma-phantomjs-launcher": "1.0.2", + "karma-requirejs": "1.1.0", + "karma-safari-launcher": "1.0.0", + "karma-sauce-launcher": "1.1.0", + "karma-spec-reporter": "0.0.26", + "markdown": "0.5.0", + "mocha": "3.2.0", + "mocha-phantomjs": "4.1.0", + "nodemon": "1.11.0", + "phantomjs-prebuilt": "2.1.14", + "requirejs": "2.3.2" }, "engines": { - "node": ">0.8.x" + "node": ">4" }, "scripts": { "start": "nodemon notes-rest/server.js",