Cleanup of internal/e2e tests (#704)

bazel-contrib · May 22, 2019 · d024566 · d024566
1 parent 62ef570
commit d024566
Show file tree

Hide file tree

Showing 15 changed files with 95 additions and 347 deletions.
diff --git a/internal/e2e/node_loader_no_preserve_symlinks/BUILD.bazel b/internal/e2e/node_loader_no_preserve_symlinks/BUILD.bazel
@@ -2,15 +2,10 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 package(default_visibility = ["//visibility:public"])
 
-filegroup(
-    name = "node_modules",
-    srcs = glob(["node_modules/**/*"]),
-)
-
 jasmine_node_test(
     name = "test",
     srcs = [
         "node_loader_test.spec.js",
     ],
-    node_modules = "@node_loader_e2e_no_preserve_symlinks_deps//:node_modules",
+    node_modules = "@npm//:node_modules",
 )
diff --git a/internal/e2e/node_loader_no_preserve_symlinks/WORKSPACE b/internal/e2e/node_loader_no_preserve_symlinks/WORKSPACE
@@ -1,7 +1,7 @@
 workspace(
     name = "node_loader_e2e_no_preserve_symlinks",
     managed_directories = {
-        "@node_loader_e2e_no_preserve_symlinks_deps": ["deps/node_modules"],
+        "@npm": ["node_modules"],
     },
 )
 
@@ -12,13 +12,10 @@ local_repository(
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "yarn_install")
 
-node_repositories(
-    package_json = ["//:package.json"],
-    preserve_symlinks = False,
-)
+node_repositories(preserve_symlinks = False)
 
 yarn_install(
-    name = "node_loader_e2e_no_preserve_symlinks_deps",
-    package_json = "//deps:package.json",
-    yarn_lock = "//deps:yarn.lock",
+    name = "npm",
+    package_json = "//:package.json",
+    yarn_lock = "//:yarn.lock",
 )
diff --git a/internal/e2e/node_loader_no_preserve_symlinks/deps/BUILD.bazel b/internal/e2e/node_loader_no_preserve_symlinks/deps/BUILD.bazel
diff --git a/internal/e2e/node_loader_no_preserve_symlinks/deps/package.json b/internal/e2e/node_loader_no_preserve_symlinks/deps/package.json
diff --git a/internal/e2e/node_loader_no_preserve_symlinks/deps/yarn.lock b/internal/e2e/node_loader_no_preserve_symlinks/deps/yarn.lock
diff --git a/internal/e2e/node_loader_no_preserve_symlinks/package.json b/internal/e2e/node_loader_no_preserve_symlinks/package.json
@@ -2,13 +2,12 @@
     "description": "e2e node_loader testing dependencies",
     "devDependencies": {},
     "dependencies": {
-        "@gregmagolan/test-a": "0.0.1",
-        "clang-format": "1.2.2",
-        "jasmine": "3.1.0",
-        "minimist": "1.2.0"
+        "@gregmagolan/test-b": "0.0.2",
+        "@gregmagolan/test-a": "0.0.2",
+        "jasmine": "~2.8.0",
+        "tmp": "0.0.33"
     },
     "scripts": {
-        "pretest": "bazel run @nodejs//:yarn",
         "test": "bazel test //..."
     }
 }
diff --git a/internal/e2e/node_loader_no_preserve_symlinks/yarn.lock b/internal/e2e/node_loader_no_preserve_symlinks/yarn.lock
@@ -7,10 +7,17 @@
   resolved "https://registry.yarnpkg.com/@gregmagolan/test-a/-/test-a-0.0.1.tgz#c90ebc0676f13b34400da8d1e55ffe5aa76655b4"
   integrity sha512-nMZ3MKkXZ+uYbrm8R3dfdt3v1gOOLtf88CdDciWxMYGLr29oVjQG11y2fz4IRBR6R7hI2Gj+G9sHZ69wLTnjfA==
 
-async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+"@gregmagolan/[email protected]":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@gregmagolan/test-a/-/test-a-0.0.2.tgz#86ab79a55f44860b02d8275e22d282a1f82b8768"
+  integrity sha512-u8pW4cm5Xk58fQeA1tGER3KwCfHZ1sBEx0YDWs5Spdi7tiw/21DN7btDvGqx4sG3d2UnUdAnvXPsdwArjNGdmg==
+
+"@gregmagolan/[email protected]":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@gregmagolan/test-b/-/test-b-0.0.2.tgz#7549fb9f39895c0d744c2c24c98b0e5817e46bd7"
+  integrity sha512-h+LeJUbUued9XyQwxKMUdklGiGxPYJ1RvTAK9612ctCiMS2Fn0wu/Au5kHsMHxm8l4bOfpgAWmQ0OQQy7wUBCg==
+  dependencies:
+    "@gregmagolan/test-a" "0.0.1"
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -25,26 +32,22 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-[email protected]:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/clang-format/-/clang-format-1.2.2.tgz#a7277a03fce9aa4e387ddaa83b60d99dab115737"
-  integrity sha512-6X9u1JBMak/9VbC0IZajEDvp19/PbjCanbRO3Z2xsluypQtbPPAGDvGGovLOWoUpXIvJH9vJExmzlqWvwItZxA==
-  dependencies:
-    async "^1.5.2"
-    glob "^7.0.0"
-    resolve "^1.1.6"
-
 [email protected]:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-glob@^7.0.0, glob@^7.0.6:
+glob@^7.0.6:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
@@ -69,18 +72,19 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-jasmine-core@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.1.0.tgz#a4785e135d5df65024dfc9224953df585bd2766c"
-  integrity sha1-pHheE11d9lAk38kiSVPfWFvSdmw=
+jasmine-core@~2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
-jasmine@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.1.0.tgz#2bd59fd7ec6ec0e8acb64e09f45a68ed2ad1952a"
-  integrity sha1-K9Wf1+xuwOistk4J9Fpo7SrRlSo=
+jasmine@~2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
+  integrity sha1-awicChFXax8W3xG4AUbZHU6Lij4=
   dependencies:
+    exit "^0.1.2"
     glob "^7.0.6"
-    jasmine-core "~3.1.0"
+    jasmine-core "~2.8.0"
 
 minimatch@^3.0.4:
   version "3.0.4"
@@ -89,34 +93,29 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-[email protected]:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
+os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
-  integrity sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=
-
-resolve@^1.1.6:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
+[email protected]:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
-    path-parse "^1.0.5"
+    os-tmpdir "~1.0.2"
 
 wrappy@1:
   version "1.0.2"

diff --git a/internal/e2e/node_loader_preserve_symlinks/.bazelignore b/internal/e2e/node_loader_preserve_symlinks/.bazelignore
@@ -1 +1 @@
-node_modules
+node_modules
diff --git a/internal/e2e/node_loader_preserve_symlinks/BUILD.bazel b/internal/e2e/node_loader_preserve_symlinks/BUILD.bazel
@@ -2,15 +2,10 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 
 package(default_visibility = ["//visibility:public"])
 
-filegroup(
-    name = "node_modules",
-    srcs = glob(["node_modules/**/*"]),
-)
-
 jasmine_node_test(
     name = "test",
     srcs = [
         "node_loader_test.spec.js",
     ],
-    node_modules = "@node_loader_e2e_preserve_symlinks_deps//:node_modules",
+    node_modules = "@npm//:node_modules",
 )
diff --git a/internal/e2e/node_loader_preserve_symlinks/WORKSPACE b/internal/e2e/node_loader_preserve_symlinks/WORKSPACE
@@ -1,7 +1,7 @@
 workspace(
     name = "node_loader_e2e_preserve_symlinks",
     managed_directories = {
-        "@node_loader_e2e_preserve_symlinks_deps": ["deps/node_modules"],
+        "@npm": ["node_modules"],
     },
 )
 
@@ -10,15 +10,10 @@ local_repository(
     path = "../../../dist/build_bazel_rules_nodejs/release",
 )
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "yarn_install")
-
-node_repositories(
-    package_json = ["//:package.json"],
-    preserve_symlinks = True,
-)
+load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install")
 
 yarn_install(
-    name = "node_loader_e2e_preserve_symlinks_deps",
-    package_json = "//deps:package.json",
-    yarn_lock = "//deps:yarn.lock",
+    name = "npm",
+    package_json = "//:package.json",
+    yarn_lock = "//:yarn.lock",
 )
diff --git a/internal/e2e/node_loader_preserve_symlinks/deps/BUILD.bazel b/internal/e2e/node_loader_preserve_symlinks/deps/BUILD.bazel
diff --git a/internal/e2e/node_loader_preserve_symlinks/deps/package.json b/internal/e2e/node_loader_preserve_symlinks/deps/package.json