Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 14:05:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

add tests for top topics

Browse Source 
fix popular page displaying 18 topics per page
This commit is contained in:
Barış Soner Uşaklı
2018-06-15 15:23:27 -04:00
parent 956aa55253
commit 2fd2accf8c
7 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/categories/topics.js
View File

@@ -57,7 +57,7 @@ module.exports = function (Categories) {
function (results, next) {
var totalPinnedCount = results.pinnedTids.length;
pinnedTids = results.pinnedTids.slice(data.start, data.stop === -1 ? undefined : data.stop + 1);
pinnedTids = results.pinnedTids.slice(data.start, data.stop !== -1 ? data.stop + 1 : undefined);
var pinnedCount = pinnedTids.length;

2
src/topics/popular.js
View File

@@ -53,7 +53,7 @@ module.exports = function (Topics) {
function (topics, next) {
tids = topics.filter(function (topic) {
return topic && parseInt(topic.deleted, 10) !== 1;
}).sort(sortPopular).slice(start, stop !== -1 ? stop - 1 : undefined).map(function (topic) {
}).sort(sortPopular).slice(start, stop !== -1 ? stop + 1 : undefined).map(function (topic) {
return topic.tid;
});
privileges.topics.filterTids('read', tids, uid, next);

2
src/topics/recent.js
View File

@@ -41,7 +41,7 @@ module.exports = function (Topics) {
},
function (tids, next) {
recentTopics.topicCount = tids.length;
tids = tids.slice(start, stop + 1);
tids = tids.slice(start, stop !== -1 ? stop + 1 : undefined);
Topics.getTopicsByTids(tids, uid, next);
},
function (topicData, next) {

8
src/topics/suggested.js
View File

@@ -35,13 +35,7 @@ module.exports = function (Topics) {
}
},
function (categoryTids, next) {
tids = _.uniq(tids.concat(categoryTids));
if (stop === -1) {
tids = tids.slice(start);
} else {
tids = tids.slice(start, stop + 1);
}
tids = _.uniq(tids.concat(categoryTids)).slice(start, stop !== -1 ? stop + 1 : undefined);
Topics.getTopicsByTids(tids, uid, next);
},
], callback);

2
src/topics/top.js
View File

@@ -33,7 +33,7 @@ module.exports = function (Topics) {
},
function (tids, next) {
topTopics.topicCount = tids.length;
tids = tids.slice(start, stop + 1);
tids = tids.slice(start, stop !== -1 ? stop + 1 : undefined);
Topics.getTopicsByTids(tids, uid, next);
},
function (topicData, next) {

6
src/topics/unread.js
View File

@@ -42,11 +42,7 @@ module.exports = function (Topics) {
return next(null, []);
}
if (params.stop === -1) {
tids = tids.slice(params.start);
} else {
tids = tids.slice(params.start, params.stop + 1);
}
tids = tids.slice(params.start, params.stop !== -1 ? params.stop + 1 : undefined);
Topics.getTopicsByTids(tids, params.uid, next);
},

16
test/topics.js
View File

@@ -1823,4 +1823,20 @@ describe('Topic\'s', function () {
], done);
});
});
describe('top topics', function () {
it('should get top topics in category', function (done) {
var filters = ['', 'watched', 'unreplied', 'new'];
async.map(filters, function (filter, next) {
topics.getTopTopics(topic.categoryId, topic.userId, 0, -1, filter, next);
}, function (err, data) {
assert.ifError(err);
assert(data);
data.forEach(function (filterTopics) {
assert(Array.isArray(filterTopics.topics));
});
done();
});
});
});
});