v0.3.7: using gulp-jest 0.5.0

grommet · Sep 2, 2016 · 2df1253 · 2df1253
1 parent f0e4871
commit 2df1253
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 33 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grommet-toolbox",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "main": "lib/index.js",
   "description": "Developer Environment for Grommet applications",
   "authors": [
@@ -38,7 +38,7 @@
     "gulp-eslint": "^2.0.0",
     "gulp-file": "^0.3.0",
     "gulp-if": "^2.0.0",
-    "gulp-jest": "https://github.com/alansouzati/gulp-jest/tarball/UPDATED_GULP_JEST",
+    "gulp-jest": "^0.5.0",
     "gulp-open": "^2.0.0",
     "gulp-rsync": "0.0.6",
     "gulp-sass-lint": "^1.2.0",

diff --git a/src/gulp-tasks-test.js b/src/gulp-tasks-test.js
@@ -25,20 +25,23 @@ export function testTasks (gulp, opts) {
       return gulp.src(options.testPaths)
         .pipe(gulpif(!watch, envs))
         .pipe(jest({
-          modulePathIgnorePatterns: [
-            "<rootDir>/dist/",
-            "<rootDir>/templates/"
-          ],
-          testPathIgnorePatterns: options.testPaths.filter(
-            (path) => path.startsWith('!')
-          ).map((path) => path.substring(1)),
-          rootDir: options.base || process.cwd(),
-          watch: watch,
-          verbose: true
+          config: {
+            modulePathIgnorePatterns: [
+              "<rootDir>/dist/",
+              "<rootDir>/templates/"
+            ],
+            testPathIgnorePatterns: options.testPaths.filter(
+              (path) => path.startsWith('!')
+            ).map((path) => path.substring(1)),
+            rootDir: options.base || process.cwd(),
+            verbose: true
+          }
         }))
         .on('error', (error) => {
           gutil.log(error.message);
-          process.exit(1);
+          if (!watch) {
+            process.exit(1);
+          }
         })
         .pipe(gulpif(!watch, envs.reset));
     }
@@ -49,15 +52,17 @@ export function testTasks (gulp, opts) {
       return gulp.src(options.testPaths)
         .pipe(gulpif(!watch, envs))
         .pipe(jest({
-          modulePathIgnorePatterns: [
-            "<rootDir>/dist/",
-            "<rootDir>/templates/"
-          ],
-          testPathIgnorePatterns: options.testPaths.filter(
-            (path) => path.startsWith('!')
-          ).map((path) => path.substring(1)),
-          rootDir: options.base || process.cwd(),
-          updateSnapshot: true
+          config: {
+            modulePathIgnorePatterns: [
+              "<rootDir>/dist/",
+              "<rootDir>/templates/"
+            ],
+            testPathIgnorePatterns: options.testPaths.filter(
+              (path) => path.startsWith('!')
+            ).map((path) => path.substring(1)),
+            rootDir: options.base || process.cwd(),
+            updateSnapshot: true
+          }
         }))
         .on('error', (error) => {
           gutil.log(error.message);
@@ -81,17 +86,19 @@ export function testTasks (gulp, opts) {
       return gulp.src(options.testPaths)
         .pipe(envs)
         .pipe(jest({
-          collectCoverageFrom: options.jsAssets,
-          collectCoverage: true,
-          coverageReporters: ['lcov'],
-          modulePathIgnorePatterns: [
-            "<rootDir>/dist/",
-            "<rootDir>/templates/"
-          ],
-          testPathIgnorePatterns: options.testPaths.filter(
-            (path) => path.startsWith('!')
-          ).map((path) => path.substring(1)),
-          rootDir: options.base || process.cwd()
+          config: {
+            collectCoverageFrom: options.jsAssets,
+            collectCoverage: true,
+            coverageReporters: ['lcov'],
+            modulePathIgnorePatterns: [
+              "<rootDir>/dist/",
+              "<rootDir>/templates/"
+            ],
+            testPathIgnorePatterns: options.testPaths.filter(
+              (path) => path.startsWith('!')
+            ).map((path) => path.substring(1)),
+            rootDir: options.base || process.cwd()
+          }
         }))
         .on('error', (error) => {
           gutil.log(error.message);