Skip to content

Commit fc7f25a

Browse files
kevinrambauddead-horse
authored andcommitted
Fix mocha version and unit tests (koajs#117)
* Remove duplicate supertest dependency * Fix mocha version * Add an after statement to close koa app instance after running tests
1 parent 98830cc commit fc7f25a

File tree

18 files changed

+116
-33
lines changed

18 files changed

+116
-33
lines changed

404/test.js

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
21
const app = require('./app');
3-
const request = require('supertest').agent(app.listen());
2+
const server = app.listen();
3+
const request = require('supertest').agent(server);
44

55
describe('404', function() {
6+
after(function() {
7+
server.close();
8+
});
9+
610
describe('when GET /', function() {
711
it('should return the 404 page', function(done) {
812
request
9-
.get('/')
10-
.expect(404)
11-
.expect(/Page Not Found/, done);
13+
.get('/')
14+
.expect(404)
15+
.expect(/Page Not Found/, done);
1216
});
1317
});
1418
});

base-auth/test.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
var app = require('./app');
2-
var request = require('supertest').agent(app.listen());
1+
const app = require('./app');
2+
const server = app.listen();
3+
const request = require('supertest').agent(server);
34

45
describe('Koa Basic Auth', function() {
6+
after(function() {
7+
server.close();
8+
});
9+
510
describe('with no credentials', function() {
611
it('should `throw` 401', function(done) {
712
request

blog/test.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
const app = require('./app');
2-
const request = require('supertest').agent(app.listen());
31
require('should');
2+
const app = require('./app');
3+
const server = app.listen();
4+
const request = require('supertest').agent(server);
45

56
describe('Blog', function() {
7+
after(function() {
8+
server.close();
9+
});
10+
611
describe('GET /', function() {
712
it('should see title "Posts"', function(done) {
813
request

body-parsing/test.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
var app = require('./app');
2-
var request = require('supertest').agent(app.listen());
1+
const app = require('./app');
2+
const server = app.listen();
3+
const request = require('supertest').agent(server);
34

45
describe('Body Parsing', function() {
6+
after(function() {
7+
server.close();
8+
});
9+
510
describe('POST /uppercase', function() {
611
describe('with JSON', function() {
712
it('should work', function(done) {

compose/test.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
const app = require('./app');
2-
const request = require('supertest').agent(app.listen());
2+
const server = app.listen();
3+
const request = require('supertest').agent(server);
34

45
describe('Compose', function() {
6+
after(function() {
7+
server.close();
8+
});
9+
510
describe('when GET /', function() {
611
it('should say "Hello World"', function(done) {
712
request

cookies/test.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
var app = require('./app');
2-
var request = require('supertest').agent(app.listen());
1+
const app = require('./app');
2+
const server = app.listen();
3+
const request = require('supertest').agent(server);
34

45
describe('Cookies Views', function() {
6+
after(function() {
7+
server.close();
8+
});
9+
510
[1, 2, 3].forEach(function(i) {
611
describe('on iteration #' + i, function() {
712
it('should set the views as a cookie and as the body', function(done) {

csrf/test.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
require('should');
22
const app = require('./app');
3-
const request = require('supertest').agent(app.listen());
3+
const server = app.listen();
4+
const request = require('supertest').agent(server);
45

56
let token;
67
let cookie;
78

89
describe('csrf', function() {
10+
after(function() {
11+
server.close();
12+
});
13+
914
describe('GET /token', function() {
1015
it('should get token', function(done) {
1116
request

errors/test.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
require('should');
22
const app = require('./app');
3-
const request = require('supertest').agent(app.listen());
3+
const server = app.listen();
4+
const request = require('supertest').agent(server);
45

56
describe('Errors', function() {
7+
after(function() {
8+
server.close();
9+
});
10+
611
it('should catch the error', function(done) {
712
request
813
.get('/')

flash-messages/test.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
require('should');
22
const app = require('./app');
3-
const request = require('supertest').agent(app.listen());
3+
const server = app.listen();
4+
const request = require('supertest').agent(server);
45

56
describe('Flash Messages', function() {
7+
after(function() {
8+
server.close();
9+
});
10+
611
it('GET should return an empty array', function(done) {
712
request
813
.get('/messages')

hello-world/test.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
var app = require('./app');
2-
var request = require('supertest').agent(app.listen());
1+
const app = require('./app');
2+
const server = app.listen();
3+
const request = require('supertest').agent(server);
34

45
describe('Hello World', function() {
6+
after(function() {
7+
server.close();
8+
});
9+
510
it('should say "Hello World"', function(done) {
611
request
712
.get('/')

multipart/test.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
require('should');
2-
const app = require('./app');
32
const fs = require('fs');
4-
const request = require('supertest').agent(app.listen());
3+
const app = require('./app');
4+
const server = app.listen();
5+
const request = require('supertest').agent(server);
56

67
// https://github.com/mscdex/busboy/blob/master/test/test-types-multipart.js
78
const ct = 'multipart/form-data; boundary=---------------------------paZqsnEHRufoShdX6fh0lUhXBP4k';
@@ -28,6 +29,10 @@ const body = [
2829
].join('\r\n');
2930

3031
describe('Multipart Files', function() {
32+
after(function() {
33+
server.close();
34+
});
35+
3136
it('should store all the files', function(done) {
3237
request
3338
.post('/')

negotiation/test.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
const app = require('./app');
2-
const request = require('supertest').agent(app.listen());
2+
const server = app.listen();
3+
const request = require('supertest').agent(server);
34

45
describe('negotiation', function() {
6+
after(function() {
7+
server.close();
8+
});
9+
510
describe('json', function() {
611
it('should respond with json', function(done) {
712
request

package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@
1818
"koa-static": "^3.0.0",
1919
"koa-views": "^6.0.2",
2020
"streaming-json-stringify": "^3.1.0",
21-
"supertest": "^3.0.0",
2221
"swig": "^1.4.2"
2322
},
2423
"devDependencies": {
2524
"eslint": "^3.8.1",
2625
"eslint-config-standard": "^6.2.0",
2726
"eslint-plugin-promise": "^3.3.0",
2827
"eslint-plugin-standard": "^2.0.1",
29-
"mocha": "*",
28+
"mocha": "^5.0.0",
3029
"should": "^3.3.2",
31-
"supertest": "*"
30+
"supertest": "^3.0.0"
3231
},
3332
"scripts": {
3433
"test": "make test"

stream-file/test.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
var app = require('./app');
2-
var request = require('supertest').agent(app.listen());
1+
const app = require('./app');
2+
const server = app.listen();
3+
const request = require('supertest').agent(server);
34

45
describe('Stream File', function() {
6+
after(function() {
7+
server.close();
8+
});
9+
510
it('GET /app.js', function(done) {
611
request
712
.get('/app.js')

stream-objects/test.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
require('should');
22
const app = require('./app');
3-
const request = require('supertest').agent(app.listen());
3+
const server = app.listen();
4+
const request = require('supertest').agent(server);
45

56
describe('Stream Objects', function() {
7+
after(function() {
8+
server.close();
9+
});
10+
611
it('GET /', function(done) {
712
request
813
.get('/app.js')

stream-view/test.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
require('should');
22
const app = require('./app');
3-
const request = require('supertest').agent(app.listen());
3+
const server = app.listen();
4+
const request = require('supertest').agent(server);
45

56
describe('Stream View', function() {
7+
after(function() {
8+
server.close();
9+
});
10+
611
it('GET /', function(done) {
712
request
813
.get('/')

templates/test.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
var app = require('./app');
2-
var request = require('supertest').agent(app.listen());
1+
const app = require('./app');
2+
const server = app.listen();
3+
const request = require('supertest').agent(server);
34

45
describe('Templates', function() {
6+
after(function() {
7+
server.close();
8+
});
9+
510
describe('GET /', function() {
611
it('should respond with a rendered view', function(done) {
712
request

vhost/test.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
var app = require('./app');
2-
var request = require('supertest').agent(app.listen());
1+
const app = require('./app');
2+
const server = app.listen();
3+
const request = require('supertest').agent(server);
34

45
describe('Virtual Host', function() {
6+
after(function() {
7+
server.close();
8+
});
9+
510
describe('www subdomain koa app', function() {
611
describe('when GET /', function() {
712
it('should say "Hello from www app"', function(done) {

0 commit comments

Comments
 (0)