Revert "use mochaTest instead simple-mocha"

This reverts commit 921a118.
outsideris · Jun 18, 2017 · de25638 · de25638
1 parent 082d56a
commit de25638
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,8 +1,7 @@
-/*jshint node:true */ module.exports = function(grunt) {
+/*jshint node:true */
+module.exports = function(grunt) {
   'use strict';
 
-  require('load-grunt-tasks')(grunt);
-
   // Project configuration.
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
@@ -14,19 +13,26 @@
         src: ['Gruntfile.js', 'public/javascripts/**/*.js']
       }
     },
-    watch: {},
-    mochaTest: {
-      options: {
-        reporter: 'spec'
-      },
+    simplemocha: {
       all: {
-        src: ['test/**/*.test.coffee']
+        src: '<%= jshint.test.src %>',
+        options: {
+          timeout: 4000,
+          ignoreLeaks: false,
+          ui: 'bdd',
+          reporter: 'spec'
+        }
       }
     }
   });
 
+  // These plugins provide necessary tasks.
+  grunt.loadNpmTasks('grunt-simple-mocha');
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+  grunt.loadNpmTasks('grunt-contrib-watch');
+
   // Default task.
-  grunt.registerTask('default', ['lint', 'test']);
-  grunt.registerTask('test', ['mochaTest']);
+  grunt.registerTask('default', ['simplemocha']);
+  grunt.registerTask('test', ['simplemocha']);
   grunt.registerTask('lint', ['jshint']);
 };
diff --git a/package.json b/package.json
@@ -30,14 +30,12 @@
     "test": "grunt test"
   },
   "devDependencies": {
-    "grunt": "~0.4.1",
+    "should": "*",
+    "mocha": "*",
     "grunt-contrib-jshint": "~0.1.1",
     "grunt-contrib-watch": "~0.2.0",
-    "grunt-mocha-test": "^0.12.7",
     "grunt-simple-mocha": "~0.3.0",
-    "load-grunt-tasks": "^3.3.0",
-    "mocha": "*",
-    "should": "*"
+    "grunt": "~0.4.1"
   },
   "keywords": [],
   "dependencies": {