Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-07-02 16:26:31 -06:00
parent f1c955e6fc
commit 1471fbdc14
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test/controllers.js
View File

@@ -808,7 +808,8 @@ describe('Controllers', function () {
it('should redirect to account page with logged in user', function (done) { it('should redirect to account page with logged in user', function (done) {
request(nconf.get('url') + '/api/login', { jar: jar, json: true }, function (err, res, body) { request(nconf.get('url') + '/api/login', { jar: jar, json: true }, function (err, res, body) {
assert.ifError(err); assert.ifError(err);
assert.equal(res.statusCode, 308); assert.equal(res.statusCode, 200);
assert.equal(res.headers['x-redirect'], '/user/foo');
assert.equal(body, '/user/foo'); assert.equal(body, '/user/foo');
done(); done();
}); });
@@ -825,7 +826,8 @@ describe('Controllers', function () {
it('should redirect to userslug', function (done) { it('should redirect to userslug', function (done) {
request(nconf.get('url') + '/api/uid/' + fooUid, { json: true }, function (err, res, body) { request(nconf.get('url') + '/api/uid/' + fooUid, { json: true }, function (err, res, body) {
assert.ifError(err); assert.ifError(err);
assert.equal(res.statusCode, 308); assert.equal(res.statusCode, 200);
assert.equal(res.headers['x-redirect'], '/user/foo');
assert.equal(body, '/user/foo'); assert.equal(body, '/user/foo');
done(); done();
}); });
@@ -1238,10 +1240,11 @@ describe('Controllers', function () {
}); });
it('should return correct post path', function (done) { it('should return correct post path', function (done) {
request(nconf.get('url') + '/api/post/' + pid, function (err, res, body) { request(nconf.get('url') + '/api/post/' + pid, { json: true }, function (err, res, body) {
assert.ifError(err); assert.ifError(err);
assert.equal(res.statusCode, 308); assert.equal(res.statusCode, 200);
assert.equal(body, '"/topic/1/test-topic-title/1"'); assert.equal(res.headers['x-redirect'], '/topic/1/test-topic-title/1');
assert.equal(body, '/topic/1/test-topic-title/1');
done(); done();
}); });
}); });
@@ -1411,7 +1414,8 @@ describe('Controllers', function () {
request(nconf.get('url') + '/api/users', { json: true }, function (err, res, body) { request(nconf.get('url') + '/api/users', { json: true }, function (err, res, body) {
assert.ifError(err); assert.ifError(err);
assert.equal(res.statusCode, 308); assert.equal(res.statusCode, 200);
assert.equal(res.headers['x-redirect'], '/api/popular');
assert(body, '/api/popular'); assert(body, '/api/popular');
done(); done();
}); });
@@ -1521,7 +1525,8 @@ describe('Controllers', function () {
it('should redirect if topic index is negative', function (done) { it('should redirect if topic index is negative', function (done) {
request(nconf.get('url') + '/api/category/' + category.slug + '/-10', function (err, res) { request(nconf.get('url') + '/api/category/' + category.slug + '/-10', function (err, res) {
assert.ifError(err); assert.ifError(err);
assert.equal(res.statusCode, 308); assert.equal(res.statusCode, 200);
assert.ok(res.headers['x-redirect']);
done(); done();
}); });
}); });
@@ -1627,7 +1632,8 @@ describe('Controllers', function () {
function (category, next) { function (category, next) {
request(nconf.get('url') + '/api/category/' + category.slug, { jar: jar, json: true }, function (err, res, body) { request(nconf.get('url') + '/api/category/' + category.slug, { jar: jar, json: true }, function (err, res, body) {
assert.ifError(err); assert.ifError(err);
assert.equal(res.statusCode, 308); assert.equal(res.statusCode, 200);
assert.equal(res.headers['x-redirect'], 'https://nodebb.org');
assert.equal(body, 'https://nodebb.org'); assert.equal(body, 'https://nodebb.org');
next(); next();
}); });
@@ -1754,10 +1760,11 @@ describe('Controllers', function () {
}); });
it('should redirect if page is out of bounds', function (done) { it('should redirect if page is out of bounds', function (done) {
request(nconf.get('url') + '/api/unread?page=-1', { jar: jar }, function (err, res, body) { request(nconf.get('url') + '/api/unread?page=-1', { jar: jar, json: true }, function (err, res, body) {
assert.ifError(err); assert.ifError(err);
assert.equal(res.statusCode, 308); assert.equal(res.statusCode, 200);
assert.equal(body, '"/unread?page=1"'); assert.equal(res.headers['x-redirect'], '/unread?page=1');
assert.equal(body, '/unread?page=1');
done(); done();
}); });
}); });

7
test/messaging.js
View File

@@ -591,10 +591,11 @@ describe('Messaging Library', function () {
}); });
it('should redirect to chats page', function (done) { it('should redirect to chats page', function (done) {
request(nconf.get('url') + '/api/chats', { jar: jar }, function (err, response, body) { request(nconf.get('url') + '/api/chats', { jar: jar, json: true }, function (err, res, body) {
assert.ifError(err); assert.ifError(err);
assert.equal(body, '"/user/herp/chats"'); assert.equal(res.statusCode, 200);
assert.equal(response.statusCode, 308); assert.equal(res.headers['x-redirect'], '/user/herp/chats');
assert.equal(body, '/user/herp/chats');
done(); done();
}); });
}); });

7
test/topics.js
View File

@@ -791,10 +791,11 @@ describe('Topic\'s', function () {
}); });
it('should redirect if post index is out of range', function (done) { it('should redirect if post index is out of range', function (done) {
request(nconf.get('url') + '/api/topic/' + topicData.slug + '/-1', function (err, response, body) { request(nconf.get('url') + '/api/topic/' + topicData.slug + '/-1', { json: true }, function (err, res, body) {
assert.ifError(err); assert.ifError(err);
assert.equal(response.statusCode, 308); assert.equal(res.statusCode, 200);
assert.equal(body, '"/topic/13/topic-for-controller-test"'); assert.equal(res.headers['x-redirect'], '/topic/13/topic-for-controller-test');
assert.equal(body, '/topic/13/topic-for-controller-test');
done(); done();
}); });
}); });