commit 860a9319d6c2e3aaf6875da7049e809a62bc5582
Author: Tom Hughes <tom@compton.nu>
Date: Tue Nov 24 10:44:42 2015 +0000
Update tests for changes to should.js
diff --git a/test/bodyParser.js b/test/bodyParser.js
index 828db2b..b4ef93f 100644
--- a/test/bodyParser.js
+++ b/test/bodyParser.js
@@ -66,7 +66,7 @@ describe('connect.bodyParser()', function(){
app.use(function(req, res){
assert('Tobi' == req.body.user.name);
req.files.text.originalFilename.should.equal('foo.txt');
- req.files.text.path.should.include('.txt');
+ req.files.text.path.should.containEql('.txt');
res.end(req.files.text.originalFilename);
});
diff --git a/test/cookieSession.js b/test/cookieSession.js
index ece8a4f..1827914 100644
--- a/test/cookieSession.js
+++ b/test/cookieSession.js
@@ -32,7 +32,7 @@ describe('connect.cookieSession()', function(){
.get('/')
.end(function(res){
var cookie = res.headers['set-cookie'][0];
- cookie.should.not.include('expires');
+ cookie.should.not.containEql('expires');
done();
});
})
@@ -78,7 +78,7 @@ describe('connect.cookieSession()', function(){
app.request()
.get('/')
.end(function(res){
- sess(res).should.not.include('expires');
+ sess(res).should.not.containEql('expires');
app.request()
.get('/')
.set('Cookie', sess(res))
@@ -110,13 +110,13 @@ describe('connect.cookieSession()', function(){
app.request()
.get('/')
.end(function(res){
- sess(res).should.not.include('expires');
+ sess(res).should.not.containEql('expires');
res.body.should.equal('wahoo');
app.request()
.get('/')
.set('Cookie', sess(res).replace(';', 'foobar')) // make invalid session cookie
.end(function(res){
- sess(res).should.not.include('expires');
+ sess(res).should.not.containEql('expires');
res.body.should.equal('wahoo');
done();
});
@@ -136,8 +136,8 @@ describe('connect.cookieSession()', function(){
.get('/')
.end(function(res){
var cookie = sess(res);
- cookie.should.include('Path=/');
- cookie.should.include('HttpOnly');
+ cookie.should.containEql('Path=/');
+ cookie.should.containEql('HttpOnly');
res.body.should.equal('');
done();
})
@@ -154,8 +154,8 @@ describe('connect.cookieSession()', function(){
.get('/admin')
.end(function(res){
var cookie = sess(res);
- cookie.should.include('Path=/admin');
- cookie.should.not.include('HttpOnly');
+ cookie.should.containEql('Path=/admin');
+ cookie.should.not.containEql('HttpOnly');
done();
})
})
@@ -207,8 +207,8 @@ describe('connect.cookieSession()', function(){
.get('/')
.end(function(res){
var cookie = sess(res);
- cookie.should.include('Path=/');
- cookie.should.not.include('HttpOnly');
+ cookie.should.containEql('Path=/');
+ cookie.should.not.containEql('HttpOnly');
done();
})
})
diff --git a/test/directory.js b/test/directory.js
index b686452..d8fd3ef 100644
--- a/test/directory.js
+++ b/test/directory.js
@@ -14,11 +14,11 @@ describe('directory()', function(){
.set('Accept', 'application/json')
.end(function(res){
var arr = JSON.parse(res.body);
- arr.should.include('g# %3 o %2525 %37 dir');
- arr.should.include('users');
- arr.should.include('file #1.txt');
- arr.should.include('nums');
- arr.should.include('todo.txt');
+ arr.should.containEql('g# %3 o %2525 %37 dir');
+ arr.should.containEql('users');
+ arr.should.containEql('file #1.txt');
+ arr.should.containEql('nums');
+ arr.should.containEql('todo.txt');
done();
});
});
@@ -31,10 +31,10 @@ describe('directory()', function(){
.set('Accept', 'text/html')
.end(function (res) {
res.should.be.html;
- res.body.should.include('<a href="/g%23%20%253%20o%20%252525%20%2537%20dir"');
- res.body.should.include('<a href="/users"');
- res.body.should.include('<a href="/file%20%231.txt"');
- res.body.should.include('<a href="/todo.txt"');
+ res.body.should.containEql('<a href="/g%23%20%253%20o%20%252525%20%2537%20dir"');
+ res.body.should.containEql('<a href="/users"');
+ res.body.should.containEql('<a href="/file%20%231.txt"');
+ res.body.should.containEql('<a href="/todo.txt"');
done();
});
});
@@ -66,10 +66,10 @@ describe('directory()', function(){
.get('/')
.set('Accept', 'text/plain')
.end(function (res) {
- res.body.should.include('users');
- res.body.should.include('g# %3 o %2525 %37 dir');
- res.body.should.include('file #1.txt');
- res.body.should.include('todo.txt');
+ res.body.should.containEql('users');
+ res.body.should.containEql('g# %3 o %2525 %37 dir');
+ res.body.should.containEql('file #1.txt');
+ res.body.should.containEql('todo.txt');
done();
});
});
@@ -82,8 +82,8 @@ describe('directory()', function(){
.get('/users/')
.set('Accept', 'text/html')
.end(function(res){
- res.body.should.include('<a href="/users/index.html"');
- res.body.should.include('<a href="/users/tobi.txt"');
+ res.body.should.containEql('<a href="/users/index.html"');
+ res.body.should.containEql('<a href="/users/tobi.txt"');
done();
});
});
@@ -93,8 +93,8 @@ describe('directory()', function(){
.get('/%23directory/')
.set('Accept', 'text/html')
.end(function(res){
- res.body.should.include('<a href="/%23directory"');
- res.body.should.include('<a href="/%23directory/index.html"');
+ res.body.should.containEql('<a href="/%23directory"');
+ res.body.should.containEql('<a href="/%23directory/index.html"');
done();
});
});
@@ -104,8 +104,8 @@ describe('directory()', function(){
.get('/g%23%20%253%20o%20%252525%20%2537%20dir/')
.set('Accept', 'text/html')
.end(function(res){
- res.body.should.include('<a href="/g%23%20%253%20o%20%252525%20%2537%20dir"');
- res.body.should.include('<a href="/g%23%20%253%20o%20%252525%20%2537%20dir/empty.txt"');
+ res.body.should.containEql('<a href="/g%23%20%253%20o%20%252525%20%2537%20dir"');
+ res.body.should.containEql('<a href="/g%23%20%253%20o%20%252525%20%2537%20dir/empty.txt"');
done();
});
});
@@ -127,11 +127,11 @@ describe('directory()', function(){
.set('Accept', 'text/html')
.end(function(res){
res.should.be.html;
- res.body.should.include('<a href="/g%23%20%253%20o%20%252525%20%2537%20dir"');
- res.body.should.include('<a href="/users"');
- res.body.should.include('<a href="/file%20%231.txt"');
- res.body.should.include('<a href="/todo.txt"');
- res.body.should.include('This is the test template');
+ res.body.should.containEql('<a href="/g%23%20%253%20o%20%252525%20%2537%20dir"');
+ res.body.should.containEql('<a href="/users"');
+ res.body.should.containEql('<a href="/file%20%231.txt"');
+ res.body.should.containEql('<a href="/todo.txt"');
+ res.body.should.containEql('This is the test template');
done();
});
});
@@ -147,10 +147,10 @@ describe('directory()', function(){
.end(function(res){
res.statusCode.should.equal(200);
var arr = JSON.parse(res.body);
- arr.should.include('users');
- arr.should.include('file #1.txt');
- arr.should.include('nums');
- arr.should.include('todo.txt');
+ arr.should.containEql('users');
+ arr.should.containEql('file #1.txt');
+ arr.should.containEql('nums');
+ arr.should.containEql('todo.txt');
done();
});
});
@@ -166,9 +166,9 @@ describe('directory()', function(){
.end(function(res){
res.statusCode.should.equal(200);
var arr = JSON.parse(res.body);
- arr.should.include('LICENSE');
- arr.should.include('lib');
- arr.should.include('test');
+ arr.should.containEql('LICENSE');
+ arr.should.containEql('lib');
+ arr.should.containEql('test');
done();
});
});
diff --git a/test/json.js b/test/json.js
index 7c6f954..3aadc23 100644
--- a/test/json.js
+++ b/test/json.js
@@ -88,7 +88,7 @@ describe('connect.json()', function(){
.set('Content-Type', 'application/json')
.end(function(res) {
res.should.have.status(400);
- res.body.should.include("invalid json, empty body");
+ res.body.should.containEql("invalid json, empty body");
done();
})
})
@@ -141,7 +141,7 @@ describe('connect.json()', function(){
.write('true')
.end(function(res){
res.should.have.status(400);
- res.body.should.include('invalid json');
+ res.body.should.containEql('invalid json');
done();
});
})
@@ -160,7 +160,7 @@ describe('connect.json()', function(){
.write(' { "user": "tobi" }')
.end(function(res){
res.should.have.status(200);
- res.body.should.include('{"user":"tobi"}');
+ res.body.should.containEql('{"user":"tobi"}');
done();
});
})
diff --git a/test/patch.js b/test/patch.js
index 36b89c3..fef1313 100644
--- a/test/patch.js
+++ b/test/patch.js
@@ -142,10 +142,10 @@ describe('patch', function(){
app.request()
.get('/')
.end(function(res){
- res.headers['set-cookie'].should.include('foo1');
- res.headers['set-cookie'].should.include('bar1');
- res.headers['set-cookie'].should.include('foo2');
- res.headers['set-cookie'].should.include('bar2');
+ res.headers['set-cookie'].should.containEql('foo1');
+ res.headers['set-cookie'].should.containEql('bar1');
+ res.headers['set-cookie'].should.containEql('foo2');
+ res.headers['set-cookie'].should.containEql('bar2');
done();
});
})
@@ -171,9 +171,9 @@ describe('patch', function(){
app.request()
.get('/')
.end(function(res){
- res.headers['set-cookie'].should.include('foo1');
- res.headers['set-cookie'].should.include('bar1');
- res.headers['set-cookie'].should.include('foo2');
+ res.headers['set-cookie'].should.containEql('foo1');
+ res.headers['set-cookie'].should.containEql('bar1');
+ res.headers['set-cookie'].should.containEql('foo2');
done();
});
})
diff --git a/test/rollingSession.js b/test/rollingSession.js
index 24fb127..c312406 100644
--- a/test/rollingSession.js
+++ b/test/rollingSession.js
@@ -28,7 +28,7 @@ describe('Rolling Session', function(){
.get('/')
.end(function(res){
res.headers.should.have.property('set-cookie');
- res.headers['set-cookie'][0].should.include('Expires');
+ res.headers['set-cookie'][0].should.containEql('Expires');
app.request()
.get('/changeToNull')
.set('Cookie', res.headers['set-cookie'][0])
@@ -54,13 +54,13 @@ describe('Rolling Session', function(){
.get('/')
.end(function(res){
res.headers.should.have.property('set-cookie');
- res.headers['set-cookie'][0].should.include('Expires');
+ res.headers['set-cookie'][0].should.containEql('Expires');
app.request()
.get('/changeToNull')
.set('Cookie', res.headers['set-cookie'][0])
.end(function(res){
res.headers.should.have.property('set-cookie');
- res.headers['set-cookie'][0].should.not.include('Expires');
+ res.headers['set-cookie'][0].should.not.containEql('Expires');
done();
});
});
diff --git a/test/session.js b/test/session.js
index b0757cf..c5b1ec7 100644
--- a/test/session.js
+++ b/test/session.js
@@ -324,8 +324,8 @@ describe('connect.session()', function(){
.get('/')
.set('X-Forwarded-Proto', 'https')
.end(function(res){
- res.headers['set-cookie'][0].should.not.include('HttpOnly');
- res.headers['set-cookie'][0].should.include('Secure');
+ res.headers['set-cookie'][0].should.not.containEql('HttpOnly');
+ res.headers['set-cookie'][0].should.containEql('Secure');
done();
});
})
@@ -342,7 +342,7 @@ describe('connect.session()', function(){
.get('/admin')
.end(function(res){
var cookie = res.headers['set-cookie'][0];
- cookie.should.not.include('Expires');
+ cookie.should.not.containEql('Expires');
done();
});
})
@@ -383,10 +383,10 @@ describe('connect.session()', function(){
.get('/admin')
.end(function(res){
var cookie = res.headers['set-cookie'][0];
- cookie.should.not.include('HttpOnly');
- cookie.should.not.include('Secure');
- cookie.should.include('Path=/admin');
- cookie.should.include('Expires');
+ cookie.should.not.containEql('HttpOnly');
+ cookie.should.not.containEql('Secure');
+ cookie.should.containEql('Path=/admin');
+ cookie.should.containEql('Expires');
done();
});
})
@@ -587,7 +587,7 @@ describe('connect.session()', function(){
app.request()
.get('/')
.end(function(res){
- res.headers['set-cookie'][0].should.not.include('Expires=');
+ res.headers['set-cookie'][0].should.not.containEql('Expires=');
done();
});
})