social tests

src/controllers/admin/social.js

@@ -1,20 +1,20 @@
 'use strict';
 
-var social = require('../../social');
+var async = require('async');
 
-var socialController = {};
+var social = require('../../social');
 
+var socialController = module.exports;
 
 socialController.get = function (req, res, next) {
-	social.getPostSharing(function (err, posts) {
+	async.waterfall([
-		if (err) {
+		function (next) {
-			return next(err);
+			social.getPostSharing(next);
-		}
+		},
-
+		function (posts) {
 			res.render('admin/general/social', {
 				posts: posts,
 			});
-	});
+		},
+	], next);
 };
-
-module.exports = socialController;

src/social.js

@@ -4,7 +4,7 @@ var plugins = require('./plugins');
 var db = require('./database');
 var async = require('async');
 
-var social = {};
+var social = module.exports;
 
 social.postSharing = null;
 
@@ -36,32 +36,31 @@ social.getPostSharing = function (callback) {
 			plugins.fireHook('filter:social.posts', networks, next);
 		},
 		function (networks, next) {
-			db.getSetMembers('social:posts.activated', function (err, activated) {
+			db.getSetMembers('social:posts.activated', next);
-				if (err) {
+		},
-					return next(err);
+		function (activated, next) {
-				}
-
 			networks.forEach(function (network, i) {
 				networks[i].activated = (activated.indexOf(network.id) !== -1);
 			});
 
 			social.postSharing = networks;
 			next(null, networks);
-			});
 		},
 	], callback);
 };
 
 social.getActivePostSharing = function (callback) {
-	social.getPostSharing(function (err, networks) {
+	async.waterfall([
-		if (err) {
+		function (next) {
-			return callback(err);
+			social.getPostSharing(next);
-		}
+		},
+		function (networks, next) {
 			networks = networks.filter(function (network) {
 				return network && network.activated;
 			});
-		callback(null, networks);
+			next(null, networks);
-	});
+		},
+	], callback);
 };
 
 social.setActivePostSharingNetworks = function (networkIDs, callback) {
@@ -81,5 +80,3 @@ social.setActivePostSharingNetworks = function (networkIDs, callback) {
 		},
 	], callback);
 };
-
-module.exports = social;

src/socket.io/admin/social.js

@@ -1,10 +1,8 @@
 'use strict';
 
 var social = require('../../social');
-var SocketSocial = {};
+var SocketSocial = module.exports;
 
 SocketSocial.savePostSharingNetworks = function (socket, data, callback) {
 	social.setActivePostSharingNetworks(data, callback);
 };
-
-module.exports = SocketSocial;

test/controllers-admin.js

@@ -391,12 +391,22 @@ describe('Admin Controllers', function () {
 	});
 
 	it('should load /admin/general/social', function (done) {
+		var socketAdmin = require('../src/socket.io/admin');
+		socketAdmin.social.savePostSharingNetworks({ uid: adminUid }, ['facebook', 'twitter', 'google'], function (err) {
+			assert.ifError(err);
 			request(nconf.get('url') + '/api/admin/general/social', { jar: jar, json: true }, function (err, res, body) {
 				assert.ifError(err);
 				assert(body);
+				body = body.posts.map(function (network) {
+					return network && network.id;
+				});
+				assert(body.indexOf('facebook') !== -1);
+				assert(body.indexOf('twitter') !== -1);
+				assert(body.indexOf('google') !== -1);
 				done();
 			});
 		});
+	});
 
 	it('should load /admin/manage/tags', function (done) {
 		request(nconf.get('url') + '/api/admin/manage/tags', { jar: jar, json: true }, function (err, res, body) {