From a920af553252db20830028b020b1c5352068a98e Mon Sep 17 00:00:00 2001 From: Michael Holtzman Date: Sun, 17 Apr 2016 13:50:49 -0400 Subject: [PATCH] MISC Update dev deps, small updates to README. --- Readme.md | 29 ++++++++++++++--------------- example.js | 20 -------------------- package.json | 14 +++++++------- test/supertest.js | 2 +- 4 files changed, 22 insertions(+), 43 deletions(-) delete mode 100644 example.js diff --git a/Readme.md b/Readme.md index 6d065c1f..006e2b56 100644 --- a/Readme.md +++ b/Readme.md @@ -1,4 +1,4 @@ -# SuperTest [![Build Status](https://travis-ci.org/visionmedia/supertest.svg?branch=master)](https://travis-ci.org/visionmedia/supertest) [![npm version](https://badge.fury.io/js/supertest.svg)](https://www.npmjs.com/package/supertest) +# SuperTest [![Build Status](https://travis-ci.org/visionmedia/supertest.svg?branch=master)](https://travis-ci.org/visionmedia/supertest) [![npm version](https://badge.fury.io/js/supertest.svg)](https://www.npmjs.com/package/supertest) [![Dependency Status](https://david-dm.org/visionmedia/supertest.svg)](https://david-dm.org/visionmedia/supertest) HTTP assertions made easy via [super-agent](http://github.com/visionmedia/superagent). @@ -26,12 +26,12 @@ npm install supertest --save-dev test framework at all: ```js -var request = require('supertest') - , express = require('express'); +var request = require('supertest'); +var express = require('express'); var app = express(); -app.get('/user', function(req, res){ +app.get('/user', function(req, res) { res.status(200).json({ name: 'tobi' }); }); @@ -40,7 +40,7 @@ request(app) .expect('Content-Type', /json/) .expect('Content-Length', '15') .expect(200) - .end(function(err, res){ + .end(function(err, res) { if (err) throw err; }); ``` @@ -48,15 +48,15 @@ request(app) Here's an example with mocha, note how you can pass `done` straight to any of the `.expect()` calls: ```js -describe('GET /user', function(){ - it('respond with json', function(done){ +describe('GET /user', function() { + it('respond with json', function(done) { request(app) .get('/user') .set('Accept', 'application/json') .expect('Content-Type', /json/) .expect(200, done); - }) -}) + }); +}); ``` One thing to note with the above statement is that superagent now sends any HTTP @@ -68,13 +68,13 @@ you do not add a status code expect (i.e. `.expect(302)`). order to fail the test case, you will need to rethrow or pass `err` to `done()`, as follows: ```js -describe('GET /users', function(){ - it('respond with json', function(done){ +describe('GET /users', function() { + it('respond with json', function(done) { request(app) .get('/user') .set('Accept', 'application/json') .expect(200) - .end(function(err, res){ + .end(function(err, res) { if (err) return done(err); done(); }); @@ -86,8 +86,8 @@ describe('GET /users', function(){ to modify the response body or headers before executing an assertion. ```js -describe('GET /user', function(){ - it('user.name should be an case-insensitive match for "tobi"', function(done){ +describe('GET /user', function() { + it('user.name should be an case-insensitive match for "tobi"', function(done) { request(app) .get('/user') .set('Accept', 'application/json') @@ -101,7 +101,6 @@ describe('GET /user', function(){ }, done); }); }); - ``` Anything you can do with superagent, you can do with supertest - for example multipart file uploads! diff --git a/example.js b/example.js deleted file mode 100644 index d128ab70..00000000 --- a/example.js +++ /dev/null @@ -1,20 +0,0 @@ - -var request = require('./') - , express = require('express'); - -var app = express(); - -app.get('/user', function(req, res){ - res.status(201).json({ name: 'tobi' }); -}); - -request(app) - .get('/user') - .expect('Content-Type', /json/) - .expect('Content-Length', '15') - .expect(201) - .end(function(err, res){ - if (err) throw err; - console.log('done'); - process.exit(); - }); diff --git a/package.json b/package.json index 681d3b84..59db93bc 100644 --- a/package.json +++ b/package.json @@ -12,13 +12,13 @@ "methods": "1.x" }, "devDependencies": { - "body-parser": "~1.13.2", - "cookie-parser": "~1.3.5", - "eslint": "^2.5.3", - "eslint-config-airbnb": "^6.2.0", - "express": "~4.12.4", - "mocha": "~2.2.5", - "should": "~7.0.2" + "body-parser": "~1.15.0", + "cookie-parser": "~1.4.1", + "eslint": "^2.8.0", + "eslint-config-airbnb": "^7.0.0", + "express": "~4.13.4", + "mocha": "~2.4.5", + "should": "~8.3.1" }, "engines": { "node": ">=0.10.0" diff --git a/test/supertest.js b/test/supertest.js index 72cd4b6c..159d6a4e 100644 --- a/test/supertest.js +++ b/test/supertest.js @@ -440,7 +440,7 @@ describe('request(app)', function() { .expect(200) .expect('hey') .end(function(err, res) { - err.message.should.equal('expected 200 \"OK"\, got 500 \"Internal Server Error\"'); + err.message.should.equal('expected 200 "OK", got 500 "Internal Server Error"'); done(); }); });