From 56c4e13316cd8df80f314470a3018b176700b695 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 26 Aug 2016 19:33:16 +0300 Subject: [PATCH] another dependency fix and test --- src/categories/delete.js | 2 +- src/categories/recentreplies.js | 6 +++--- src/categories/unread.js | 4 ++-- src/categories/update.js | 10 +++++----- tests/categories.js | 19 +++++++++++++++++++ 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/categories/delete.js b/src/categories/delete.js index 63f9fe324b..e7713bb426 100644 --- a/src/categories/delete.js +++ b/src/categories/delete.js @@ -5,7 +5,6 @@ var db = require('../database'); var batch = require('../batch'); var plugins = require('../plugins'); var topics = require('../topics'); -var privileges = require('../privileges'); var groups = require('../groups'); module.exports = function(Categories) { @@ -46,6 +45,7 @@ module.exports = function(Categories) { ], next); }, function(next) { + var privileges = require('../privileges'); async.each(privileges.privilegeList, function(privilege, next) { groups.destroy('cid:' + cid + ':privileges:' + privilege, next); }, next); diff --git a/src/categories/recentreplies.js b/src/categories/recentreplies.js index 7a5e1cc1e8..bd89939078 100644 --- a/src/categories/recentreplies.js +++ b/src/categories/recentreplies.js @@ -10,7 +10,7 @@ var db = require('../database'); var posts = require('../posts'); var topics = require('../topics'); var categories = require('../categories'); -var privileges = require('../privileges'); + module.exports = function(Categories) { @@ -18,7 +18,7 @@ module.exports = function(Categories) { if (!parseInt(count, 10)) { return callback(null, []); } - + var privileges = require('../privileges'); async.waterfall([ function(next) { db.getSortedSetRevRange('cid:' + cid + ':pids', 0, count - 1, next); @@ -36,7 +36,7 @@ module.exports = function(Categories) { if (!Array.isArray(categoryData) || !categoryData.length) { return callback(); } - + var privileges = require('../privileges'); async.waterfall([ function(next) { async.map(categoryData, getRecentTopicTids, next); diff --git a/src/categories/unread.js b/src/categories/unread.js index d62aaa3c6e..37496e09b7 100644 --- a/src/categories/unread.js +++ b/src/categories/unread.js @@ -1,8 +1,8 @@ "use strict"; -var async = require('async'), - db = require('../database'); +var async = require('async'); +var db = require('../database'); module.exports = function(Categories) { diff --git a/src/categories/update.js b/src/categories/update.js index 78e97e4076..7c45663073 100644 --- a/src/categories/update.js +++ b/src/categories/update.js @@ -1,11 +1,11 @@ 'use strict'; -var async = require('async'), - db = require('../database'), - utils = require('../../public/src/utils'), - translator = require('../../public/src/modules/translator'), - plugins = require('../plugins'); +var async = require('async'); +var db = require('../database'); +var utils = require('../../public/src/utils'); +var translator = require('../../public/src/modules/translator'); +var plugins = require('../plugins'); module.exports = function(Categories) { diff --git a/tests/categories.js b/tests/categories.js index b607e6fc0a..9e762f5a90 100644 --- a/tests/categories.js +++ b/tests/categories.js @@ -54,6 +54,25 @@ describe('Categories', function() { }); }); + describe('Categories.getRecentTopicReplies', function() { + it('should not throw', function(done) { + Categories.getCategoryById({ + cid: categoryObj.cid, + set: 'cid:' + categoryObj.cid + ':tids', + reverse: true, + start: 0, + stop: -1, + uid: 0 + }, function(err, categoryData) { + assert.ifError(err); + Categories.getRecentTopicReplies(categoryData, 0, function(err) { + assert.ifError(err); + done(); + }); + }); + }); + }); + describe('.getCategoryTopics', function() { it('should return a list of topics', function(done) { Categories.getCategoryTopics({