fix(jasmine): enforce that jasmine_node_test is loaded from new location

BREAKING CHANGE: You can no longer get jasmine_node_test from @build_bazel_rules_nodejs. - Use `load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")` instead - You need to remove `@npm//jasmine` from the deps of the jasmine_node_test - If you use user-managed dependencies, see the commit for examples of the change needed Also makes the repo bazel-lint-clean, so running yarn bazel:lint-fix no longer makes edits. Fixes bazel-contrib#838
alexeagle · Jul 27, 2019 · 7708858 · 7708858
1 parent 432f88c
commit 7708858
Show file tree

Hide file tree

Showing 74 changed files with 2,711 additions and 888 deletions.
diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel
@@ -20,7 +20,6 @@ skylark_doc(
         "//internal/common:check_bazel_version.bzl",
         "//internal/history-server:history_server.bzl",
         "//internal/http-server:http_server.bzl",
-        "//internal/jasmine_node_test:jasmine_node_test.bzl",
         "//internal/node:node.bzl",
         "//internal/node:node_repositories.bzl",
         "//internal/npm_install:npm_install.bzl",

diff --git a/docs/common/check_bazel_version.html b/docs/common/check_bazel_version.html
@@ -48,12 +48,6 @@
   <ul>
   </ul>
 </li>
-<li>
-  <a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html">NodeJS testing</a>
-  <ul>
-    <li><a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html#overview">Overview</a></li>
-  </ul>
-</li>
 <li>
   <a href="/rules_nodejs/node/node.html">Executing programs</a>
   <ul>

diff --git a/docs/history-server/history_server.html b/docs/history-server/history_server.html
@@ -48,12 +48,6 @@
   <ul>
   </ul>
 </li>
-<li>
-  <a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html">NodeJS testing</a>
-  <ul>
-    <li><a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html#overview">Overview</a></li>
-  </ul>
-</li>
 <li>
   <a href="/rules_nodejs/node/node.html">Executing programs</a>
   <ul>

diff --git a/docs/http-server/http_server.html b/docs/http-server/http_server.html
@@ -48,12 +48,6 @@
   <ul>
   </ul>
 </li>
-<li>
-  <a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html">NodeJS testing</a>
-  <ul>
-    <li><a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html#overview">Overview</a></li>
-  </ul>
-</li>
 <li>
   <a href="/rules_nodejs/node/node.html">Executing programs</a>
   <ul>

diff --git a/docs/index.html b/docs/index.html
@@ -48,12 +48,6 @@
   <ul>
   </ul>
 </li>
-<li>
-  <a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html">NodeJS testing</a>
-  <ul>
-    <li><a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html#overview">Overview</a></li>
-  </ul>
-</li>
 <li>
   <a href="/rules_nodejs/node/node.html">Executing programs</a>
   <ul>
@@ -120,7 +114,6 @@ <h2>Rule sets</h2>
     <li><a href="#check_bazel_version">Check Bazel version</a></li>
     <li><a href="#history_server">Run history-server</a></li>
     <li><a href="#http_server">Run http-server</a></li>
-    <li><a href="#jasmine_node_test">NodeJS testing</a></li>
     <li><a href="#node">Executing programs</a></li>
     <li><a href="#node_repositories">Install NodeJS & Yarn</a></li>
     <li><a href="#npm_install">Install npm packages</a></li>
@@ -206,28 +199,6 @@ <h3>Macros</h3>
     </tr>
   </tbody>
 </table>
-<h2><a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html" id="jasmine_node_test">NodeJS testing</a></h2>
-
-<h3>Macros</h3>
-<table class="overview-table">
-  <colgroup>
-    <col class="col-name" />
-    <col class="col-description" />
-  </colgroup>
-  <tbody>
-    <tr>
-      <td>
-        <a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html#jasmine_node_test">
-          <code>jasmine_node_test</code>
-        </a>
-      </td>
-      <td>
-        <p>Runs tests in NodeJS using the Jasmine test runner.</p>
-
-      </td>
-    </tr>
-  </tbody>
-</table>
 <h2><a href="/rules_nodejs/node/node.html" id="node">Executing programs</a></h2>
 
 <h3>Rules</h3>

diff --git a/docs/jasmine_node_test/jasmine_node_test.html b/docs/jasmine_node_test/jasmine_node_test.html
diff --git a/docs/node/node.html b/docs/node/node.html
@@ -48,12 +48,6 @@
   <ul>
   </ul>
 </li>
-<li>
-  <a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html">NodeJS testing</a>
-  <ul>
-    <li><a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html#overview">Overview</a></li>
-  </ul>
-</li>
 <li>
   <a href="/rules_nodejs/node/node.html">Executing programs</a>
   <ul>

diff --git a/docs/node/node_repositories.html b/docs/node/node_repositories.html
@@ -48,12 +48,6 @@
   <ul>
   </ul>
 </li>
-<li>
-  <a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html">NodeJS testing</a>
-  <ul>
-    <li><a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html#overview">Overview</a></li>
-  </ul>
-</li>
 <li>
   <a href="/rules_nodejs/node/node.html">Executing programs</a>
   <ul>

diff --git a/docs/npm_install/npm_install.html b/docs/npm_install/npm_install.html
@@ -48,12 +48,6 @@
   <ul>
   </ul>
 </li>
-<li>
-  <a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html">NodeJS testing</a>
-  <ul>
-    <li><a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html#overview">Overview</a></li>
-  </ul>
-</li>
 <li>
   <a href="/rules_nodejs/node/node.html">Executing programs</a>
   <ul>

diff --git a/docs/npm_package/npm_package.html b/docs/npm_package/npm_package.html
@@ -48,12 +48,6 @@
   <ul>
   </ul>
 </li>
-<li>
-  <a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html">NodeJS testing</a>
-  <ul>
-    <li><a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html#overview">Overview</a></li>
-  </ul>
-</li>
 <li>
   <a href="/rules_nodejs/node/node.html">Executing programs</a>
   <ul>

diff --git a/docs/rollup/rollup_bundle.html b/docs/rollup/rollup_bundle.html
@@ -48,12 +48,6 @@
   <ul>
   </ul>
 </li>
-<li>
-  <a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html">NodeJS testing</a>
-  <ul>
-    <li><a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html#overview">Overview</a></li>
-  </ul>
-</li>
 <li>
   <a href="/rules_nodejs/node/node.html">Executing programs</a>
   <ul>

diff --git a/e2e/define_var/BUILD.bazel b/e2e/define_var/BUILD.bazel
@@ -1,18 +1,15 @@
-load(
-    "@build_bazel_rules_nodejs//:defs.bzl",
-    "jasmine_node_test",
-)
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_test")
 
-jasmine_node_test(
+nodejs_test(
     name = "define_var",
-    srcs = glob(["*.spec.js"]),
     # Just here as a smoke test for this attribute.
     # This test must be run with --define=some_env=some_value.
     # Use `bazel test :define_var --define=some_env=some_value`.
     # Note that use of --define causes the entire build to be non-incremental
     # since --define can affect the output of any action.
     configuration_env_vars = ["some_env"],
-    data = ["@npm//jasmine"],
+    data = glob(["*.spec.js"]),
+    entry_point = ":define.spec.js",
     # Don't include this test in //... pattern since it requires special
     # --define option
     tags = ["manual"],
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,12 +48,6 @@ @@
       <ul>
       </ul>
     </li>
-    <li>
-      <a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html">NodeJS testing</a>
-      <ul>
-        <li><a href="/rules_nodejs/jasmine_node_test/jasmine_node_test.html#overview">Overview</a></li>
-      </ul>
-    </li>
     <li>
       <a href="/rules_nodejs/node/node.html">Executing programs</a>
       <ul>
@@ Expand Down @@