Merge pull request #82 from mohayonao/tools

tools++
mohayonao · Jun 17, 2014 · 3b29307 · 3b29307
2 parents 675d97f + 3c2a925
commit 3b29307
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/tools/grunt-tasks/mocha.js b/tools/grunt-tasks/mocha.js
@@ -45,7 +45,7 @@ module.exports = function(grunt) {
     tstFiles.sort(sorter.byFilePath).forEach(function(file) {
       if (/_test\.js$/.test(file)) {
         mocha.addFile(file);
-      } else if (!/^src\/sc\/test\//.test(file)) {
+      } else {
         matchFn[path.resolve(file)] = true;
       }
     });
@@ -64,7 +64,6 @@ module.exports = function(grunt) {
         installer(global.sc);
       }
     };
-    require("../test-utils");
 
     if (cover) {
       coverageVar = "$$cov_" + Date.now() + "$$";
@@ -78,6 +77,8 @@ module.exports = function(grunt) {
       reporter = "spec";
     }
 
+    require("../test-utils");
+
     done = this.async();
     mocha.reporter(reporter).run(function(failure) {
       var collector;