From e02016dfb6f0e02a6cceb4a541565e05834df8df Mon Sep 17 00:00:00 2001 From: Eran Hammer Date: Sat, 18 Jan 2014 19:16:20 -0800 Subject: [PATCH] For #1245 --- package.json | 1 - test/integration/gzip.js | 177 ++++++++++++++---------------------- test/integration/payload.js | 1 - 3 files changed, 70 insertions(+), 109 deletions(-) diff --git a/package.json b/package.json index 4bd08d1ca..4924e3c01 100755 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ }, "devDependencies": { "lab": "1.x.x", - "request": "2.30.x", "handlebars": "1.2.x", "jade": "1.0.x", "hapi-plugin-test": "2.x.x", diff --git a/test/integration/gzip.js b/test/integration/gzip.js index 963fe071e..6d2ac92f5 100755 --- a/test/integration/gzip.js +++ b/test/integration/gzip.js @@ -2,7 +2,7 @@ var Lab = require('lab'); var Zlib = require('zlib'); -var Request = require('request'); +var Nipple = require('nipple'); var Hapi = require('../..'); @@ -26,6 +26,9 @@ describe('Payload', function () { var uri = ''; var message = { 'msg': 'This message is going to be gzipped.' }; var badMessage = '{ gzip this is just wrong }'; + var data = '{"test":"true"}'; + var zdata = null; + var ddata = null; var postHandler = { method: 'POST', @@ -43,7 +46,7 @@ describe('Payload', function () { path: '/', handler: function (request, reply) { - reply('{"test":"true"}'); + reply(data); } }; @@ -54,7 +57,17 @@ describe('Payload', function () { server.start(function () { uri = 'http://localhost:' + server.info.port; - done(); + + Zlib.gzip(new Buffer(data), function (err, zipped) { + + zdata = zipped.toString(); + + Zlib.deflate(new Buffer(data), function (err, deflated) { + + ddata = deflated.toString(); + done(); + }); + }); }); }); @@ -157,190 +170,140 @@ describe('Payload', function () { it('returns a gzip response on a post request when accept-encoding: gzip is requested', function (done) { - var rawBody = '{"test":"true"}'; - - Zlib.gzip(new Buffer(rawBody), function (err, zippedBody) { + Nipple.post(uri, { headers: { 'accept-encoding': 'gzip' }, payload: data }, function (err, res, body) { - Request.post({ url: uri, headers: { 'accept-encoding': 'gzip' }, body: rawBody }, function (err, res, body) { - - expect(body).to.equal(zippedBody.toString()); - done(); - }); + expect(err).to.not.exist; + expect(body).to.equal(zdata); + done(); }); }); it('returns a gzip response on a get request when accept-encoding: gzip is requested', function (done) { - var rawBody = '{"test":"true"}'; - - Request.get({ url: uri, headers: { 'accept-encoding': 'gzip' } }, function (err, res, body) { - - Zlib.gzip(rawBody, function (err, zippedBody) { + Nipple.get(uri, { headers: { 'accept-encoding': 'gzip' } }, function (err, res, body) { - expect(body).to.equal(zippedBody.toString()); - done(); - }); + expect(err).to.not.exist; + expect(body).to.equal(zdata); + done(); }); }); it('returns a gzip response on a post request when accept-encoding: * is requested', function (done) { - var rawBody = '{"test":"true"}'; - - Zlib.gzip(new Buffer(rawBody), function (err, zippedBody) { + Nipple.post(uri, { headers: { 'accept-encoding': '*' }, payload: data }, function (err, res, body) { - Request.post({ url: uri, headers: { 'accept-encoding': '*' }, body: rawBody }, function (err, res, body) { - - expect(body).to.equal(zippedBody.toString()); - done(); - }); + expect(err).to.not.exist; + expect(body).to.equal(zdata); + done(); }); }); it('returns a gzip response on a get request when accept-encoding: * is requested', function (done) { - var rawBody = '{"test":"true"}'; - - Request.get({ url: uri, headers: { 'accept-encoding': '*' } }, function (err, res, body) { + Nipple.get(uri, { headers: { 'accept-encoding': '*' } }, function (err, res, body) { - Zlib.gzip(rawBody, function (err, zippedBody) { - - expect(body).to.equal(zippedBody.toString()); - done(); - }); + expect(err).to.not.exist; + expect(body).to.equal(zdata); + done(); }); }); it('returns a deflate response on a post request when accept-encoding: deflate is requested', function (done) { - var rawBody = '{"test":"true"}'; + Nipple.post(uri, { headers: { 'accept-encoding': 'deflate' }, payload: data }, function (err, res, body) { - Zlib.deflate(new Buffer(rawBody), function (err, zippedBody) { - - Request.post({ url: uri, headers: { 'accept-encoding': 'deflate' }, body: rawBody }, function (err, res, body) { - - expect(body).to.equal(zippedBody.toString()); - done(); - }); + expect(err).to.not.exist; + expect(body).to.equal(ddata); + done(); }); }); it('returns a deflate response on a get request when accept-encoding: deflate is requested', function (done) { - var rawBody = '{"test":"true"}'; - - Request.get({ url: uri, headers: { 'accept-encoding': 'deflate' } }, function (err, res, body) { + Nipple.get(uri, { headers: { 'accept-encoding': 'deflate' } }, function (err, res, body) { - Zlib.deflate(rawBody, function (err, zippedBody) { - - expect(body).to.equal(zippedBody.toString()); - done(); - }); + expect(err).to.not.exist; + expect(body).to.equal(ddata); + done(); }); }); it('returns a gzip response on a post request when accept-encoding: gzip,q=1; deflate,q=.5 is requested', function (done) { - var rawBody = '{"test":"true"}'; - - Zlib.gzip(new Buffer(rawBody), function (err, zippedBody) { + Nipple.post(uri, { headers: { 'accept-encoding': 'gzip,q=1; deflate,q=.5' }, payload: data }, function (err, res, body) { - Request.post({ url: uri, headers: { 'accept-encoding': 'gzip,q=1; deflate,q=.5' }, body: rawBody }, function (err, res, body) { - - expect(body).to.equal(zippedBody.toString()); - done(); - }); + expect(err).to.not.exist; + expect(body).to.equal(zdata); + done(); }); }); it('returns a gzip response on a get request when accept-encoding: gzip,q=1; deflate,q=.5 is requested', function (done) { - var rawBody = '{"test":"true"}'; - - Request.get({ url: uri, headers: { 'accept-encoding': 'gzip,q=1; deflate,q=.5' } }, function (err, res, body) { - - Zlib.gzip(rawBody, function (err, zippedBody) { + Nipple.get(uri, { headers: { 'accept-encoding': 'gzip,q=1; deflate,q=.5' } }, function (err, res, body) { - expect(body).to.equal(zippedBody.toString()); - done(); - }); + expect(err).to.not.exist; + expect(body).to.equal(zdata); + done(); }); }); it('returns a deflate response on a post request when accept-encoding: deflate,q=1; gzip,q=.5 is requested', function (done) { - var rawBody = '{"test":"true"}'; - - Zlib.deflate(new Buffer(rawBody), function (err, zippedBody) { + Nipple.post(uri, { headers: { 'accept-encoding': 'deflate,q=1; gzip,q=.5' }, payload: data }, function (err, res, body) { - Request.post({ url: uri, headers: { 'accept-encoding': 'deflate,q=1; gzip,q=.5' }, body: rawBody }, function (err, res, body) { - - expect(body).to.equal(zippedBody.toString()); - done(); - }); + expect(err).to.not.exist; + expect(body).to.equal(ddata); + done(); }); }); it('returns a deflate response on a get request when accept-encoding: deflate,q=1; gzip,q=.5 is requested', function (done) { - var rawBody = '{"test":"true"}'; + Nipple.get(uri, { headers: { 'accept-encoding': 'deflate,q=1; gzip,q=.5' } }, function (err, res, body) { - Request.get({ url: uri, headers: { 'accept-encoding': 'deflate,q=1; gzip,q=.5' } }, function (err, res, body) { - - Zlib.deflate(rawBody, function (err, zippedBody) { - - expect(body).to.equal(zippedBody.toString()); - done(); - }); + expect(err).to.not.exist; + expect(body).to.equal(ddata); + done(); }); }); it('returns a gzip response on a post request when accept-encoding: deflate, gzip is requested', function (done) { - var rawBody = '{"test":"true"}'; + Nipple.post(uri, { headers: { 'accept-encoding': 'deflate, gzip' }, payload: data }, function (err, res, body) { - Zlib.gzip(new Buffer(rawBody), function (err, zippedBody) { - - Request.post({ url: uri, headers: { 'accept-encoding': 'deflate, gzip' }, body: rawBody }, function (err, res, body) { - - expect(body).to.equal(zippedBody.toString()); - done(); - }); + expect(err).to.not.exist; + expect(body).to.equal(zdata); + done(); }); }); it('returns a gzip response on a get request when accept-encoding: deflate, gzip is requested', function (done) { - var rawBody = '{"test":"true"}'; - - Request.get({ url: uri, headers: { 'accept-encoding': 'deflate, gzip' } }, function (err, res, body) { + Nipple.get(uri, { headers: { 'accept-encoding': 'deflate, gzip' } }, function (err, res, body) { - Zlib.gzip(rawBody, function (err, zippedBody) { - - expect(body).to.equal(zippedBody.toString()); - done(); - }); + expect(err).to.not.exist; + expect(body).to.equal(zdata); + done(); }); }); it('returns an identity response on a post request when accept-encoding is missing', function (done) { - var rawBody = '{"test":"true"}'; + Nipple.post(uri, { payload: data }, function (err, res, body) { - Request.post({ url: uri, headers: {}, body: rawBody }, function (err, res, body) { - - expect(body).to.equal(rawBody); + expect(err).to.not.exist; + expect(body).to.equal(data); done(); }); }); it('returns an identity response on a get request when accept-encoding is missing', function (done) { - var rawBody = '{"test":"true"}'; - - Request.get({ url: uri, headers: {} }, function (err, res, body) { + Nipple.get(uri, {}, function (err, res, body) { - expect(body).to.equal(rawBody); + expect(err).to.not.exist; + expect(body.toString()).to.equal(data); done(); }); }); diff --git a/test/integration/payload.js b/test/integration/payload.js index 927694678..0374ee237 100755 --- a/test/integration/payload.js +++ b/test/integration/payload.js @@ -1,7 +1,6 @@ // Load modules var Lab = require('lab'); -var Request = require('request'); var Nipple = require('nipple'); var Fs = require('fs'); var Http = require('http');