Merge branch 'pr-1279' into presubmit-master-pr-1279

karma-runner · May 19, 2015 · 3bf13ec · 3bf13ec
2 parents d5ddc5a + 92cd9bf
commit 3bf13ec
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -28,7 +28,7 @@ module.exports = (grunt) ->
           'static/karma.js': ['client/main.js']
 
     test:
-      unit: 'simplemocha:unit'
+      unit: 'mochaTest:unit'
       client: 'test/client/karma.conf.js'
       e2e: 'cucumberjs:ci'
 
@@ -37,10 +37,12 @@ module.exports = (grunt) ->
         files: '<%= files.client %>'
         tasks: 'browserify:client'
 
-    simplemocha:
+    mochaTest:
       options:
         ui: 'bdd'
         reporter: 'dot'
+        quite: false
+        colors: true
       unit:
         src: [
           'test/unit/mocha-globals.coffee'

diff --git a/package.json b/package.json
@@ -181,24 +181,24 @@
     "source-map": "~0.1.31"
   },
   "devDependencies": {
-    "LiveScript": "~1.2.0",
-    "chai": "~1.9.1",
-    "chai-as-promised": "~4.1.0",
-    "coffee-errors": "~0.8.6",
-    "coffee-script": "~1.7.1",
+    "LiveScript": "^1.3.0",
+    "chai": "^2.3.0",
+    "chai-as-promised": "^5.0.0",
+    "coffee-errors": "^0.8.6",
+    "coffee-script": "^1.9.2",
     "cucumber": "^0.4.7",
-    "grunt": "~0.4",
-    "grunt-auto-release": "~0.0.3",
-    "grunt-browserify": "~2.1.3",
-    "grunt-bump": "~0.0.10",
-    "grunt-coffeelint": "~0.0.6",
-    "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-watch": "~0.6.1",
-    "grunt-conventional-changelog": "~1.1.0",
-    "grunt-cucumberjs": "^0.5.0",
-    "grunt-jscs-checker": "~0.6.1",
-    "grunt-npm": "~0.0.1",
-    "grunt-simple-mocha": "*",
+    "grunt": "^0.4",
+    "grunt-auto-release": "^0.0.6",
+    "grunt-browserify": "^3.8.0",
+    "grunt-bump": "^0.3.1",
+    "grunt-coffeelint": "^0.0.13",
+    "grunt-contrib-jshint": "^0.11.2",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-conventional-changelog": "^1.1.0",
+    "grunt-cucumberjs": "^0.7.0",
+    "grunt-jscs": "^1.8.0",
+    "grunt-mocha-test": "^0.12.7",
+    "grunt-npm": "0.0.2",
     "karma-browserstack-launcher": "*",
     "karma-chrome-launcher": "*",
     "karma-coffee-preprocessor": "*",
@@ -207,7 +207,7 @@
     "karma-firefox-launcher": "*",
     "karma-growl-reporter": "*",
     "karma-html2js-preprocessor": "*",
-    "karma-jasmine": "~0.1.1",
+    "karma-jasmine": "^0.1.5",
     "karma-junit-reporter": "*",
     "karma-live-preprocessor": "*",
     "karma-mocha": "*",
@@ -217,19 +217,19 @@
     "karma-requirejs": "*",
     "karma-sauce-launcher": "*",
     "karma-script-launcher": "^0.1.0",
-    "load-grunt-tasks": "~0.6.0",
-    "mkdirp": "~0.3.5",
-    "mocha": "~1.20.1",
-    "mocks": "~0.0.10",
-    "sinon": "~1.10.3",
-    "sinon-chai": "~2.5.0",
-    "timer-shim": "~0.3.0",
-    "which": "~1.0"
+    "load-grunt-tasks": "^3.1.0",
+    "mkdirp": "^0.5.0",
+    "mocha": "^2.2.5",
+    "mocks": "^0.0.15",
+    "sinon": "^1.14.1",
+    "sinon-chai": "^2.7.0",
+    "timer-shim": "^0.3.0",
+    "which": "^1.1.1"
   },
   "main": "./lib/index",
   "bin": {},
   "engines": {
-    "node":  ">=0.8 <=0.12 || >=1 <=2"
+    "node": ">=0.8 <=0.12 || >=1 <=2"
   },
   "version": "0.12.31",
   "license": "MIT"