Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-05 12:01:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
Baris Usakli
2017-07-13 15:02:23 -04:00
parent ea29e3e250 6ba913d6e6
commit f1f8a587d4
35 changed files with 212 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/topics.js
View File

@@ -1505,13 +1505,6 @@ describe('Topic\'s', function () {
});
});
it('should error if no search plugin', function (done) {
socketTopics.search({ uid: adminUid }, { tid: topic.tid, term: 'test' }, function (err) {
assert.equal(err.message, '[[error:no-plugins-available]]');
done();
});
});
it('should return results', function (done) {
var plugins = require('../src/plugins');
plugins.registerHook('myTestPlugin', {