account/posts controller tests

src/controllers/accounts/posts.js

@@ -97,7 +97,12 @@ postsController.getTopics = function (req, res, next) {
 	getFromUserSet(data, req, res, next);
 };
 
-function getFromUserSet(data, req, res, next) {
+function getFromUserSet(data, req, res, callback) {
+	var userData;
+	var itemsPerPage;
+	var page = Math.max(1, parseInt(req.query.page, 10) || 1);
+	async.waterfall([
+		function (next) {
 			async.parallel({
 				settings: function (next) {
 					user.getSettings(req.uid, next);
@@ -105,17 +110,18 @@ function getFromUserSet(data, req, res, next) {
 				userData: function (next) {
 					accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, next);
 				}
-	}, function (err, results) {
-		if (err || !results.userData) {
-			return next(err);
+			}, next);
+		},
+		function (results, next) {
+			if (!results.userData) {
+				return callback();
 			}
 
-		var userData = results.userData;
+			userData = results.userData;
 
 			var setName = 'uid:' + userData.uid + ':' + data.set;
 
-		var page = Math.max(1, parseInt(req.query.page, 10) || 1);
-		var itemsPerPage = (data.template === 'account/topics' || data.template === 'account/watched') ? results.settings.topicsPerPage : results.settings.postsPerPage;
+			itemsPerPage = (data.template === 'account/topics' || data.template === 'account/watched') ? results.settings.topicsPerPage : results.settings.postsPerPage;
 
 			async.parallel({
 				itemCount: function (next) {
@@ -130,9 +136,11 @@ function getFromUserSet(data, req, res, next) {
 					var stop = start + itemsPerPage - 1;
 					data.method(setName, req.uid, start, stop, next);
 				}
-		}, function (err, results) {
+			}, next);
+		}
+	], function (err, results) {
 		if (err) {
-				return next(err);
+			return callback(err);
 		}
 
 		userData[data.type] = results.data[data.type];
@@ -147,7 +155,6 @@ function getFromUserSet(data, req, res, next) {
 
 		res.render(data.template, userData);
 	});
-	});
 }
 
 module.exports = postsController;

test/controllers.js

@@ -703,6 +703,91 @@ describe('Controllers', function () {
 		});
 	});
 
+	describe('account post pages', function () {
+		var helpers = require('./helpers');
+		var jar;
+		before(function (done) {
+			helpers.loginUser('foo', 'barbar', function (err, _jar) {
+				assert.ifError(err);
+				jar = _jar;
+				done();
+			});
+		});
+
+		it('should load /user/foo/posts', function (done) {
+			request(nconf.get('url') + '/api/user/foo/posts', function (err, res, body) {
+				assert.ifError(err);
+				assert.equal(res.statusCode, 200);
+				assert(body);
+				done();
+			});
+		});
+
+		it('should 401 if not logged in', function (done) {
+			request(nconf.get('url') + '/api/user/foo/bookmarks', function (err, res, body) {
+				assert.ifError(err);
+				assert.equal(res.statusCode, 401);
+				assert(body);
+				done();
+			});
+		});
+
+		it('should load /user/foo/bookmarks', function (done) {
+			request(nconf.get('url') + '/api/user/foo/bookmarks', {jar: jar}, function (err, res, body) {
+				assert.ifError(err);
+				assert.equal(res.statusCode, 200);
+				assert(body);
+				done();
+			});
+		});
+
+		it('should load /user/foo/upvoted', function (done) {
+			request(nconf.get('url') + '/api/user/foo/upvoted', {jar: jar}, function (err, res, body) {
+				assert.ifError(err);
+				assert.equal(res.statusCode, 200);
+				assert(body);
+				done();
+			});
+		});
+
+		it('should load /user/foo/downvoted', function (done) {
+			request(nconf.get('url') + '/api/user/foo/downvoted', {jar: jar}, function (err, res, body) {
+				assert.ifError(err);
+				assert.equal(res.statusCode, 200);
+				assert(body);
+				done();
+			});
+		});
+
+		it('should load /user/foo/best', function (done) {
+			request(nconf.get('url') + '/api/user/foo/best', function (err, res, body) {
+				assert.ifError(err);
+				assert.equal(res.statusCode, 200);
+				assert(body);
+				done();
+			});
+		});
+
+		it('should load /user/foo/watched', function (done) {
+			request(nconf.get('url') + '/api/user/foo/watched', {jar: jar}, function (err, res, body) {
+				assert.ifError(err);
+				assert.equal(res.statusCode, 200);
+				assert(body);
+				done();
+			});
+		});
+
+		it('should load /user/foo/topics', function (done) {
+			request(nconf.get('url') + '/api/user/foo/topics', function (err, res, body) {
+				assert.ifError(err);
+				assert.equal(res.statusCode, 200);
+				assert(body);
+				done();
+			});
+		});
+
+	});
+
 	after(function (done) {
 		var analytics = require('../src/analytics');
 		analytics.writeData(function (err) {