tests: use supertest expect for simple assertions

This commit is contained in:
Douglas Christopher Wilson 2017-03-05 00:04:47 -05:00
parent 7027b37764
commit dc8acc8676
5 changed files with 19 additions and 42 deletions

View File

@ -29,8 +29,8 @@ describe('app', function(){
request(app) request(app)
.get('/user/tj') .get('/user/tj')
.end(function(err, res){ .expect(200, 'tj', function (err) {
res.text.should.equal('tj'); if (err) return done(err)
request(app) request(app)
.get('/user/123') .get('/user/123')
.expect(404, done); .expect(404, done);
@ -69,9 +69,8 @@ describe('app', function(){
request(app) request(app)
.get('/user/123') .get('/user/123')
.end(function(err, res){ .expect(200, '123', function (err) {
res.text.should.equal('123'); if (err) return done(err)
request(app) request(app)
.get('/post/123') .get('/post/123')
.expect('123', done); .expect('123', done);

View File

@ -539,8 +539,8 @@ describe('app.router', function(){
request(app) request(app)
.get('/user/10') .get('/user/10')
.end(function(err, res){ .expect(200, function (err) {
res.statusCode.should.equal(200); if (err) return done(err)
request(app) request(app)
.get('/user/tj') .get('/user/tj')
.expect(404, done); .expect(404, done);

View File

@ -28,11 +28,7 @@ describe('req', function(){
request(app) request(app)
.get('/') .get('/')
.set('Cookie', cookie) .set('Cookie', cookie)
.end(function(err, res){ .expect(200, { obj: { foo: 'bar' } }, done)
if (err) return done(err);
res.body.should.eql({ obj: { foo: 'bar' } });
done();
});
}); });
}) })
}) })

View File

@ -13,11 +13,8 @@ describe('res', function(){
request(app) request(app)
.get('/') .get('/')
.end(function(err, res){ .expect('Set-Cookie', 'sid=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT')
var val = 'sid=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT'; .expect(200, done)
res.header['set-cookie'].should.eql([val]);
done();
})
}) })
}) })
@ -31,11 +28,8 @@ describe('res', function(){
request(app) request(app)
.get('/') .get('/')
.end(function(err, res){ .expect('Set-Cookie', 'sid=; Path=/admin; Expires=Thu, 01 Jan 1970 00:00:00 GMT')
var val = 'sid=; Path=/admin; Expires=Thu, 01 Jan 1970 00:00:00 GMT'; .expect(200, done)
res.header['set-cookie'].should.eql([val]);
done();
})
}) })
}) })
}) })

View File

@ -16,11 +16,8 @@ describe('res', function(){
request(app) request(app)
.get('/') .get('/')
.end(function(err, res){ .expect('Set-Cookie', 'user=j%3A%7B%22name%22%3A%22tobi%22%7D; Path=/')
var val = ['user=' + encodeURIComponent('j:{"name":"tobi"}') + '; Path=/']; .expect(200, done)
res.headers['set-cookie'].should.eql(val);
done();
})
}) })
}) })
@ -34,11 +31,8 @@ describe('res', function(){
request(app) request(app)
.get('/') .get('/')
.end(function(err, res){ .expect('Set-Cookie', 'name=tobi; Path=/')
var val = ['name=tobi; Path=/']; .expect(200, done)
res.headers['set-cookie'].should.eql(val);
done();
})
}) })
it('should allow multiple calls', function(done){ it('should allow multiple calls', function(done){
@ -72,11 +66,8 @@ describe('res', function(){
request(app) request(app)
.get('/') .get('/')
.end(function(err, res){ .expect('Set-Cookie', 'name=tobi; Path=/; HttpOnly; Secure')
var val = ['name=tobi; Path=/; HttpOnly; Secure']; .expect(200, done)
res.headers['set-cookie'].should.eql(val);
done();
})
}) })
describe('maxAge', function(){ describe('maxAge', function(){
@ -178,11 +169,8 @@ describe('res', function(){
request(app) request(app)
.get('/') .get('/')
.end(function(err, res){ .expect('Set-Cookie', 'name=s%3Atobi.xJjV2iZ6EI7C8E5kzwbfA9PVLl1ZR07UTnuTgQQ4EnQ; Path=/')
var val = ['name=s%3Atobi.xJjV2iZ6EI7C8E5kzwbfA9PVLl1ZR07UTnuTgQQ4EnQ; Path=/']; .expect(200, done)
res.headers['set-cookie'].should.eql(val);
done();
})
}) })
}) })
}) })