From 1471fbdc14b789c801dd72e64999a7d4294e7489 Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Sun, 2 Jul 2017 16:26:31 -0600
Subject: [PATCH] Fix tests

---
 test/controllers.js | 29 ++++++++++++++++++-----------
 test/messaging.js   |  7 ++++---
 test/topics.js      |  7 ++++---
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/test/controllers.js b/test/controllers.js
index 1f73d4a7ae..34c515fc7a 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -808,7 +808,8 @@ describe('Controllers', function () {
 		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) {
 				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');
 				done();
 			});
@@ -825,7 +826,8 @@ describe('Controllers', function () {
 		it('should redirect to userslug', function (done) {
 			request(nconf.get('url') + '/api/uid/' + fooUid, { json: true }, function (err, res, body) {
 				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');
 				done();
 			});
@@ -1238,10 +1240,11 @@ describe('Controllers', function () {
 		});
 
 		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.equal(res.statusCode, 308);
-				assert.equal(body, '"/topic/1/test-topic-title/1"');
+				assert.equal(res.statusCode, 200);
+				assert.equal(res.headers['x-redirect'], '/topic/1/test-topic-title/1');
+				assert.equal(body, '/topic/1/test-topic-title/1');
 				done();
 			});
 		});
@@ -1411,7 +1414,8 @@ describe('Controllers', function () {
 
 			request(nconf.get('url') + '/api/users', { json: true }, function (err, res, body) {
 				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');
 				done();
 			});
@@ -1521,7 +1525,8 @@ describe('Controllers', function () {
 		it('should redirect if topic index is negative', function (done) {
 			request(nconf.get('url') + '/api/category/' + category.slug + '/-10', function (err, res) {
 				assert.ifError(err);
-				assert.equal(res.statusCode, 308);
+				assert.equal(res.statusCode, 200);
+				assert.ok(res.headers['x-redirect']);
 				done();
 			});
 		});
@@ -1627,7 +1632,8 @@ describe('Controllers', function () {
 				function (category, next) {
 					request(nconf.get('url') + '/api/category/' + category.slug, { jar: jar, json: true }, function (err, res, body) {
 						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');
 						next();
 					});
@@ -1754,10 +1760,11 @@ describe('Controllers', function () {
 		});
 
 		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.equal(res.statusCode, 308);
-				assert.equal(body, '"/unread?page=1"');
+				assert.equal(res.statusCode, 200);
+				assert.equal(res.headers['x-redirect'], '/unread?page=1');
+				assert.equal(body, '/unread?page=1');
 				done();
 			});
 		});
diff --git a/test/messaging.js b/test/messaging.js
index d6426812fe..cc8283698b 100644
--- a/test/messaging.js
+++ b/test/messaging.js
@@ -591,10 +591,11 @@ describe('Messaging Library', function () {
 		});
 
 		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.equal(body, '"/user/herp/chats"');
-				assert.equal(response.statusCode, 308);
+				assert.equal(res.statusCode, 200);
+				assert.equal(res.headers['x-redirect'], '/user/herp/chats');
+				assert.equal(body, '/user/herp/chats');
 				done();
 			});
 		});
diff --git a/test/topics.js b/test/topics.js
index 541000dd52..a1d0bda512 100644
--- a/test/topics.js
+++ b/test/topics.js
@@ -791,10 +791,11 @@ describe('Topic\'s', function () {
 		});
 
 		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.equal(response.statusCode, 308);
-				assert.equal(body, '"/topic/13/topic-for-controller-test"');
+				assert.equal(res.statusCode, 200);
+				assert.equal(res.headers['x-redirect'], '/topic/13/topic-for-controller-test');
+				assert.equal(body, '/topic/13/topic-for-controller-test');
 				done();
 			});
 		});