Merge pull request #920 from stenington/node-0.10.10

Getting ready for node 0.10

.travis.yml

@@ -1,6 +1,8 @@
 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"

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"
   }
 }

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/'));

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/'));

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/'));

test/utils/qunit-tap.js

@@ -57,3 +57,9 @@ exports.testRunner = function(path) {
     });
   };
 };
+
+exports.details = function() {
+  return {
+    skip: ('DISABLE_PHANTOM_TESTS' in process.env)
+  };
+};