Merge pull request #99 from keithamus/update-all-the-things

Update all the things

Author: keithamus

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 node_js:
-  - 0.1
-  - 0.11
+  - 4
+  - stable
 deploy:
   provider: npm
   email:

lib/request.js

@@ -191,9 +191,6 @@ module.exports = function (app) {
 module.exports.Test = Test;
 module.exports.Request = Test;
 module.exports.agent = TestAgent;
-module.exports.addPromises = function (Promise) {
-  Test.Promise = Promise;
-};
 
 /*!
  * Test
@@ -214,77 +211,6 @@ function Test (app, method, path) {
   this.url = typeof app === 'string' ? app + path : serverAddress(app, path);
 }
 util.inherits(Test, Request);
-Test.Promise = global.Promise;
-
-/**
- * ### .then (resolveCb, rejectCb)
- *
- * Invoke the request to to the server. The response
- * will be passed as a parameter to the resolveCb,
- * while any errors will be passed to rejectCb.
- *
- * ```js
- * chai.request(app)
- *   .get('/')
- *   .then(function (res) {
- *     expect(res).to.have.status(200);
- *   }, function (err) {
- *      throw err;
- *   });
- * ```
- *
- * @param {Function} resolveCB
- * @cb {Response}
- * @param {Function} rejectCB
- * @cb {Error}
- * @name then
- * @api public
- */
-
-Test.prototype.then = function (onResolve, onReject) {
-  if (!Test.Promise) {
-    throw new Error('Tried to use chai-http with promises, but no Promise library set');
-  }
-  if (!this._promise) {
-    var self = this;
-    this._promise = new Test.Promise(function (resolve, reject) {
-      self.end(function (err, res) {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(res);
-        }
-      });
-    });
-  }
-  this._promise = this._promise.then(onResolve, onReject);
-  return this;
-};
-
-/**
- * ### .catch (rejectCb)
- *
- * Invoke the request to to the server, catching any
- * errors with this callback. Behaves the same as
- * Promises.
- *
- * ```js
- * chai.request(app)
- *   .get('/')
- *   .catch(function (err) {
- *     throw err;
- *   });
- * ```
- *
- * @param {Function} rejectCB
- * @cb {Error}
- * @name catch
- * @api public
- */
-
-Test.prototype.catch = function (reject) {
-    return this.then(undefined, reject);
-};
 
 function serverAddress (app, path) {
   if ('string' === typeof app) {
@@ -332,11 +258,11 @@ methods.forEach(function(method){
 
     if (Agent) {
       // When running in Node, cookies are managed via
-      // `Agent.saveCookies()` and `Agent.attachCookies()`.
-      req.on('response', function (res) { self.saveCookies(res); });
-      req.on('redirect', function (res) { self.saveCookies(res); });
-      req.on('redirect', function () { self.attachCookies(req); });
-      this.attachCookies(req);
+      // `Agent._saveCookies()` and `Agent._attachCookies()`.
+      req.on('response', function (res) { self._saveCookies(res); });
+      req.on('redirect', function (res) { self._saveCookies(res); });
+      req.on('redirect', function () { self._attachCookies(req); });
+      this._attachCookies(req);
     }
     else {
       // When running in a web browser, cookies are managed via `Request.withCredentials()`.

package.json

@@ -48,20 +48,20 @@
   "dependencies": {
     "cookiejar": "2.0.x",
     "is-ip": "1.0.0",
-    "methods": "0.0.x",
-    "qs": "2.0.x",
-    "superagent": "1.2.x"
+    "methods": "^1.1.2",
+    "qs": "^6.2.0",
+    "superagent": "^2.0.0"
   },
   "devDependencies": {
     "simplifyify": "^2.0.1",
     "chai": "*",
-    "coveralls": "^2.11.6",
-    "dox": "*",
-    "es6-shim": "*",
-    "http-server": "*",
-    "istanbul": "^0.4.2",
-    "mocha": "*",
-    "npm-run-all": "^1.5.1"
+    "coveralls": "^2.11.9",
+    "dox": "^0.8.1",
+    "es6-shim": "^0.35.1",
+    "http-server": "^0.9.0",
+    "istanbul": "^0.4.3",
+    "mocha": "^2.5.3",
+    "npm-run-all": "^2.1.1"
   },
   "engines": {
     "node": ">= 0.6.0"

test/request.js

@@ -2,7 +2,6 @@ describe('request', function () {
   var isNode = typeof process === 'object';
   var isBrowser = typeof window === 'object';
   var request = chai.request;
-  request.addPromises(Promise);
 
   describe('Browser and Node.js', function () {
     it('is present on chai', function () {