diff --git a/packages/animations/browser/test/BUILD.bazel b/packages/animations/browser/test/BUILD.bazel index 36b06e16ee..4d46b7c1ae 100644 --- a/packages/animations/browser/test/BUILD.bazel +++ b/packages/animations/browser/test/BUILD.bazel @@ -16,11 +16,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/animations/test/BUILD.bazel b/packages/animations/test/BUILD.bazel index ce00fd01a7..2b5e4e288b 100644 --- a/packages/animations/test/BUILD.bazel +++ b/packages/animations/test/BUILD.bazel @@ -13,11 +13,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/bazel/src/schematics/BUILD.bazel b/packages/bazel/src/schematics/BUILD.bazel index 15f8f5a4aa..a51a76767d 100644 --- a/packages/bazel/src/schematics/BUILD.bazel +++ b/packages/bazel/src/schematics/BUILD.bazel @@ -12,12 +12,11 @@ filegroup( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ "//packages/bazel/src/schematics/ng-add:test", "//packages/bazel/src/schematics/ng-new:test", "//packages/bazel/src/schematics/utility:test", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/benchpress/test/BUILD.bazel b/packages/benchpress/test/BUILD.bazel index 7b89609fb4..ea75062fab 100644 --- a/packages/benchpress/test/BUILD.bazel +++ b/packages/benchpress/test/BUILD.bazel @@ -15,13 +15,12 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//packages/benchpress", "//packages/core/testing", "//tools/testing:node", - "//tools/testing:node_es5", "@npm//protractor", ], ) diff --git a/packages/common/http/test/BUILD.bazel b/packages/common/http/test/BUILD.bazel index a37e1741d7..65eadfbb96 100644 --- a/packages/common/http/test/BUILD.bazel +++ b/packages/common/http/test/BUILD.bazel @@ -19,11 +19,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/common/http/testing/test/BUILD.bazel b/packages/common/http/testing/test/BUILD.bazel index 3aff5b14d3..d9de470171 100644 --- a/packages/common/http/testing/test/BUILD.bazel +++ b/packages/common/http/testing/test/BUILD.bazel @@ -17,11 +17,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/common/test/BUILD.bazel b/packages/common/test/BUILD.bazel index 613031ca40..87e8552355 100644 --- a/packages/common/test/BUILD.bazel +++ b/packages/common/test/BUILD.bazel @@ -24,11 +24,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/common/upgrade/test/BUILD.bazel b/packages/common/upgrade/test/BUILD.bazel index 9e9b56167e..12462680c8 100644 --- a/packages/common/upgrade/test/BUILD.bazel +++ b/packages/common/upgrade/test/BUILD.bazel @@ -16,10 +16,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel index c734409217..6999d6c26a 100644 --- a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel @@ -21,13 +21,12 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//packages/platform-server", "//packages/platform-server/testing", "//packages/private/testing", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel index b373b4cb48..ab1ed5eb0b 100644 --- a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel +++ b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel @@ -22,13 +22,12 @@ ts_library( jasmine_node_test( name = "test", + bootstrap = ["angular/tools/testing/init_node_spec.js"], tags = [ "ivy-only", ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/compiler-cli/ngcc/test/BUILD.bazel b/packages/compiler-cli/ngcc/test/BUILD.bazel index d7b53adfe0..8166e70b85 100644 --- a/packages/compiler-cli/ngcc/test/BUILD.bazel +++ b/packages/compiler-cli/ngcc/test/BUILD.bazel @@ -33,13 +33,13 @@ ts_library( jasmine_node_test( name = "test", + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], data = [ "//packages/compiler-cli/test/ngtsc/fake_core:npm_package", ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) @@ -64,6 +64,7 @@ ts_library( jasmine_node_test( name = "integration", timeout = "long", + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], data = [ "//packages/common:npm_package", "//packages/core:npm_package", @@ -74,10 +75,9 @@ jasmine_node_test( # Disabled in AOT mode because we want ngcc to compile non-AOT Angular packages. "no-ivy-aot", ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], deps = [ ":integration_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", "@npm//canonical-path", "@npm//convert-source-map", ], diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel index e6a1ebd716..ac632ecd04 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel @@ -29,9 +29,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel index d95434faa0..e95443472f 100644 --- a/packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel @@ -21,9 +21,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel index ef595d45ee..03c4b93867 100644 --- a/packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel @@ -19,9 +19,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel index a84c321523..84ea6a2849 100644 --- a/packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel @@ -18,9 +18,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/src/ngtsc/imports/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/imports/test/BUILD.bazel index 5c35f76a07..7b36f38e5e 100644 --- a/packages/compiler-cli/src/ngtsc/imports/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/imports/test/BUILD.bazel @@ -22,9 +22,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/src/ngtsc/indexer/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/indexer/test/BUILD.bazel index 050f641cc2..cc98a4fbab 100644 --- a/packages/compiler-cli/src/ngtsc/indexer/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/indexer/test/BUILD.bazel @@ -23,9 +23,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel index ec5d9b848a..11c584fa0f 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel @@ -24,9 +24,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel index c99d53bdb1..b786eade07 100644 --- a/packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel @@ -20,9 +20,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel index 4f2c3e3556..4869bbf684 100644 --- a/packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel @@ -24,9 +24,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel index ff3b3ae3f0..de435dc818 100644 --- a/packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel @@ -17,9 +17,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel index 1095455226..a48813d7ad 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel @@ -24,9 +24,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel index afd93119be..a4ca97b5af 100644 --- a/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel +++ b/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel @@ -20,9 +20,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/test/BUILD.bazel b/packages/compiler-cli/test/BUILD.bazel index 3b93ae4062..3c651e6540 100644 --- a/packages/compiler-cli/test/BUILD.bazel +++ b/packages/compiler-cli/test/BUILD.bazel @@ -40,6 +40,7 @@ ts_library( jasmine_node_test( name = "extract_i18n", + bootstrap = ["angular/tools/testing/init_node_spec.js"], data = [ "//packages/core:npm_package", ], @@ -48,13 +49,11 @@ jasmine_node_test( # tool will likely work differently. "no-ivy-aot", ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], deps = [ ":extract_i18n_lib", "//packages/common:npm_package", "//packages/core", "//tools/testing:node", - "//tools/testing:node_es5", "@npm//minimist", ], ) @@ -77,6 +76,7 @@ ts_library( jasmine_node_test( name = "ngc", timeout = "long", # 900 seconds + bootstrap = ["angular/tools/testing/init_node_spec.js"], data = [ "//packages/common:npm_package", "//packages/core:npm_package", @@ -88,12 +88,10 @@ jasmine_node_test( # own tests under //packages/compiler-cli/test/ngtsc. "no-ivy-aot", ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], deps = [ ":ngc_lib", "//packages/core", "//tools/testing:node", - "//tools/testing:node_es5", "@npm//minimist", "@npm//rxjs", "@npm//tsickle", @@ -118,15 +116,14 @@ ts_library( jasmine_node_test( name = "perform_watch", + bootstrap = ["angular/tools/testing/init_node_spec.js"], data = [ "//packages/core:npm_package", ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], deps = [ ":perform_watch_lib", "//packages/core", "//tools/testing:node", - "//tools/testing:node_es5", ], ) @@ -146,14 +143,13 @@ ts_library( jasmine_node_test( name = "perform_compile", + bootstrap = ["angular/tools/testing/init_node_spec.js"], data = [ "//packages/core:npm_package", ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], deps = [ ":perform_compile_lib", "//packages/core", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/compiler-cli/test/compliance/BUILD.bazel b/packages/compiler-cli/test/compliance/BUILD.bazel index 4376113e42..ad3a15b865 100644 --- a/packages/compiler-cli/test/compliance/BUILD.bazel +++ b/packages/compiler-cli/test/compliance/BUILD.bazel @@ -18,6 +18,7 @@ ts_library( jasmine_node_test( name = "compliance", + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], data = [ "//packages/compiler-cli/test/ngtsc/fake_core:npm_package", ], @@ -25,9 +26,8 @@ jasmine_node_test( tags = [ "ivy-only", ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/compiler-cli/test/diagnostics/BUILD.bazel b/packages/compiler-cli/test/diagnostics/BUILD.bazel index be532176ae..be2cece23f 100644 --- a/packages/compiler-cli/test/diagnostics/BUILD.bazel +++ b/packages/compiler-cli/test/diagnostics/BUILD.bazel @@ -15,6 +15,7 @@ ts_library( jasmine_node_test( name = "check_types", timeout = "long", # 900 seconds + bootstrap = ["angular/tools/testing/init_node_spec.js"], data = [ "//packages/common:npm_package", "//packages/core:npm_package", @@ -24,12 +25,10 @@ jasmine_node_test( # compiler has its own typechecking implementation and tests. "no-ivy-aot", ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], deps = [ ":check_types_lib", "//packages/core", "//tools/testing:node", - "//tools/testing:node_es5", ], ) @@ -46,10 +45,11 @@ ts_library( jasmine_node_test( name = "typescript_version", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], + data = [ + ], deps = [ ":typescript_version_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/compiler-cli/test/metadata/BUILD.bazel b/packages/compiler-cli/test/metadata/BUILD.bazel index 948b2ae195..8fe58d3d1e 100644 --- a/packages/compiler-cli/test/metadata/BUILD.bazel +++ b/packages/compiler-cli/test/metadata/BUILD.bazel @@ -16,13 +16,12 @@ ts_library( jasmine_node_test( name = "test", + bootstrap = ["angular/tools/testing/init_node_spec.js"], data = [ ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], deps = [ ":test_lib", "//packages/core", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/compiler-cli/test/ngtsc/BUILD.bazel b/packages/compiler-cli/test/ngtsc/BUILD.bazel index a04f658deb..c9ceca5077 100644 --- a/packages/compiler-cli/test/ngtsc/BUILD.bazel +++ b/packages/compiler-cli/test/ngtsc/BUILD.bazel @@ -23,14 +23,14 @@ ts_library( jasmine_node_test( name = "ngtsc", timeout = "long", + bootstrap = ["angular/tools/testing/init_node_no_angular_spec.js"], data = [ "//packages/compiler-cli/test/ngtsc/fake_core:npm_package", ], shard_count = 4, - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], deps = [ ":ngtsc_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", "@npm//minimist", ], ) diff --git a/packages/compiler-cli/test/transformers/BUILD.bazel b/packages/compiler-cli/test/transformers/BUILD.bazel index 245858cf0d..8c9b603f4f 100644 --- a/packages/compiler-cli/test/transformers/BUILD.bazel +++ b/packages/compiler-cli/test/transformers/BUILD.bazel @@ -19,6 +19,7 @@ ts_library( jasmine_node_test( name = "test", timeout = "long", # 900 seconds + bootstrap = ["angular/tools/testing/init_node_spec.js"], data = [ "//packages/common:npm_package", "//packages/core:npm_package", @@ -29,12 +30,10 @@ jasmine_node_test( # of these transformer utilities. "no-ivy-aot", ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], deps = [ ":test_lib", "//packages/core", "//tools/testing:node", - "//tools/testing:node_es5", "@npm//source-map", ], ) diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel index 357bb2e322..dd3c84969a 100644 --- a/packages/compiler/test/BUILD.bazel +++ b/packages/compiler/test/BUILD.bazel @@ -70,6 +70,7 @@ ts_library( jasmine_node_test( name = "test", + bootstrap = ["angular/tools/testing/init_node_spec.js"], data = [ "//packages/animations:npm_package", "//packages/common:npm_package", @@ -79,12 +80,10 @@ jasmine_node_test( # Disabled as these tests pertain to the old ngc compilation and are not relevant in Ivy. "no-ivy-aot", ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], deps = [ ":test_lib", ":test_node_only_lib", "//tools/testing:node", - "//tools/testing:node_es5", "@npm//base64-js", "@npm//source-map", ], diff --git a/packages/compiler/test/css_parser/BUILD.bazel b/packages/compiler/test/css_parser/BUILD.bazel index ec6c66eab0..b70fa84c8d 100644 --- a/packages/compiler/test/css_parser/BUILD.bazel +++ b/packages/compiler/test/css_parser/BUILD.bazel @@ -16,11 +16,10 @@ ts_library( jasmine_node_test( name = "css_parser", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":css_parser_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/compiler/test/expression_parser/BUILD.bazel b/packages/compiler/test/expression_parser/BUILD.bazel index 3f1b032c4d..9ef9fa8704 100644 --- a/packages/compiler/test/expression_parser/BUILD.bazel +++ b/packages/compiler/test/expression_parser/BUILD.bazel @@ -15,11 +15,10 @@ ts_library( jasmine_node_test( name = "expression_parser", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":expression_parser_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/compiler/test/ml_parser/BUILD.bazel b/packages/compiler/test/ml_parser/BUILD.bazel index e399b5f2d7..0569cef2ba 100644 --- a/packages/compiler/test/ml_parser/BUILD.bazel +++ b/packages/compiler/test/ml_parser/BUILD.bazel @@ -13,11 +13,10 @@ ts_library( jasmine_node_test( name = "ml_parser", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":ml_parser_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/compiler/test/render3/BUILD.bazel b/packages/compiler/test/render3/BUILD.bazel index d6a0769da9..25a50c2acb 100644 --- a/packages/compiler/test/render3/BUILD.bazel +++ b/packages/compiler/test/render3/BUILD.bazel @@ -18,10 +18,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/compiler/test/selector/BUILD.bazel b/packages/compiler/test/selector/BUILD.bazel index 5d49d1abbc..7353eb1f3d 100644 --- a/packages/compiler/test/selector/BUILD.bazel +++ b/packages/compiler/test/selector/BUILD.bazel @@ -17,11 +17,10 @@ ts_library( jasmine_node_test( name = "selector", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":selector_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel index eed634e303..ab2ad8f7fa 100644 --- a/packages/core/test/BUILD.bazel +++ b/packages/core/test/BUILD.bazel @@ -59,8 +59,8 @@ ts_library( jasmine_node_test( name = "test", + bootstrap = ["angular/tools/testing/init_node_spec.js"], shard_count = 4, - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], deps = [ ":test_lib", ":test_node_only_lib", @@ -68,7 +68,6 @@ jasmine_node_test( "//packages/platform-server/testing", "//packages/zone.js/lib:zone_d_ts", "//tools/testing:node", - "//tools/testing:node_es5", "@npm//base64-js", "@npm//source-map", ], diff --git a/packages/core/test/acceptance/BUILD.bazel b/packages/core/test/acceptance/BUILD.bazel index 65bb7eeb21..cc87ecc34a 100644 --- a/packages/core/test/acceptance/BUILD.bazel +++ b/packages/core/test/acceptance/BUILD.bazel @@ -37,12 +37,11 @@ ts_library( jasmine_node_test( name = "acceptance", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":acceptance_lib", "//packages/zone.js/lib:zone_d_ts", "//tools/testing:node", - "//tools/testing:node_es5", "@npm//base64-js", "@npm//source-map", ], diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel index fd33e052e1..6323d85252 100644 --- a/packages/core/test/render3/BUILD.bazel +++ b/packages/core/test/render3/BUILD.bazel @@ -61,10 +61,10 @@ ts_library( jasmine_node_test( name = "render3", - templated_args = ["--node_options=--require=$(rlocation $(location :domino_es5))"], + bootstrap = [ + "angular/packages/core/test/render3/load_domino", + ], deps = [ - ":domino", - ":domino_es5", ":render3_node_lib", "//packages/zone.js/lib", ], diff --git a/packages/core/test/render3/ivy/BUILD.bazel b/packages/core/test/render3/ivy/BUILD.bazel index a35b6ae234..9855dfd764 100644 --- a/packages/core/test/render3/ivy/BUILD.bazel +++ b/packages/core/test/render3/ivy/BUILD.bazel @@ -16,14 +16,15 @@ ts_library( jasmine_node_test( name = "ivy", + bootstrap = [ + "angular/packages/core/test/render3/load_domino", + ], tags = [ "ivy-only", ], - templated_args = ["--node_options=--require=$(rlocation $(location //packages/core/test/render3:domino_es5))"], deps = [ ":ivy_lib", "//packages/core/test/render3:domino", - "//packages/core/test/render3:domino_es5", "//packages/zone.js/lib", ], ) diff --git a/packages/core/test/render3/load_domino.ts b/packages/core/test/render3/load_domino.ts index 06eaacb5a4..8d9d549640 100644 --- a/packages/core/test/render3/load_domino.ts +++ b/packages/core/test/render3/load_domino.ts @@ -6,15 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ -if (process.env['TEST_SRCDIR']) { - // bootstrap the bazel require resolve patch since this - // script is a bootstrap script loaded with --node_options=--require=... - const path = require('path'); - require(path.posix.join( - process.env['TEST_SRCDIR'], process.env['TEST_WORKSPACE'], - (process.env['TEST_BINARY'] as string).replace(/\.(sh|bat)$/, '_loader.js'), )); -} - // Needed to run animation tests import 'zone.js/lib/node/rollup-main'; import '@angular/compiler'; // For JIT mode. Must be in front of any other @angular/* imports. diff --git a/packages/core/test/view/BUILD.bazel b/packages/core/test/view/BUILD.bazel index b1345c912c..481f1bcdf1 100644 --- a/packages/core/test/view/BUILD.bazel +++ b/packages/core/test/view/BUILD.bazel @@ -34,15 +34,14 @@ ts_library( jasmine_node_test( name = "view", + bootstrap = ["angular/tools/testing/init_node_spec.js"], tags = [ "no-ivy-aot", ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], deps = [ ":view_lib", ":view_node_only_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/examples/core/BUILD.bazel b/packages/examples/core/BUILD.bazel index 98a46a423a..fce592cd19 100644 --- a/packages/examples/core/BUILD.bazel +++ b/packages/examples/core/BUILD.bazel @@ -78,10 +78,9 @@ protractor_web_test_suite( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":core_tests_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/examples/core/testing/ts/BUILD.bazel b/packages/examples/core/testing/ts/BUILD.bazel index c9076e5c54..cbfb89fcca 100644 --- a/packages/examples/core/testing/ts/BUILD.bazel +++ b/packages/examples/core/testing/ts/BUILD.bazel @@ -15,10 +15,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":fake_async_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/forms/test/BUILD.bazel b/packages/forms/test/BUILD.bazel index 3e71cc2ac8..679a2af5c0 100644 --- a/packages/forms/test/BUILD.bazel +++ b/packages/forms/test/BUILD.bazel @@ -20,11 +20,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/http/test/BUILD.bazel b/packages/http/test/BUILD.bazel index ad9bbebbf3..f7d5d2bc1d 100644 --- a/packages/http/test/BUILD.bazel +++ b/packages/http/test/BUILD.bazel @@ -20,11 +20,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/localize/schematics/ng-add/BUILD.bazel b/packages/localize/schematics/ng-add/BUILD.bazel index a2ca2bcd27..20bce8ad46 100644 --- a/packages/localize/schematics/ng-add/BUILD.bazel +++ b/packages/localize/schematics/ng-add/BUILD.bazel @@ -43,10 +43,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/localize/src/localize/test/BUILD.bazel b/packages/localize/src/localize/test/BUILD.bazel index 1751925a5a..94cde285ef 100644 --- a/packages/localize/src/localize/test/BUILD.bazel +++ b/packages/localize/src/localize/test/BUILD.bazel @@ -14,9 +14,11 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = [ + "angular/tools/testing/init_node_no_angular_spec.js", + ], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/localize/src/tools/test/BUILD.bazel b/packages/localize/src/tools/test/BUILD.bazel index 294dbaca09..dea2fea294 100644 --- a/packages/localize/src/tools/test/BUILD.bazel +++ b/packages/localize/src/tools/test/BUILD.bazel @@ -22,10 +22,12 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = [ + "angular/tools/testing/init_node_no_angular_spec.js", + ], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", "@npm//glob", ], ) diff --git a/packages/localize/src/tools/test/translate/integration/BUILD.bazel b/packages/localize/src/tools/test/translate/integration/BUILD.bazel index c082ada410..9f2eeabf1a 100644 --- a/packages/localize/src/tools/test/translate/integration/BUILD.bazel +++ b/packages/localize/src/tools/test/translate/integration/BUILD.bazel @@ -14,16 +14,18 @@ ts_library( jasmine_node_test( name = "integration", + bootstrap = [ + "angular/tools/testing/init_node_no_angular_spec.js", + ], data = glob( [ "locales/**", "test_files/**", ], ), - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", "@npm//glob", "@npm//yargs", ], diff --git a/packages/localize/src/utils/test/BUILD.bazel b/packages/localize/src/utils/test/BUILD.bazel index 8390849a2a..aaf43dcf63 100644 --- a/packages/localize/src/utils/test/BUILD.bazel +++ b/packages/localize/src/utils/test/BUILD.bazel @@ -14,9 +14,11 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = [ + "angular/tools/testing/init_node_no_angular_spec.js", + ], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/localize/test/BUILD.bazel b/packages/localize/test/BUILD.bazel index 8db773173c..13381b2dad 100644 --- a/packages/localize/test/BUILD.bazel +++ b/packages/localize/test/BUILD.bazel @@ -16,9 +16,11 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"], + bootstrap = [ + "angular/tools/testing/init_node_no_angular_spec.js", + ], deps = [ ":test_lib", - "//tools/testing:node_no_angular_es5", + "//tools/testing:node_no_angular", ], ) diff --git a/packages/platform-browser-dynamic/test/BUILD.bazel b/packages/platform-browser-dynamic/test/BUILD.bazel index 5bfa0bcd0b..0d54237df5 100644 --- a/packages/platform-browser-dynamic/test/BUILD.bazel +++ b/packages/platform-browser-dynamic/test/BUILD.bazel @@ -18,11 +18,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/platform-browser/animations/test/BUILD.bazel b/packages/platform-browser/animations/test/BUILD.bazel index 8835133c33..4af17f10ba 100644 --- a/packages/platform-browser/animations/test/BUILD.bazel +++ b/packages/platform-browser/animations/test/BUILD.bazel @@ -24,11 +24,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel index 2c14cd335e..150d014521 100644 --- a/packages/platform-browser/test/BUILD.bazel +++ b/packages/platform-browser/test/BUILD.bazel @@ -29,11 +29,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/platform-server/test/BUILD.bazel b/packages/platform-server/test/BUILD.bazel index bd371d35b9..187430ed56 100644 --- a/packages/platform-server/test/BUILD.bazel +++ b/packages/platform-server/test/BUILD.bazel @@ -22,12 +22,11 @@ ts_library( jasmine_node_test( name = "test", + bootstrap = ["angular/tools/testing/init_node_spec.js"], tags = [ ], - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/platform-webworker/test/BUILD.bazel b/packages/platform-webworker/test/BUILD.bazel index c111faa7f1..f4c2211f22 100644 --- a/packages/platform-webworker/test/BUILD.bazel +++ b/packages/platform-webworker/test/BUILD.bazel @@ -21,11 +21,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/router/test/BUILD.bazel b/packages/router/test/BUILD.bazel index d4bf152368..30e62191e2 100644 --- a/packages/router/test/BUILD.bazel +++ b/packages/router/test/BUILD.bazel @@ -23,11 +23,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/router/test/aot_ngsummary_test/BUILD.bazel b/packages/router/test/aot_ngsummary_test/BUILD.bazel index 8ab47431b0..fc804c6b82 100644 --- a/packages/router/test/aot_ngsummary_test/BUILD.bazel +++ b/packages/router/test/aot_ngsummary_test/BUILD.bazel @@ -27,10 +27,9 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":aot_test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/service-worker/config/test/BUILD.bazel b/packages/service-worker/config/test/BUILD.bazel index 27c30ad4ff..f133a418b5 100644 --- a/packages/service-worker/config/test/BUILD.bazel +++ b/packages/service-worker/config/test/BUILD.bazel @@ -14,12 +14,11 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//packages/service-worker/config", "//packages/service-worker/config/testing", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/service-worker/test/BUILD.bazel b/packages/service-worker/test/BUILD.bazel index 02ae61548c..ad498fde3d 100644 --- a/packages/service-worker/test/BUILD.bazel +++ b/packages/service-worker/test/BUILD.bazel @@ -18,11 +18,10 @@ ts_library( jasmine_node_test( name = "test", - templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"], + bootstrap = ["angular/tools/testing/init_node_spec.js"], deps = [ ":test_lib", "//tools/testing:node", - "//tools/testing:node_es5", ], ) diff --git a/packages/zone.js/test/BUILD.bazel b/packages/zone.js/test/BUILD.bazel index ac4561a830..6c30bd4810 100644 --- a/packages/zone.js/test/BUILD.bazel +++ b/packages/zone.js/test/BUILD.bazel @@ -68,6 +68,8 @@ ts_library( testonly = True, srcs = glob(["node/*.ts"]) + [ "node-env-setup.ts", + "node_entry_point.ts", + "node_entry_point_no_patch_clock.ts", "test-env-setup-jasmine-no-patch-clock.ts", ], deps = [ @@ -83,45 +85,12 @@ ts_library( ], ) -ts_library( - name = "node_entry_point", - testonly = True, - srcs = ["node_entry_point.ts"], - deps = [ - ":common_spec_env", - ":common_spec_srcs", - ":common_spec_util", - "//packages/zone.js/lib", - "@npm//@types/shelljs", - "@npm//@types/systemjs", - "@npm//rxjs", - "@npm//shelljs", - "@npm//systemjs", - ], -) - -ts_library( - name = "node_entry_point_no_patch_clock", - testonly = True, - srcs = ["node_entry_point_no_patch_clock.ts"], - deps = [ - ":common_spec_env", - ":common_spec_srcs", - ":common_spec_util", - "//packages/zone.js/lib", - "@npm//@types/shelljs", - "@npm//@types/systemjs", - "@npm//rxjs", - "@npm//shelljs", - "@npm//systemjs", - ], -) - ts_library( name = "bluebird_spec", testonly = True, srcs = [ "extra/bluebird.spec.ts", + "node_bluebird_entry_point.ts", ], deps = [ ":common_spec_env", @@ -131,96 +100,68 @@ ts_library( ) ts_library( - name = "node_bluebird_entry_point", + name = "error_spec", testonly = True, - srcs = ["node_bluebird_entry_point.ts"], - deps = [ - ":common_spec_env", - "//packages/zone.js/lib", - "@npm//bluebird", + srcs = [ + "node_error_disable_policy_entry_point.ts", + "node_error_entry_point.ts", + "node_error_lazy_policy_entry_point.ts", ], -) - -ts_library( - name = "node_error_disable_policy_entry_point", - testonly = True, - srcs = ["node_error_disable_policy_entry_point.ts"], deps = [ ":common_spec_env", ":common_spec_util", ":error_spec_srcs", - ":node_error_entry_point", - "//packages/zone.js/lib", - ], -) - -ts_library( - name = "node_error_entry_point", - testonly = True, - srcs = ["node_error_entry_point.ts"], - deps = [ - ":common_spec_env", - ":common_spec_util", - ":error_spec_srcs", - "//packages/zone.js/lib", - ], -) - -ts_library( - name = "node_error_lazy_policy_entry_point", - testonly = True, - srcs = ["node_error_lazy_policy_entry_point.ts"], - deps = [ - ":common_spec_env", - ":common_spec_util", - ":error_spec_srcs", - ":node_error_entry_point", "//packages/zone.js/lib", ], ) jasmine_node_test( name = "test_node", - templated_args = ["--node_options=--require=$(rlocation $(location :node_entry_point_es5))"], + bootstrap = [ + "angular/packages/zone.js/test/node_entry_point.js", + ], deps = [ - ":node_entry_point_es5", ":test_node_lib", ], ) jasmine_node_test( name = "test_node_no_jasmine_clock", - templated_args = ["--node_options=--require=$(rlocation $(location :node_entry_point_no_patch_clock_es5))"], + bootstrap = [ + "angular/packages/zone.js/test/node_entry_point_no_patch_clock.js", + ], deps = [ - ":node_entry_point_no_patch_clock_es5", ":test_node_lib", ], ) jasmine_node_test( name = "test_node_bluebird", - templated_args = ["--node_options=--require=$(rlocation $(location :node_bluebird_entry_point_es5))"], + bootstrap = [ + "angular/packages/zone.js/test/node_bluebird_entry_point.js", + ], deps = [ ":bluebird_spec", - ":node_bluebird_entry_point_es5", ], ) jasmine_node_test( name = "test_node_error_disable_policy", - templated_args = ["--node_options=--require=$(rlocation $(location :node_error_disable_policy_entry_point_es5))"], + bootstrap = [ + "angular/packages/zone.js/test/node_error_disable_policy_entry_point.js", + ], deps = [ - ":node_error_disable_policy_entry_point", - ":node_error_disable_policy_entry_point_es5", + ":error_spec", ], ) jasmine_node_test( name = "test_node_error_lazy_policy", - templated_args = ["--node_options=--require=$(rlocation $(location :node_error_lazy_policy_entry_point_es5))"], + bootstrap = [ + "angular/packages/zone.js/test/node_error_lazy_policy_entry_point.js", + ], deps = [ - ":node_error_lazy_policy_entry_point", - ":node_error_lazy_policy_entry_point_es5", + ":error_spec", ], ) diff --git a/packages/zone.js/test/node_bluebird_entry_point.ts b/packages/zone.js/test/node_bluebird_entry_point.ts index 7406499b54..ae0da24027 100644 --- a/packages/zone.js/test/node_bluebird_entry_point.ts +++ b/packages/zone.js/test/node_bluebird_entry_point.ts @@ -6,15 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ -if (process.env['TEST_SRCDIR']) { - // bootstrap the bazel require resolve patch since this - // script is a bootstrap script loaded with --node_options=--require=... - const path = require('path'); - require(path.posix.join( - process.env['TEST_SRCDIR'], process.env['TEST_WORKSPACE'], - (process.env['TEST_BINARY'] as string).replace(/\.(sh|bat)$/, '_loader.js'), )); -} - // Must be loaded before zone loads, so that zone can detect WTF. import './test_fake_polyfill'; diff --git a/packages/zone.js/test/node_entry_point.ts b/packages/zone.js/test/node_entry_point.ts index c3b3a436e9..e63e7595d6 100644 --- a/packages/zone.js/test/node_entry_point.ts +++ b/packages/zone.js/test/node_entry_point.ts @@ -13,15 +13,6 @@ * found in the LICENSE file at https://angular.io/license */ -if (process.env['TEST_SRCDIR']) { - // bootstrap the bazel require resolve patch since this - // script is a bootstrap script loaded with --node_options=--require=... - const path = require('path'); - require(path.posix.join( - process.env['TEST_SRCDIR'], process.env['TEST_WORKSPACE'], - (process.env['TEST_BINARY'] as string).replace(/\.(sh|bat)$/, '_loader.js'), )); -} - // Must be loaded before zone loads, so that zone can detect WTF. import './node-env-setup'; import './test_fake_polyfill'; diff --git a/packages/zone.js/test/node_entry_point_no_patch_clock.ts b/packages/zone.js/test/node_entry_point_no_patch_clock.ts index a6b24aa7b4..a91766407f 100644 --- a/packages/zone.js/test/node_entry_point_no_patch_clock.ts +++ b/packages/zone.js/test/node_entry_point_no_patch_clock.ts @@ -13,15 +13,6 @@ * found in the LICENSE file at https://angular.io/license */ -if (process.env['TEST_SRCDIR']) { - // bootstrap the bazel require resolve patch since this - // script is a bootstrap script loaded with --node_options=--require=... - const path = require('path'); - require(path.posix.join( - process.env['TEST_SRCDIR'], process.env['TEST_WORKSPACE'], - (process.env['TEST_BINARY'] as string).replace(/\.(sh|bat)$/, '_loader.js'), )); -} - // Must be loaded before zone loads, so that zone can detect WTF. import './node-env-setup'; import './test_fake_polyfill'; diff --git a/packages/zone.js/test/node_error_disable_policy_entry_point.ts b/packages/zone.js/test/node_error_disable_policy_entry_point.ts index 1158768f44..841039900d 100644 --- a/packages/zone.js/test/node_error_disable_policy_entry_point.ts +++ b/packages/zone.js/test/node_error_disable_policy_entry_point.ts @@ -6,15 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ -if (process.env['TEST_SRCDIR']) { - // bootstrap the bazel require resolve patch since this - // script is a bootstrap script loaded with --node_options=--require=... - const path = require('path'); - require(path.posix.join( - process.env['TEST_SRCDIR'], process.env['TEST_WORKSPACE'], - (process.env['TEST_BINARY'] as string).replace(/\.(sh|bat)$/, '_loader.js'), )); -} - process.env['errorpolicy'] = (global as any)['__Zone_Error_BlacklistedStackFrames_policy'] = 'disable'; import './node_error_entry_point'; diff --git a/packages/zone.js/test/node_error_lazy_policy_entry_point.ts b/packages/zone.js/test/node_error_lazy_policy_entry_point.ts index 70c57c0549..61b5e56093 100644 --- a/packages/zone.js/test/node_error_lazy_policy_entry_point.ts +++ b/packages/zone.js/test/node_error_lazy_policy_entry_point.ts @@ -6,14 +6,5 @@ * found in the LICENSE file at https://angular.io/license */ -if (process.env['TEST_SRCDIR']) { - // bootstrap the bazel require resolve patch since this - // script is a bootstrap script loaded with --node_options=--require=... - const path = require('path'); - require(path.posix.join( - process.env['TEST_SRCDIR'], process.env['TEST_WORKSPACE'], - (process.env['TEST_BINARY'] as string).replace(/\.(sh|bat)$/, '_loader.js'), )); -} - process.env['errorpolicy'] = (global as any)['__Zone_Error_BlacklistedStackFrames_policy'] = 'lazy'; import './node_error_entry_point'; diff --git a/tools/defaults.bzl b/tools/defaults.bzl index aec19d7cf6..c761e3e78d 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -1,6 +1,6 @@ """Re-export of some bazel rules with repository-wide defaults.""" -load("@build_bazel_rules_nodejs//:index.bzl", _nodejs_binary = "nodejs_binary", _pkg_npm = "pkg_npm") +load("@build_bazel_rules_nodejs//:index.bzl", _nodejs_binary = "nodejs_binary", _npm_package = "npm_package") 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") load("@npm_bazel_typescript//:index.bzl", _ts_devserver = "ts_devserver", _ts_library = "ts_library") @@ -93,7 +93,7 @@ def ts_devserver(**kwargs): **kwargs ) -def ts_library(name, tsconfig = None, testonly = False, deps = [], module_name = None, **kwargs): +def ts_library(tsconfig = None, testonly = False, deps = [], module_name = None, **kwargs): """Default values for ts_library""" deps = deps + ["@npm//tslib"] if testonly: @@ -108,7 +108,6 @@ def ts_library(name, tsconfig = None, testonly = False, deps = [], module_name = module_name = _default_module_name(testonly) _ts_library( - name = name, tsconfig = tsconfig, testonly = testonly, deps = deps, @@ -116,17 +115,6 @@ def ts_library(name, tsconfig = None, testonly = False, deps = [], module_name = **kwargs ) - # Select the es5 .js output of the ts_library for use in downstream boostrap targets - # with `output_group = "es5_sources"`. This exposes an internal detail of ts_library - # that is not ideal. - # TODO(gregmagolan): clean this up by using tsc() in these cases rather than ts_library - native.filegroup( - name = "%s_es5" % name, - srcs = [":%s" % name], - testonly = testonly, - output_group = "es5_sources", - ) - def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps = [], module_name = None, bundle_dts = True, **kwargs): """Default values for ng_module""" deps = deps + ["@npm//tslib"] diff --git a/tools/testing/init_node_spec.ts b/tools/testing/init_node_spec.ts index 0c8dbdebef..7a0aa0eec6 100644 --- a/tools/testing/init_node_spec.ts +++ b/tools/testing/init_node_spec.ts @@ -6,15 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ -if (process.env['TEST_SRCDIR']) { - // bootstrap the bazel require resolve patch since this - // script is a bootstrap script loaded with --node_options=--require=... - const path = require('path'); - require(path.posix.join( - process.env['TEST_SRCDIR'], process.env['TEST_WORKSPACE'], - (process.env['TEST_BINARY'] as string).replace(/\.(sh|bat)$/, '_loader.js'), )); -} - import 'zone.js/lib/node/rollup-main'; import 'zone.js/lib/zone-spec/long-stack-trace'; import 'zone.js/lib/zone-spec/task-tracking'; diff --git a/tools/ts-api-guardian/BUILD.bazel b/tools/ts-api-guardian/BUILD.bazel index 7841891db7..045b44d0ec 100644 --- a/tools/ts-api-guardian/BUILD.bazel +++ b/tools/ts-api-guardian/BUILD.bazel @@ -55,10 +55,7 @@ pkg_npm( ts_library( name = "test_lib", testonly = True, - srcs = glob( - ["test/*.ts"], - exclude = ["test/bootstrap.ts"], - ), + srcs = glob(["test/*.ts"]), tsconfig = "//tools:tsconfig-test", deps = [ ":lib", @@ -71,40 +68,18 @@ ts_library( ], ) -ts_library( - name = "bootstrap", - testonly = True, - srcs = ["test/bootstrap.ts"], - tsconfig = "//tools:tsconfig-test", - deps = ["@npm//@types/node"], -) - -# Select the es5 .js output of the ts_library :boostrap target -# with `output_group = "es5_sources"` for use in the jasmine_node_test -# below. This exposes an internal detail of ts_library that is not ideal. -# TODO(gregmagolan): clean this up by using tsc() in this case rather than ts_library -filegroup( - name = "bootstrap_es5", - testonly = True, - srcs = [":bootstrap"], - output_group = "es5_sources", -) - jasmine_node_test( name = "tests", - srcs = [ - ":test_lib", - ], + srcs = [":test_lib"], + bootstrap = ["angular/tools/ts-api-guardian/test/bootstrap.js"], data = glob([ "test/fixtures/*.ts", "test/fixtures/*.patch", ]) + [ - ":bootstrap_es5", ":ts-api-guardian", # TODO: remove this once the boostrap.js workaround has been removed. ":package.json", ], - templated_args = ["--node_options=--require=$(rlocation $(location :bootstrap_es5))"], ) # END-INTERNAL