Skip to content

Commit

Permalink
Revert "test: handle bootstrap templated_args in jasmine_node_test de…
Browse files Browse the repository at this point in the history 
…faults.bzl (#34589)" (#34730)

This reverts commit da4782e.

PR Close #34730
  • Loading branch information
@atscott
atscott committed Jan 10, 2020
1 parent bb6d033 commit 38750e3
Show file tree
Hide file tree
Showing 61 changed files with 142 additions and 83 deletions.
3 changes: 2 additions & 1 deletion packages/animations/browser/test/BUILD.bazel
View file
Expand Up @@ -16,10 +16,11 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"],
deps = [
":test_lib",
"//tools/testing:node",
"//tools/testing:node_es5",
],
)

Expand Down
3 changes: 2 additions & 1 deletion packages/animations/test/BUILD.bazel
View file
Expand Up @@ -13,10 +13,11 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"],
deps = [
":test_lib",
"//tools/testing:node",
"//tools/testing:node_es5",
],
)

Expand Down
3 changes: 2 additions & 1 deletion packages/bazel/src/schematics/BUILD.bazel
View file
Expand Up @@ -12,11 +12,12 @@ filegroup(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"],
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",
],
)
3 changes: 2 additions & 1 deletion packages/benchpress/test/BUILD.bazel
View file
Expand Up @@ -15,12 +15,13 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"],
deps = [
":test_lib",
"//packages/benchpress",
"//packages/core/testing",
"//tools/testing:node",
"//tools/testing:node_es5",
"@npm//protractor",
],
)
3 changes: 2 additions & 1 deletion packages/common/http/test/BUILD.bazel
View file
Expand Up @@ -19,10 +19,11 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"],
deps = [
":test_lib",
"//tools/testing:node",
"//tools/testing:node_es5",
],
)

Expand Down
3 changes: 2 additions & 1 deletion packages/common/http/testing/test/BUILD.bazel
View file
Expand Up @@ -17,10 +17,11 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"],
deps = [
":test_lib",
"//tools/testing:node",
"//tools/testing:node_es5",
],
)

Expand Down
3 changes: 2 additions & 1 deletion packages/common/test/BUILD.bazel
View file
Expand Up @@ -24,10 +24,11 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"],
deps = [
":test_lib",
"//tools/testing:node",
"//tools/testing:node_es5",
],
)

Expand Down
3 changes: 2 additions & 1 deletion packages/common/upgrade/test/BUILD.bazel
View file
Expand Up @@ -16,9 +16,10 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"],
deps = [
":test_lib",
"//tools/testing:node",
"//tools/testing:node_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel
View file
Expand Up @@ -21,12 +21,13 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"],
deps = [
":test_lib",
"//packages/platform-server",
"//packages/platform-server/testing",
"//packages/private/testing",
"//tools/testing:node",
"//tools/testing:node_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel
View file
Expand Up @@ -22,12 +22,13 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_es5"],
tags = [
"ivy-only",
],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_es5))"],
deps = [
":test_lib",
"//tools/testing:node",
"//tools/testing:node_es5",
],
)
6 changes: 4 additions & 2 deletions packages/compiler-cli/ngcc/test/BUILD.bazel
View file
Expand Up @@ -33,12 +33,13 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
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",
],
)

Expand All @@ -63,7 +64,6 @@ ts_library(
jasmine_node_test(
name = "integration",
timeout = "long",
bootstrap = ["//tools/testing:node_no_angular_es5"],
data = [
"//packages/common:npm_package",
"//packages/core:npm_package",
Expand All @@ -74,8 +74,10 @@ 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",
"@npm//canonical-path",
"@npm//convert-source-map",
],
Expand Down
3 changes: 2 additions & 1 deletion packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel
View file
Expand Up @@ -29,8 +29,9 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"],
deps = [
":test_lib",
"//tools/testing:node_no_angular_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/src/ngtsc/cycles/test/BUILD.bazel
View file
Expand Up @@ -21,8 +21,9 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"],
deps = [
":test_lib",
"//tools/testing:node_no_angular_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/src/ngtsc/entry_point/test/BUILD.bazel
View file
Expand Up @@ -19,8 +19,9 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"],
deps = [
":test_lib",
"//tools/testing:node_no_angular_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/src/ngtsc/file_system/test/BUILD.bazel
View file
Expand Up @@ -18,8 +18,9 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"],
deps = [
":test_lib",
"//tools/testing:node_no_angular_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/src/ngtsc/imports/test/BUILD.bazel
View file
Expand Up @@ -22,8 +22,9 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"],
deps = [
":test_lib",
"//tools/testing:node_no_angular_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/src/ngtsc/indexer/test/BUILD.bazel
View file
Expand Up @@ -23,8 +23,9 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"],
deps = [
":test_lib",
"//tools/testing:node_no_angular_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/src/ngtsc/partial_evaluator/test/BUILD.bazel
View file
Expand Up @@ -24,8 +24,9 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"],
deps = [
":test_lib",
"//tools/testing:node_no_angular_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/src/ngtsc/reflection/test/BUILD.bazel
View file
Expand Up @@ -20,8 +20,9 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"],
deps = [
":test_lib",
"//tools/testing:node_no_angular_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/src/ngtsc/scope/test/BUILD.bazel
View file
Expand Up @@ -24,8 +24,9 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"],
deps = [
":test_lib",
"//tools/testing:node_no_angular_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/src/ngtsc/shims/test/BUILD.bazel
View file
Expand Up @@ -17,8 +17,9 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"],
deps = [
":test_lib",
"//tools/testing:node_no_angular_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel
View file
Expand Up @@ -24,8 +24,9 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"],
deps = [
":test_lib",
"//tools/testing:node_no_angular_es5",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel
View file
Expand Up @@ -20,8 +20,9 @@ ts_library(

jasmine_node_test(
name = "test",
bootstrap = ["//tools/testing:node_no_angular_es5"],
templated_args = ["--node_options=--require=$(rlocation $(location //tools/testing:node_no_angular_es5))"],
deps = [
":test_lib",
"//tools/testing:node_no_angular_es5",
],
)
12 changes: 8 additions & 4 deletions packages/compiler-cli/test/BUILD.bazel
View file
Expand Up @@ -40,7 +40,6 @@ ts_library(

jasmine_node_test(
name = "extract_i18n",
bootstrap = ["//tools/testing:node_es5"],
data = [
"//packages/core:npm_package",
],
Expand All @@ -49,11 +48,13 @@ 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",
],
)
Expand All @@ -76,7 +77,6 @@ ts_library(
jasmine_node_test(
name = "ngc",
timeout = "long", # 900 seconds
bootstrap = ["//tools/testing:node_es5"],
data = [
"//packages/common:npm_package",
"//packages/core:npm_package",
Expand All @@ -88,10 +88,12 @@ 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",
Expand All @@ -116,14 +118,15 @@ ts_library(

jasmine_node_test(
name = "perform_watch",
bootstrap = ["//tools/testing:node_es5"],
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",
],
)

Expand All @@ -143,13 +146,14 @@ ts_library(

jasmine_node_test(
name = "perform_compile",
bootstrap = ["//tools/testing:node_es5"],
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",
],
)
3 changes: 2 additions & 1 deletion packages/compiler-cli/test/compliance/BUILD.bazel
View file
Expand Up @@ -18,15 +18,16 @@ ts_library(

jasmine_node_test(
name = "compliance",
bootstrap = ["//tools/testing:node_no_angular_es5"],
data = [
"//packages/compiler-cli/test/ngtsc/fake_core:npm_package",
],
shard_count = 4,
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",
],
)

0 comments on commit 38750e3

Please sign in to comment.