Merge pull request #5074 from HeeL/update-tests

Update tests
8 years ago · cef92a084d
parent 98fff29869 3894dd644b
commit cef92a084d
18 changed files with 4 additions and 3 deletions
--- a/package.json
+++ b/package.json
@ -13,8 +13,7 @@
    "start": "node loader.js",
    "lint": "eslint --cache .",
    "pretest": "npm run lint",
-    "test": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- ./tests -t 10000",
-    "test-windows": "./node_modules/.bin/_mocha.cmd ./tests -t 10000"
+    "test": "istanbul cover _mocha test"
  },
  "dependencies": {
    "async": "~1.5.0",
@ -98,7 +97,7 @@
    "grunt": "~0.4.5",
    "grunt-contrib-watch": "^1.0.0",
    "istanbul": "^0.4.2",
-    "mocha": "~1.13.0"
+    "mocha": "~3.1.0"
  },
  "bugs": {
    "url": "https://github.com/NodeBB/NodeBB/issues"
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
--- a/tests/categories.js
+++ b/tests/categories.js
--- a/tests/database.js
+++ b/tests/database.js
--- a/tests/database/hash.js
+++ b/tests/database/hash.js
--- a/tests/database/keys.js
+++ b/tests/database/keys.js
--- a/tests/database/list.js
+++ b/tests/database/list.js
--- a/tests/database/sets.js
+++ b/tests/database/sets.js
--- a/tests/database/sorted.js
+++ b/tests/database/sorted.js
--- a/tests/groups.js
+++ b/tests/groups.js
--- a/tests/messaging.js
+++ b/tests/messaging.js
--- a/test/mocha.opts
+++ b/test/mocha.opts
@ -0,0 +1,2 @@
+--reporter dot
+--timeout 5000
--- a/tests/mocks/databasemock.js
+++ b/tests/mocks/databasemock.js
--- a/tests/topics.js
+++ b/tests/topics.js
--- a/tests/translator-new.js
+++ b/tests/translator-new.js
--- a/tests/translator.js
+++ b/tests/translator.js
--- a/tests/user.js
+++ b/tests/user.js
--- a/tests/utils.js
+++ b/tests/utils.js