Skip to content

Commit f201df9

Browse files
josephperrottpkozlowski-opensource
josephperrott
authored and
pkozlowski-opensource
committed
build: migrate to using new jasmine_test (#62106)
Use the new jasmine_test based on rules_js instead of jasmine_node_test from rules_nodejs PR Close #62106
1 parent b40613f commit f201df9

120 files changed

Lines changed: 870 additions & 1179 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/animations/browser/test/BUILD.bazel‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "karma_web_test_suite")
2+
load("//tools:defaults2.bzl", "angular_jasmine_test", "ts_project")
33

44
ts_project(
55
name = "test_lib",
@@ -18,11 +18,10 @@ ts_project(
1818
],
1919
)
2020

21-
jasmine_node_test(
21+
angular_jasmine_test(
2222
name = "test",
23-
bootstrap = ["//tools/testing:node"],
24-
deps = [
25-
":test_lib",
23+
data = [
24+
":test_lib_rjs",
2625
],
2726
)
2827

‎packages/animations/test/BUILD.bazel‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "karma_web_test_suite")
2+
load("//tools:defaults2.bzl", "angular_jasmine_test", "ts_project")
33

44
ts_project(
55
name = "test_lib",
@@ -24,11 +24,10 @@ ts_project(
2424
],
2525
)
2626

27-
jasmine_node_test(
27+
angular_jasmine_test(
2828
name = "test",
29-
bootstrap = ["//tools/testing:node"],
30-
deps = [
31-
":test_lib",
29+
data = [
30+
":test_lib_rjs",
3231
],
3332
)
3433

‎packages/benchpress/test/BUILD.bazel‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults2.bzl", "angular_jasmine_test", "ts_project")
32

43
ts_project(
54
name = "test_lib",
@@ -16,13 +15,12 @@ ts_project(
1615
],
1716
)
1817

19-
jasmine_node_test(
18+
angular_jasmine_test(
2019
name = "test",
21-
bootstrap = ["//tools/testing:node"],
22-
deps = [
23-
":test_lib",
24-
"//packages/benchpress",
25-
"//packages/core/testing",
26-
"@npm//protractor",
20+
data = [
21+
":test_lib_rjs",
22+
"//:node_modules/protractor",
23+
"//packages/benchpress:benchpress_rjs",
24+
"//packages/core/testing:testing_rjs",
2725
],
2826
)

‎packages/common/http/test/BUILD.bazel‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "karma_web_test_suite")
2+
load("//tools:defaults2.bzl", "angular_jasmine_test", "ts_project")
33

44
ts_project(
55
name = "test_lib",
@@ -23,13 +23,12 @@ ts_project(
2323
],
2424
)
2525

26-
jasmine_node_test(
26+
angular_jasmine_test(
2727
name = "test",
28-
bootstrap = ["//tools/testing:node"],
29-
flaky = True, # TODO: figure out why one of the transferCache tests is flaky
30-
deps = [
31-
":test_lib",
28+
data = [
29+
":test_lib_rjs",
3230
],
31+
flaky = True, # TODO: figure out why one of the transferCache tests is flaky
3332
)
3433

3534
karma_web_test_suite(

‎packages/common/http/testing/test/BUILD.bazel‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "karma_web_test_suite")
2+
load("//tools:defaults2.bzl", "angular_jasmine_test", "ts_project")
33

44
ts_project(
55
name = "test_lib",
@@ -16,11 +16,10 @@ ts_project(
1616
],
1717
)
1818

19-
jasmine_node_test(
19+
angular_jasmine_test(
2020
name = "test",
21-
bootstrap = ["//tools/testing:node"],
22-
deps = [
23-
":test_lib",
21+
data = [
22+
":test_lib_rjs",
2423
],
2524
)
2625

‎packages/common/test/BUILD.bazel‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "karma_web_test_suite")
2+
load("//tools:defaults2.bzl", "angular_jasmine_test", "ts_project")
33

44
ts_project(
55
name = "test_lib",
@@ -24,11 +24,10 @@ ts_project(
2424
],
2525
)
2626

27-
jasmine_node_test(
27+
angular_jasmine_test(
2828
name = "test",
29-
bootstrap = ["//tools/testing:node"],
30-
deps = [
31-
":test_lib",
29+
data = [
30+
":test_lib_rjs",
3231
],
3332
)
3433

‎packages/common/upgrade/test/BUILD.bazel‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults2.bzl", "angular_jasmine_test", "ts_project")
32

43
ts_project(
54
name = "test_lib",
@@ -17,10 +16,9 @@ ts_project(
1716
],
1817
)
1918

20-
jasmine_node_test(
19+
angular_jasmine_test(
2120
name = "test",
22-
bootstrap = ["//tools/testing:node"],
23-
deps = [
24-
":test_lib",
21+
data = [
22+
":test_lib_rjs",
2523
],
2624
)

‎packages/compiler-cli/linker/BUILD.bazel‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ ts_project(
77
srcs = ["index.ts"] + glob([
88
"src/**/*.ts",
99
]),
10-
interop_deps = [
11-
"//packages/compiler",
12-
"//packages/compiler-cli/src/ngtsc/file_system",
13-
"//packages/compiler-cli/src/ngtsc/logging",
14-
"//packages/compiler-cli/src/ngtsc/sourcemaps",
15-
"//packages/compiler-cli/src/ngtsc/translator",
16-
],
1710
deps = [
1811
"//:node_modules/@types/semver",
1912
"//:node_modules/semver",
2013
"//:node_modules/typescript",
14+
"//packages/compiler",
15+
"//packages/compiler-cli/src/ngtsc/file_system:file_system_rjs",
16+
"//packages/compiler-cli/src/ngtsc/logging:logging_rjs",
17+
"//packages/compiler-cli/src/ngtsc/sourcemaps:sourcemaps_rjs",
18+
"//packages/compiler-cli/src/ngtsc/translator:translator_rjs",
2119
],
2220
)

‎packages/compiler-cli/linker/babel/test/BUILD.bazel‎

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
load("@npm2//:defs.bzl", "npm_link_all_packages")
2-
load("//tools:defaults.bzl", "jasmine_node_test")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
43

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

@@ -12,38 +11,26 @@ ts_project(
1211
srcs = glob([
1312
"**/*.ts",
1413
]),
15-
interop_deps = [
16-
"//packages:types",
17-
"//packages/compiler",
18-
"//packages/compiler-cli/linker",
19-
"//packages/compiler-cli/linker/babel",
20-
"//packages/compiler-cli/private",
21-
"//packages/compiler-cli/src/ngtsc/file_system/testing",
22-
"//packages/compiler-cli/src/ngtsc/logging/testing",
23-
"//packages/compiler-cli/src/ngtsc/translator",
24-
],
2514
deps = [
2615
"//:node_modules/@babel/generator",
2716
"//:node_modules/@types/babel__core",
2817
"//:node_modules/@types/babel__generator",
18+
"//packages:types_rjs",
19+
"//packages/compiler:compiler_rjs",
20+
"//packages/compiler-cli/linker:linker_rjs",
21+
"//packages/compiler-cli/linker/babel:babel_rjs",
22+
"//packages/compiler-cli/private:private_rjs",
23+
"//packages/compiler-cli/src/ngtsc/file_system/testing:testing_rjs",
24+
"//packages/compiler-cli/src/ngtsc/logging/testing:testing_rjs",
25+
"//packages/compiler-cli/src/ngtsc/translator:translator_rjs",
2926
],
3027
)
3128

32-
jasmine_node_test(
29+
jasmine_test(
3330
name = "test",
34-
bootstrap = ["//tools/testing:node_no_angular"],
3531
data = [
3632
# Needed for testing the Babel plugin loaded from `node_modules`.
3733
":node_modules/@angular/compiler-cli",
38-
# TODO(rules_js migration): Remove these deps below when using `jasmine_test` that
39-
# can properly resolve transitive symlinked deps.
40-
":node_modules/@angular/compiler",
41-
"//:node_modules/@jridgewell/sourcemap-codec",
42-
"//:node_modules/convert-source-map",
43-
"//:node_modules/@babel/core",
44-
"//:node_modules/semver",
45-
],
46-
deps = [
47-
":test_lib",
34+
":test_lib_rjs",
4835
],
4936
)

‎packages/compiler-cli/linker/test/BUILD.bazel‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
32

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

@@ -9,26 +8,23 @@ ts_project(
98
srcs = glob([
109
"**/*.ts",
1110
]),
12-
interop_deps = [
13-
"//packages:types",
14-
"//packages/compiler",
15-
"//packages/compiler-cli/linker",
16-
"//packages/compiler-cli/src/ngtsc/file_system",
17-
"//packages/compiler-cli/src/ngtsc/file_system/testing",
18-
"//packages/compiler-cli/src/ngtsc/logging/testing",
19-
"//packages/compiler-cli/src/ngtsc/translator",
20-
],
2111
deps = [
2212
"//:node_modules/@types/semver",
2313
"//:node_modules/semver",
2414
"//:node_modules/typescript",
15+
"//packages:types_rjs",
16+
"//packages/compiler:compiler_rjs",
17+
"//packages/compiler-cli/linker:linker_rjs",
18+
"//packages/compiler-cli/src/ngtsc/file_system:file_system_rjs",
19+
"//packages/compiler-cli/src/ngtsc/file_system/testing:testing_rjs",
20+
"//packages/compiler-cli/src/ngtsc/logging/testing:testing_rjs",
21+
"//packages/compiler-cli/src/ngtsc/translator:translator_rjs",
2522
],
2623
)
2724

28-
jasmine_node_test(
25+
jasmine_test(
2926
name = "test",
30-
bootstrap = ["//tools/testing:node_no_angular"],
31-
deps = [
32-
":test_lib",
27+
data = [
28+
":test_lib_rjs",
3329
],
3430
)

0 commit comments

Comments
 (0)