build: ts_web_test & ts_web_test_suite deprecated in favor of karma_web_test & karma_web_test_suite (#33802)

This is a breaking change in nodejs rules 0.40.0 as part of the API review & cleanup for the 1.0 release. Their APIs are identical as ts_web_test was just karma_web_test without the config_file attribute. PR Close #33802
2019-11-13 09:08:38 -08:00 · 2019-11-13 09:08:38 -08:00 · 9a68f23dd2
commit 9a68f23dd2
parent 78912093f8
33 changed files with 67 additions and 120 deletions
--- a/integration/bazel/src/hello-world/BUILD.bazel
+++ b/integration/bazel/src/hello-world/BUILD.bazel
@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])

-load("@npm_bazel_karma//:index.bzl", "ts_web_test_suite")
+load("@npm_bazel_karma//:index.bzl", "karma_web_test_suite")
 load("@npm_bazel_typescript//:index.bzl", "ts_library")
 load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
 load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package")
@ -43,7 +43,7 @@ ts_library(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test",
    bootstrap = [
        "@npm//:node_modules/zone.js/dist/zone-testing-bundle.js",
--- a/packages/animations/browser/test/BUILD.bazel
+++ b/packages/animations/browser/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -23,7 +23,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/animations/test/BUILD.bazel
+++ b/packages/animations/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -20,7 +20,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/bazel/src/builders/files/src/BUILD.bazel.template
+++ b/packages/bazel/src/builders/files/src/BUILD.bazel.template
@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])

 load("@npm_angular_bazel//:index.bzl", "ng_module")
-load("@npm_bazel_karma//:index.bzl", "ts_web_test_suite")
+load("@npm_bazel_karma//:index.bzl", "karma_web_test_suite")
 load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
 load("@npm//history-server:index.bzl", "history_server")
 load("@npm_bazel_rollup//:index.bzl", "rollup_bundle")
@ -137,7 +137,7 @@ ts_library(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test",
    srcs = [
        "@npm//:node_modules/tslib/tslib.js",
--- a/packages/bazel/src/schematics/ng-add/files/src/initialize_testbed.ts.template
+++ b/packages/bazel/src/schematics/ng-add/files/src/initialize_testbed.ts.template
@ -1,6 +1,6 @@
 /**
 * @fileoverview Provides a script to initialize TestBed before tests are run.
- * This file should be included in the "runtime_deps" of a "ts_web_test_suite"
+ * This file should be included in the "runtime_deps" of a "karma_web_test_suite"
 * rule.
 */
 import {TestBed} from '@angular/core/testing';
--- a/packages/bazel/src/schematics/ng-add/files/src/rxjs_shims.js.template
+++ b/packages/bazel/src/schematics/ng-add/files/src/rxjs_shims.js.template
@ -1,7 +1,7 @@
 /**
 * @fileoverview Provides named UMD shims for `rxjs/operators` and `rxjs/testing`.
 * This file should be included in the "scripts" of a "ts_devserver"
- * rule and the "deps" of a "ts_web_test_suite" rule.
+ * rule and the "deps" of a "karma_web_test_suite" rule.
 */
 // rxjs/operators
 (function(factory) {
--- a/packages/common/http/test/BUILD.bazel
+++ b/packages/common/http/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -26,7 +26,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/common/http/testing/test/BUILD.bazel
+++ b/packages/common/http/testing/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -24,7 +24,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/common/test/BUILD.bazel
+++ b/packages/common/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -31,7 +31,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/compiler/test/BUILD.bazel
+++ b/packages/compiler/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 # Test that should only be run in node
 NODE_ONLY = [
@ -89,7 +89,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    tags = [
        # Disabled as these tests pertain to the old ngc compilation and are not relevant in Ivy.
--- a/packages/compiler/test/css_parser/BUILD.bazel
+++ b/packages/compiler/test/css_parser/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "css_parser_lib",
@ -23,7 +23,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "css_parser_web",
    deps = [
        ":css_parser_lib",
--- a/packages/compiler/test/expression_parser/BUILD.bazel
+++ b/packages/compiler/test/expression_parser/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "expression_parser_lib",
@ -22,7 +22,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "expression_parser_web",
    deps = [
        ":expression_parser_lib",
--- a/packages/compiler/test/ml_parser/BUILD.bazel
+++ b/packages/compiler/test/ml_parser/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "ml_parser_lib",
@ -20,7 +20,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "ml_parser_web",
    deps = [
        ":ml_parser_lib",
--- a/packages/compiler/test/selector/BUILD.bazel
+++ b/packages/compiler/test/selector/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "selector_lib",
@ -24,7 +24,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "selector_web",
    deps = [
        ":selector_lib",
--- a/packages/core/test/BUILD.bazel
+++ b/packages/core/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 package(default_visibility = ["//visibility:public"])

@ -73,7 +73,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/core/test/acceptance/BUILD.bazel
+++ b/packages/core/test/acceptance/BUILD.bazel
@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:private"])

-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "acceptance_lib",
@ -45,7 +45,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "acceptance_web",
    deps = [
        ":acceptance_lib",
--- a/packages/core/test/render3/BUILD.bazel
+++ b/packages/core/test/render3/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 package(default_visibility = ["//visibility:public"])

@ -70,7 +70,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "render3_web",
    deps = [
        ":render3_lib",
--- a/packages/core/test/view/BUILD.bazel
+++ b/packages/core/test/view/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 package(default_visibility = ["//visibility:public"])

@ -45,7 +45,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "view_web",
    tags = [
        "no-ivy-aot",
--- a/packages/elements/test/BUILD.bazel
+++ b/packages/elements/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -30,7 +30,7 @@ filegroup(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test",
    bootstrap = [
        ":elements_test_bootstrap_scripts",
--- a/packages/forms/test/BUILD.bazel
+++ b/packages/forms/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -27,7 +27,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/http/test/BUILD.bazel
+++ b/packages/http/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -27,7 +27,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/platform-browser-dynamic/test/BUILD.bazel
+++ b/packages/platform-browser-dynamic/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -25,7 +25,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    static_files = [
        "//packages/platform-browser/test:static_assets/test.html",
--- a/packages/platform-browser/animations/test/BUILD.bazel
+++ b/packages/platform-browser/animations/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -31,7 +31,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/platform-browser/test/BUILD.bazel
+++ b/packages/platform-browser/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 exports_files([
    "browser/static_assets/200.html",
@ -36,7 +36,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    static_files = [
        ":static_assets/test.html",
--- a/packages/platform-webworker/test/BUILD.bazel
+++ b/packages/platform-webworker/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -28,7 +28,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/router/test/BUILD.bazel
+++ b/packages/router/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -30,7 +30,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/router/upgrade/test/BUILD.bazel
+++ b/packages/router/upgrade/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -14,7 +14,7 @@ ts_library(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/service-worker/test/BUILD.bazel
+++ b/packages/service-worker/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -25,7 +25,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test_web",
    deps = [
        ":test_lib",
--- a/packages/upgrade/src/common/test/BUILD.bazel
+++ b/packages/upgrade/src/common/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -12,7 +12,7 @@ ts_library(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test",
    static_files = [
        "//:angularjs_scripts",
--- a/packages/upgrade/src/dynamic/test/BUILD.bazel
+++ b/packages/upgrade/src/dynamic/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -17,7 +17,7 @@ ts_library(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test",
    static_files = [
        "//:angularjs_scripts",
--- a/packages/upgrade/static/test/BUILD.bazel
+++ b/packages/upgrade/static/test/BUILD.bazel
@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -18,7 +18,7 @@ ts_library(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test",
    static_files = [
        "//:angularjs_scripts",
--- a/packages/upgrade/static/testing/test/BUILD.bazel
+++ b/packages/upgrade/static/testing/test/BUILD.bazel
@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])

-load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
+load("//tools:defaults.bzl", "karma_web_test_suite", "ts_library")

 ts_library(
    name = "test_lib",
@ -18,7 +18,7 @@ ts_library(
    ],
 )

-ts_web_test_suite(
+karma_web_test_suite(
    name = "test",
    static_files = [
        "//:angularjs_scripts",
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@ -2,7 +2,7 @@

 load("@build_bazel_rules_nodejs//:index.bzl", _nodejs_binary = "nodejs_binary", _npm_package = "npm_package", _rollup_bundle = "rollup_bundle")
 load("@npm_bazel_jasmine//:index.bzl", _jasmine_node_test = "jasmine_node_test")
-load("@npm_bazel_karma//:index.bzl", _karma_web_test = "karma_web_test", _karma_web_test_suite = "karma_web_test_suite", _ts_web_test = "ts_web_test", _ts_web_test_suite = "ts_web_test_suite")
+load("@npm_bazel_karma//:index.bzl", _karma_web_test = "karma_web_test", _karma_web_test_suite = "karma_web_test_suite")
 load("@npm_bazel_typescript//:index.bzl", _ts_library = "ts_library")
 load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
 load("//tools/ng_rollup_bundle:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle")
@ -164,62 +164,6 @@ def npm_package(name, replacements = {}, **kwargs):
        **kwargs
    )

-def ts_web_test(bootstrap = [], deps = [], runtime_deps = [], **kwargs):
-    """Default values for ts_web_test"""
-    if not bootstrap:
-        bootstrap = ["//:web_test_bootstrap_scripts"]
-    local_deps = [
-        "@npm//:node_modules/tslib/tslib.js",
-        "//tools/rxjs:rxjs_umd_modules",
-    ] + deps
-    local_runtime_deps = [
-        "//tools/testing:browser",
-    ] + runtime_deps
-
-    _ts_web_test(
-        runtime_deps = local_runtime_deps,
-        bootstrap = bootstrap,
-        deps = local_deps,
-        **kwargs
-    )
-
-def ts_web_test_suite(bootstrap = [], deps = [], runtime_deps = [], **kwargs):
-    """Default values for ts_web_test_suite"""
-    if not bootstrap:
-        bootstrap = ["//:web_test_bootstrap_scripts"]
-    local_deps = [
-        "@npm//:node_modules/tslib/tslib.js",
-        "//tools/rxjs:rxjs_umd_modules",
-    ] + deps
-    local_runtime_deps = [
-        "//tools/testing:browser",
-    ] + runtime_deps
-
-    tags = kwargs.pop("tags", [])
-
-    # rules_webtesting has a required_tag "native" for `chromium-local` browser
-    if not "native" in tags:
-        tags = tags + ["native"]
-
-    _ts_web_test_suite(
-        runtime_deps = local_runtime_deps,
-        bootstrap = bootstrap,
-        deps = local_deps,
-        # Run unit tests on local Chromium by default.
-        # You can exclude tests based on tags, e.g. to skip Firefox testing,
-        #   `yarn bazel test --test_tag_filters=-browser:firefox-local [targets]`
-        browsers = [
-            "@io_bazel_rules_webtesting//browsers:chromium-local",
-            # Don't test on local Firefox by default, for faster builds.
-            # We think that bugs in Angular tend to be caught the same in any
-            # evergreen browser.
-            # "@io_bazel_rules_webtesting//browsers:firefox-local",
-            # TODO(alexeagle): add remote browsers on SauceLabs
-        ],
-        tags = tags,
-        **kwargs
-    )
-
 def karma_web_test(bootstrap = [], deps = [], data = [], runtime_deps = [], **kwargs):
    """Default values for karma_web_test"""
    if not bootstrap:
@ -247,7 +191,7 @@ def karma_web_test(bootstrap = [], deps = [], data = [], runtime_deps = [], **kw
        **kwargs
    )

-def karma_web_test_suite(bootstrap = [], deps = [], **kwargs):
+def karma_web_test_suite(bootstrap = [], deps = [], runtime_deps = [], **kwargs):
    """Default values for karma_web_test_suite"""
    if not bootstrap:
        bootstrap = ["//:web_test_bootstrap_scripts"]
@ -255,6 +199,9 @@ def karma_web_test_suite(bootstrap = [], deps = [], **kwargs):
        "@npm//:node_modules/tslib/tslib.js",
        "//tools/rxjs:rxjs_umd_modules",
    ] + deps
+    local_runtime_deps = [
+        "//tools/testing:browser",
+    ] + runtime_deps

    tags = kwargs.pop("tags", [])