feat: enable test file crawling for jest example

bazelbuild · Jan 30, 2020 · 8854bfd · 8854bfd
1 parent c83b026
commit 8854bfd
Show file tree

Hide file tree

Showing 7 changed files with 1,091 additions and 856 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,3 @@
 {
-    "bazel.buildifierExecutable": "${workspaceFolder}/node_modules/.bin/buildifier",
     "bazel.buildifierFixOnFormat": true
-}
+}
diff --git a/examples/jest/BUILD.bazel b/examples/jest/BUILD.bazel
@@ -3,6 +3,9 @@ load(":jest.bzl", "jest_test")
 jest_test(
     name = "test",
     srcs = [
+        "babel.config.js",
+        "extra.js",
+        "index.js",
         "index.test.js",
         "index2.test.js",
     ],
@@ -16,9 +19,6 @@ jest_test(
         "no-bazelci-mac",
     ],
     deps = [
-        "babel.config.js",
-        "extra.js",
-        "index.js",
         "@npm//@babel/core",
         "@npm//@babel/preset-env",
         "@npm//@jest/transform",

diff --git a/examples/jest/WORKSPACE b/examples/jest/WORKSPACE
@@ -29,6 +29,9 @@ load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")
 
 yarn_install(
     name = "npm",
+    data = [
+        "//:patches/jest-haste-map+24.9.0.patch",
+    ],
     package_json = "//:package.json",
     quiet = False,
     yarn_lock = "//:yarn.lock",

diff --git a/examples/jest/jest.bzl b/examples/jest/jest.bzl
@@ -10,8 +10,6 @@ def jest_test(name, srcs, deps, jest_config, **kwargs):
         "--ci",
     ]
     args.extend(["--config", "$(location %s)" % jest_config])
-    for src in srcs:
-        args.extend(["--runTestsByPath", "$(location %s)" % src])
 
     _jest_test(
         name = name,

diff --git a/examples/jest/package.json b/examples/jest/package.json
@@ -9,13 +9,11 @@
         "@jest/transform": "24.7.1",
         "babel-jest": "24.7.1",
         "babel-plugin-istanbul": "5.1.2",
-        "jest-cli": "24.7.1",
-        "jest-config": "24.7.1",
-        "jest-haste-map": "24.7.1",
-        "jest-resolve": "24.7.1",
-        "jest-runtime": "24.7.1"
+        "jest-cli": "24.9.0",
+        "patch-package": "^6.2.0"
     },
     "scripts": {
+        "postinstall": "patch-package",
         "test": "bazel test ..."
     }
 }
diff --git a/examples/jest/patches/jest-haste-map+24.9.0.patch b/examples/jest/patches/jest-haste-map+24.9.0.patch
@@ -0,0 +1,16 @@
+diff --git a/node_modules/jest-haste-map/build/crawlers/node.js b/node_modules/jest-haste-map/build/crawlers/node.js
+index 23985ae..a728a9a 100644
+--- a/node_modules/jest-haste-map/build/crawlers/node.js
++++ b/node_modules/jest-haste-map/build/crawlers/node.js
+@@ -166,7 +166,11 @@ function find(roots, extensions, ignore, callback) {
+
+ function findNative(roots, extensions, ignore, callback) {
+   const args = Array.from(roots);
++  args.push('(');
+   args.push('-type', 'f');
++  args.push('-o');
++  args.push('-type', 'l');
++  args.push(')');
+
+   if (extensions.length) {
+     args.push('(');