From d788233633e463e8f7bb1ca5abfbce6ffa4bb5cf Mon Sep 17 00:00:00 2001 From: Mike Larsson Date: Fri, 13 Sep 2013 11:38:23 -0400 Subject: [PATCH 1/3] Getting ready for node 0.10 --- .travis.yml | 1 + package.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d00bae98..dbf93ef4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: node_js node_js: - 0.8 + - 0.10 notifications: irc: - "irc.mozilla.org#badges" diff --git a/package.json b/package.json index 2e8bb29e..2c997857 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "mysql": "~0.9.5", "db-migrate": "0.3.2", "nunjucks": "0.1.9", - "request": "~2.9.200", "underscore": "~1.3.3", "up": "~0.2.2", "optimist": "~0.3.0", @@ -34,9 +33,10 @@ "newrelic": "~0.10.3", "async": "~0.2.6", "bunyan": "~0.21.4", - "gelf-stream": "~0.2.2" + "gelf-stream": "~0.2.2", + "request": "~2.27.0" }, "engines": { - "node": "0.8.x" + "node": ">=0.8" } } From fd13308e2022580bda8ec22724dd6dff6cf711ec Mon Sep 17 00:00:00 2001 From: Mike Larsson Date: Fri, 13 Sep 2013 12:54:17 -0400 Subject: [PATCH 2/3] Disable phantom tests through DISABLE_PHANTOM_TESTS --- test/qunit.backpack.test.js | 2 +- test/qunit.badge-accept.test.js | 2 +- test/qunit.root.test.js | 2 +- test/utils/qunit-tap.js | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/test/qunit.backpack.test.js b/test/qunit.backpack.test.js index 867f7058..6318a86d 100644 --- a/test/qunit.backpack.test.js +++ b/test/qunit.backpack.test.js @@ -1,4 +1,4 @@ var test = require('tap').test; var qunitTap = require('./utils/qunit-tap'); -test('backpack qunit tests', qunitTap.testRunner('/test/backpack/')); +test('backpack qunit tests', qunitTap.details(), qunitTap.testRunner('/test/backpack/')); diff --git a/test/qunit.badge-accept.test.js b/test/qunit.badge-accept.test.js index b4c1b8fd..e5a5141c 100644 --- a/test/qunit.badge-accept.test.js +++ b/test/qunit.badge-accept.test.js @@ -1,4 +1,4 @@ var test = require('tap').test; var qunitTap = require('./utils/qunit-tap'); -test('badge-accept qunit tests', qunitTap.testRunner('/test/badge-accept/')); +test('badge-accept qunit tests', qunitTap.details(), qunitTap.testRunner('/test/badge-accept/')); diff --git a/test/qunit.root.test.js b/test/qunit.root.test.js index 4aca0b70..ed0e1fa6 100644 --- a/test/qunit.root.test.js +++ b/test/qunit.root.test.js @@ -1,4 +1,4 @@ var test = require('tap').test; var qunitTap = require('./utils/qunit-tap'); -test('root qunit tests', qunitTap.testRunner('/test/')); +test('root qunit tests', qunitTap.details(), qunitTap.testRunner('/test/')); diff --git a/test/utils/qunit-tap.js b/test/utils/qunit-tap.js index a34f0983..c343fa67 100644 --- a/test/utils/qunit-tap.js +++ b/test/utils/qunit-tap.js @@ -57,3 +57,9 @@ exports.testRunner = function(path) { }); }; }; + +exports.details = function() { + return { + skip: ('DISABLE_PHANTOM_TESTS' in process.env) + }; +}; From c6c749acd410e116c32d986ec6ac03d9e0ad7cfd Mon Sep 17 00:00:00 2001 From: Mike Larsson Date: Fri, 13 Sep 2013 12:58:47 -0400 Subject: [PATCH 3/3] And set DISABLE_PHANTOM_TESTS for travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index dbf93ef4..e5a70b15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: node_js node_js: - 0.8 - 0.10 +env: DISABLE_PHANTOM_TESTS="see https://github.com/joyent/libuv/issues/826" notifications: irc: - "irc.mozilla.org#badges"