Merge remote-tracking branch 'yamikuronue/master' into yamikuronue-coverage-fix

.gitignore

@@ -48,3 +48,6 @@ pidfile
 ## Transifex
 tx.exe
 .transifexrc
+
+##Coverage output
+coverage

package.json

@@ -11,7 +11,7 @@
   "main": "app.js",
   "scripts": {
     "start": "node loader.js",
-    "test": "mocha ./tests -t 10000"
+    "test": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- ./tests -t 10000"
   },
   "dependencies": {
     "async": "~1.5.0",
@@ -44,10 +44,9 @@
     "mongodb": "~2.1.3",
     "morgan": "^1.3.2",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "3.0.19",
+    "nodebb-plugin-composer-default": "3.0.18",
     "nodebb-plugin-dbsearch": "1.0.1",
-    "nodebb-plugin-emoji-apple": "1.0.3",
+    "nodebb-plugin-emoji-extended": "1.0.3",
-    "nodebb-plugin-emoji-extended": "1.0.5",
     "nodebb-plugin-markdown": "5.0.1",
     "nodebb-plugin-mentions": "1.0.21",
     "nodebb-plugin-soundpack-default": "0.1.6",
@@ -86,9 +85,10 @@
     "xregexp": "~3.1.0"
   },
   "devDependencies": {
-    "mocha": "~1.13.0",
     "grunt": "~0.4.5",
-    "grunt-contrib-watch": "^1.0.0"
+    "grunt-contrib-watch": "^1.0.0",
+    "istanbul": "^0.4.2",
+    "mocha": "~1.13.0"
   },
   "bugs": {
     "url": "https://github.com/NodeBB/NodeBB/issues"

tests/mocks/databasemock.js

@@ -36,14 +36,14 @@
 				'    "host": "127.0.0.1",' + '\n' +
 				'    "port": "6379",' + '\n' +
 				'    "password": "",' + '\n' +
-				'    "database": "1"' + '\n' +
+				'    "database": "redis"' + '\n' +
 			'}\n'+
 			' or (mongo):\n' +
 				'"test_database": {' + '\n' +
 				'    "host": "127.0.0.1",' + '\n' +
 				'    "port": "27017",' + '\n' +
 				'    "password": "",' + '\n' +
-				'    "database": "1"' + '\n' +
+				'    "database": "mongo"' + '\n' +
 			'}\n'+
 			' or (mongo) in a replicaset' + '\n' +
 			'"test_database": {' + '\n' +