From 9a68f23dd2f434afac5cd6fa49e76b1652f906e5 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Wed, 13 Nov 2019 09:08:38 -0800 Subject: [PATCH] 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 --- integration/bazel/src/hello-world/BUILD.bazel | 4 +- packages/animations/browser/test/BUILD.bazel | 4 +- packages/animations/test/BUILD.bazel | 4 +- .../builders/files/src/BUILD.bazel.template | 4 +- .../files/src/initialize_testbed.ts.template | 2 +- .../ng-add/files/src/rxjs_shims.js.template | 2 +- packages/common/http/test/BUILD.bazel | 4 +- packages/common/http/testing/test/BUILD.bazel | 4 +- packages/common/test/BUILD.bazel | 4 +- packages/compiler/test/BUILD.bazel | 4 +- packages/compiler/test/css_parser/BUILD.bazel | 4 +- .../test/expression_parser/BUILD.bazel | 4 +- packages/compiler/test/ml_parser/BUILD.bazel | 4 +- packages/compiler/test/selector/BUILD.bazel | 4 +- packages/core/test/BUILD.bazel | 4 +- packages/core/test/acceptance/BUILD.bazel | 4 +- packages/core/test/render3/BUILD.bazel | 4 +- packages/core/test/view/BUILD.bazel | 4 +- packages/elements/test/BUILD.bazel | 4 +- packages/forms/test/BUILD.bazel | 4 +- packages/http/test/BUILD.bazel | 4 +- .../platform-browser-dynamic/test/BUILD.bazel | 4 +- .../animations/test/BUILD.bazel | 4 +- packages/platform-browser/test/BUILD.bazel | 4 +- packages/platform-webworker/test/BUILD.bazel | 4 +- packages/router/test/BUILD.bazel | 4 +- packages/router/upgrade/test/BUILD.bazel | 4 +- packages/service-worker/test/BUILD.bazel | 4 +- packages/upgrade/src/common/test/BUILD.bazel | 4 +- packages/upgrade/src/dynamic/test/BUILD.bazel | 4 +- packages/upgrade/static/test/BUILD.bazel | 4 +- .../upgrade/static/testing/test/BUILD.bazel | 4 +- tools/defaults.bzl | 63 ++----------------- 33 files changed, 67 insertions(+), 120 deletions(-) diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel index db264f327a..ac31c92e07 100644 --- 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", diff --git a/packages/animations/browser/test/BUILD.bazel b/packages/animations/browser/test/BUILD.bazel index 120e344b1a..4d46b7c1ae 100644 --- 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", diff --git a/packages/animations/test/BUILD.bazel b/packages/animations/test/BUILD.bazel index 60128dce5d..2b5e4e288b 100644 --- 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", diff --git a/packages/bazel/src/builders/files/src/BUILD.bazel.template b/packages/bazel/src/builders/files/src/BUILD.bazel.template index 95f8d1cc4f..55ce79d62e 100644 --- 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", diff --git 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 index 25cca1d783..e55c05b188 100644 --- 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'; diff --git 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 index b120990487..e819af725d 100644 --- 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) { diff --git a/packages/common/http/test/BUILD.bazel b/packages/common/http/test/BUILD.bazel index 507110a73f..ec114437a3 100644 --- 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", diff --git a/packages/common/http/testing/test/BUILD.bazel b/packages/common/http/testing/test/BUILD.bazel index df1213806b..a0a42f8be2 100644 --- 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", diff --git a/packages/common/test/BUILD.bazel b/packages/common/test/BUILD.bazel index 28e563592a..f444bbf315 100644 --- 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", diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel index d7ca9ec4fc..dd3c84969a 100644 --- 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. diff --git a/packages/compiler/test/css_parser/BUILD.bazel b/packages/compiler/test/css_parser/BUILD.bazel index e9764767e3..b70fa84c8d 100644 --- 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", diff --git a/packages/compiler/test/expression_parser/BUILD.bazel b/packages/compiler/test/expression_parser/BUILD.bazel index ff72c3bb1b..9ef9fa8704 100644 --- 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", diff --git a/packages/compiler/test/ml_parser/BUILD.bazel b/packages/compiler/test/ml_parser/BUILD.bazel index dea7d01799..0569cef2ba 100644 --- 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", diff --git a/packages/compiler/test/selector/BUILD.bazel b/packages/compiler/test/selector/BUILD.bazel index 0b3ba28f08..7353eb1f3d 100644 --- 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", diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel index f905742bc9..d5e8207789 100644 --- 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", diff --git a/packages/core/test/acceptance/BUILD.bazel b/packages/core/test/acceptance/BUILD.bazel index a491742ad0..9d2c5d7274 100644 --- 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", diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel index 628ef72414..6323d85252 100644 --- 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", diff --git a/packages/core/test/view/BUILD.bazel b/packages/core/test/view/BUILD.bazel index 25eddead43..481f1bcdf1 100644 --- 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", diff --git a/packages/elements/test/BUILD.bazel b/packages/elements/test/BUILD.bazel index b919bdb166..f7a77e8857 100644 --- 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", diff --git a/packages/forms/test/BUILD.bazel b/packages/forms/test/BUILD.bazel index 009c6a1bd9..1bf1a831e5 100644 --- 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", diff --git a/packages/http/test/BUILD.bazel b/packages/http/test/BUILD.bazel index 285e3567e3..01d68b79c2 100644 --- 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", diff --git a/packages/platform-browser-dynamic/test/BUILD.bazel b/packages/platform-browser-dynamic/test/BUILD.bazel index df3439a4f5..0d54237df5 100644 --- 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", diff --git a/packages/platform-browser/animations/test/BUILD.bazel b/packages/platform-browser/animations/test/BUILD.bazel index 384641faf2..4af17f10ba 100644 --- 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", diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel index 8d4a83d79a..150d014521 100644 --- 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", diff --git a/packages/platform-webworker/test/BUILD.bazel b/packages/platform-webworker/test/BUILD.bazel index fc12d2fe63..f4c2211f22 100644 --- 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", diff --git a/packages/router/test/BUILD.bazel b/packages/router/test/BUILD.bazel index b19f104576..d1eab8b6cf 100644 --- 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", diff --git a/packages/router/upgrade/test/BUILD.bazel b/packages/router/upgrade/test/BUILD.bazel index 1ee7a8b1dc..56154ab969 100644 --- 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", diff --git a/packages/service-worker/test/BUILD.bazel b/packages/service-worker/test/BUILD.bazel index 05ee1eb951..ad498fde3d 100644 --- 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", diff --git a/packages/upgrade/src/common/test/BUILD.bazel b/packages/upgrade/src/common/test/BUILD.bazel index 054ff10aad..dc8abe07b8 100644 --- 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", diff --git a/packages/upgrade/src/dynamic/test/BUILD.bazel b/packages/upgrade/src/dynamic/test/BUILD.bazel index 9ffbce997b..313a240cf8 100644 --- 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", diff --git a/packages/upgrade/static/test/BUILD.bazel b/packages/upgrade/static/test/BUILD.bazel index b60d96a550..5c1a710315 100644 --- 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", diff --git a/packages/upgrade/static/testing/test/BUILD.bazel b/packages/upgrade/static/testing/test/BUILD.bazel index 96aa6c731a..554d922c89 100644 --- 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", diff --git a/tools/defaults.bzl b/tools/defaults.bzl index f398753122..1ad3ddead6 100644 --- 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", [])