Merge branch 'mocha' of github.com:sequelize/sequelize into mocha

Sascha Depold
Commit da24f8f3 authored Jul 24, 2013 by Sascha Depold
Showing with 3 additions and 1 deletions
package.json
test/dao.test.js
--- a/package.json
+++ b/package.json
@@ -52,7 +52,9 @@
    "yuidocjs": "~0.3.36",
    "semver": "~2.0.8",
    "chai": "~1.7.2",
-    "mocha": "~1.12.0"
+    "mocha": "~1.12.0",
+    "sinon-chai": "~2.4.0",
+    "chai-datetime": "~1.0.0"
  },
  "keywords": [
    "mysql",

--- a/test/dao.test.js
+++ b/test/dao.test.js