Correct lint errors

jestjs · Apr 20, 2017 · 32548c9 · 32548c9
1 parent d86eaf2
commit 32548c9
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 1 deletion.
diff --git a/.yarnclean b/.yarnclean
@@ -0,0 +1,42 @@
+# test directories
+__tests__
+test
+tests
+powered-test
+
+# asset directories
+docs
+doc
+website
+images
+assets
+
+# examples
+example
+examples
+
+# code coverage directories
+coverage
+.nyc_output
+
+# build scripts
+Makefile
+Gulpfile.js
+Gruntfile.js
+
+# configs
+.tern-project
+.gitattributes
+.editorconfig
+.*ignore
+.eslintrc
+.jshintrc
+.flowconfig
+.documentup.json
+.yarn-metadata.json
+.*.yml
+*.yml
+
+# misc
+*.gz
+*.md
diff --git a/package.json b/package.json
@@ -1,5 +1,7 @@
 {
   "private": true,
+  "name":"jest",
+  "version":"1.0.1",
   "devDependencies": {
     "ansi-regex": "^2.0.0",
     "ansi-styles": "^3.0.0",

diff --git a/packages/jest-jasmine2/src/treeProcessor.js b/packages/jest-jasmine2/src/treeProcessor.js
@@ -41,7 +41,11 @@ function treeProcessor(options: Options) {
   }
 
   return queueRunnerFactory({
+<<<<<<< HEAD
     onException: error => tree.onException(error),
+=======
+    onException: error => tree.onException(tree, error),
+>>>>>>> Correct lint errors
     queueableFns: wrapChildren(tree, isEnabled(tree, false)),
     userContext: tree.sharedUserContext(),
   });

diff --git a/packages/jest-runtime/src/transform.js b/packages/jest-runtime/src/transform.js
@@ -56,7 +56,6 @@ const getCacheKey = (
     configToJsonMap.set(
       config,
       stableStringify({
-        transform: config.transform,
         cacheDirectory: config.cacheDirectory,
         collectCoverage: config.collectCoverage,
         collectCoverageFrom: config.collectCoverageFrom,
@@ -69,6 +68,7 @@ const getCacheKey = (
         roots: config.roots,
         testMatch: config.testMatch,
         testRegex: config.testRegex,
+        transform: config.transform,
         transformIgnorePatterns: config.transformIgnorePatterns,
       }),
     );