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

test/build.js

@@ -0,0 +1,16 @@
+'use strict';
+
+var assert = require('assert');
+
+var db = require('./mocks/databasemock');
+
+describe('Build', function () {
+
+	it('should build all assets', function (done) {
+		var build = require('../src/meta/build');
+		build.buildAll(function (err) {
+			assert.ifError(err);
+			done();
+		});
+	});
+});

test/mocks/databasemock.js

@@ -143,7 +143,7 @@
 				nconf.set('theme_config', path.join(nconf.get('themes_path'), 'nodebb-theme-persona', 'theme.json'));
 				nconf.set('bcrypt_rounds', 1);
 
-				require('../../build').buildAll(next);
+				next();
 			},
 			function (next) {
 				var	webserver = require('../../src/webserver');

test/socket.io.js

@@ -411,6 +411,18 @@ describe('socket.io', function () {
 		});
 	});
 
+	it('should get admin search dictionary', function (done) {
+		var socketAdmin = require('../src/socket.io/admin');
+		socketAdmin.getSearchDict({uid: adminUid}, {}, function (err, data) {
+			assert.ifError(err);
+			assert(Array.isArray(data));
+			assert(data[0].namespace);
+			assert(data[0].translations);
+			assert(data[0].title);
+			done();
+		});
+	});
+
 
 	after(function (done) {
 		db.emptydb(done);