Skip to content

Commit b848590

Browse files
josephperrottthePunderWoman
josephperrott
authored and
thePunderWoman
committed
build: migrate to use web test runner rules (angular#62292)
Migrate karma tests throughout the repo to use the new web test runner based rule instead PR Close angular#62292
1 parent ec01599 commit b848590

File tree

99 files changed

+737
-817
lines changed

Some content is hidden

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

99 files changed

+737
-817
lines changed

‎.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
adev/shared-docs/pipeline/api-gen/package.json=939673974
77
integration/package.json=-239561259
88
modules/package.json=-1392648745
9-
package.json=733982855
9+
package.json=-35082582
1010
packages/animations/package.json=-678724831
1111
packages/common/package.json=1729763064
1212
packages/compiler-cli/linker/babel/test/package.json=939673974
@@ -21,7 +21,7 @@ packages/platform-browser/package.json=-1163479450
2121
packages/router/package.json=860819913
2222
packages/upgrade/package.json=16347051
2323
packages/zone.js/package.json=-1005735564
24-
pnpm-lock.yaml=-950354694
24+
pnpm-lock.yaml=1609578408
2525
pnpm-workspace.yaml=1973735808
2626
tools/bazel/rules_angular_store/package.json=-239561259
27-
yarn.lock=2135817263
27+
yarn.lock=-1849504213

‎BUILD.bazel‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
12
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
23
load("@npm2//:defs.bzl", "npm_link_all_packages")
34
load("//:yarn.bzl", "YARN_PATH")
@@ -41,23 +42,19 @@ js_library(
4142
],
4243
)
4344

44-
filegroup(
45+
copy_to_bin(
4546
name = "angularjs_scripts",
4647
srcs = [
4748
# We also declare the unminified AngularJS files since these can be used for
4849
# local debugging (e.g. see: packages/upgrade/test/common/test_helpers.ts)
49-
"@npm//:node_modules/angular-1.5/angular.js",
50-
"@npm//:node_modules/angular-1.5/angular.min.js",
51-
"@npm//:node_modules/angular-1.6/angular.js",
52-
"@npm//:node_modules/angular-1.6/angular.min.js",
53-
"@npm//:node_modules/angular-1.7/angular.js",
54-
"@npm//:node_modules/angular-1.7/angular.min.js",
55-
"@npm//:node_modules/angular-mocks-1.5/angular-mocks.js",
56-
"@npm//:node_modules/angular-mocks-1.6/angular-mocks.js",
57-
"@npm//:node_modules/angular-mocks-1.7/angular-mocks.js",
58-
"@npm//:node_modules/angular-mocks-1.8/angular-mocks.js",
59-
"@npm//:node_modules/angular-1.8/angular.js",
60-
"@npm//:node_modules/angular-1.8/angular.min.js",
50+
"//:node_modules/angular-1.5",
51+
"//:node_modules/angular-1.6",
52+
"//:node_modules/angular-1.7",
53+
"//:node_modules/angular-mocks-1.5",
54+
"//:node_modules/angular-mocks-1.6",
55+
"//:node_modules/angular-mocks-1.7",
56+
"//:node_modules/angular-mocks-1.8",
57+
"//:node_modules/angular-1.8",
6158
],
6259
)
6360

‎adev/shared-docs/components/BUILD.bazel‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ ts_project(
77
srcs = [
88
"index.ts",
99
],
10-
interop_deps = [
11-
"//adev/shared-docs/components/algolia-icon",
12-
"//adev/shared-docs/components/breadcrumb",
13-
"//adev/shared-docs/components/cookie-popup",
14-
"//adev/shared-docs/components/copy-source-code-button",
15-
"//adev/shared-docs/components/icon",
16-
"//adev/shared-docs/components/navigation-list",
17-
"//adev/shared-docs/components/search-dialog",
18-
"//adev/shared-docs/components/select",
19-
"//adev/shared-docs/components/slide-toggle",
20-
"//adev/shared-docs/components/table-of-contents",
21-
"//adev/shared-docs/components/text-field",
22-
"//adev/shared-docs/components/top-level-banner",
23-
"//adev/shared-docs/components/viewers",
24-
],
2510
visibility = [
2611
"//adev/shared-docs:__pkg__",
2712
],
13+
deps = [
14+
"//adev/shared-docs/components/algolia-icon:algolia-icon_rjs",
15+
"//adev/shared-docs/components/breadcrumb:breadcrumb_rjs",
16+
"//adev/shared-docs/components/cookie-popup:cookie-popup_rjs",
17+
"//adev/shared-docs/components/copy-source-code-button:copy-source-code-button_rjs",
18+
"//adev/shared-docs/components/icon:icon_rjs",
19+
"//adev/shared-docs/components/navigation-list:navigation-list_rjs",
20+
"//adev/shared-docs/components/search-dialog:search-dialog_rjs",
21+
"//adev/shared-docs/components/select:select_rjs",
22+
"//adev/shared-docs/components/slide-toggle:slide-toggle_rjs",
23+
"//adev/shared-docs/components/table-of-contents:table-of-contents_rjs",
24+
"//adev/shared-docs/components/text-field:text-field_rjs",
25+
"//adev/shared-docs/components/top-level-banner:top-level-banner_rjs",
26+
"//adev/shared-docs/components/viewers:viewers_rjs",
27+
],
2828
)

‎adev/shared-docs/components/algolia-icon/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ ng_project(
1010
assets = [
1111
"algolia-icon.component.html",
1212
],
13-
interop_deps = [
14-
"//packages/core",
15-
],
1613
visibility = [
1714
"//adev/shared-docs/components:__pkg__",
1815
"//adev/shared-docs/components/search-dialog:__pkg__",
1916
],
17+
deps = [
18+
"//packages/core:core_rjs",
19+
],
2020
)

‎adev/shared-docs/components/breadcrumb/BUILD.bazel‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
22
load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project")
3-
load("//tools:defaults.bzl", "karma_web_test_suite")
3+
load("//tools:defaults2.bzl", "ng_web_test_suite")
44

55
package(default_visibility = ["//visibility:private"])
66

@@ -13,18 +13,16 @@ ng_project(
1313
":breadcrumb.component.css",
1414
"breadcrumb.component.html",
1515
],
16-
interop_deps = [
17-
"//packages/common",
18-
"//packages/core",
19-
"//packages/router",
20-
],
2116
visibility = [
2217
"//adev/shared-docs/components:__pkg__",
2318
"//adev/shared-docs/components/viewers:__pkg__",
2419
],
2520
deps = [
2621
"//adev/shared-docs/interfaces:interfaces_rjs",
2722
"//adev/shared-docs/services:services_rjs",
23+
"//packages/common:common_rjs",
24+
"//packages/core:core_rjs",
25+
"//packages/router:router_rjs",
2826
],
2927
)
3028

@@ -39,19 +37,19 @@ ts_project(
3937
srcs = glob(
4038
["*.spec.ts"],
4139
),
42-
interop_deps = [
43-
":breadcrumb",
44-
"//adev/shared-docs/interfaces",
45-
"//adev/shared-docs/services",
46-
"//packages/core",
47-
"//packages/core/testing",
48-
"//packages/platform-browser",
49-
"//packages/router",
50-
"//packages/router/testing",
40+
deps = [
41+
":breadcrumb_rjs",
42+
"//adev/shared-docs/interfaces:interfaces_rjs",
43+
"//adev/shared-docs/services:services_rjs",
44+
"//packages/core:core_rjs",
45+
"//packages/core/testing:testing_rjs",
46+
"//packages/platform-browser:platform-browser_rjs",
47+
"//packages/router:router_rjs",
48+
"//packages/router/testing:testing_rjs",
5149
],
5250
)
5351

54-
karma_web_test_suite(
52+
ng_web_test_suite(
5553
name = "test",
56-
deps = [":test_lib"],
54+
deps = [":test_lib_rjs"],
5755
)

‎adev/shared-docs/components/cookie-popup/BUILD.bazel‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
22
load("//adev/shared-docs:defaults.bzl", "ng_project", "ts_project")
3-
load("//tools:defaults.bzl", "karma_web_test_suite")
3+
load("//tools:defaults2.bzl", "ng_web_test_suite")
44

55
package(default_visibility = ["//visibility:private"])
66

@@ -13,16 +13,14 @@ ng_project(
1313
":cookie-popup.component.css",
1414
"cookie-popup.component.html",
1515
],
16-
interop_deps = [
17-
"//packages/common",
18-
"//packages/core",
19-
],
2016
visibility = [
2117
"//adev/shared-docs/components:__pkg__",
2218
],
2319
deps = [
2420
"//adev/shared-docs/providers:providers_rjs",
2521
"//adev/shared-docs/utils:utils_rjs",
22+
"//packages/common:common_rjs",
23+
"//packages/core:core_rjs",
2624
],
2725
)
2826

@@ -37,16 +35,16 @@ ts_project(
3735
srcs = glob(
3836
["*.spec.ts"],
3937
),
40-
interop_deps = [
41-
":cookie-popup",
42-
"//adev/shared-docs/providers",
43-
"//adev/shared-docs/testing",
44-
"//packages/core",
45-
"//packages/core/testing",
38+
deps = [
39+
":cookie-popup_rjs",
40+
"//adev/shared-docs/providers:providers_rjs",
41+
"//adev/shared-docs/testing:testing_rjs",
42+
"//packages/core:core_rjs",
43+
"//packages/core/testing:testing_rjs",
4644
],
4745
)
4846

49-
karma_web_test_suite(
47+
ng_web_test_suite(
5048
name = "test",
51-
deps = [":test_lib"],
49+
deps = [":test_lib_rjs"],
5250
)

‎adev/shared-docs/components/copy-source-code-button/BUILD.bazel‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,15 @@ ng_project(
1111
assets = [
1212
"copy-source-code-button.component.html",
1313
],
14-
interop_deps = [
15-
"//packages/common",
16-
"//packages/core",
17-
],
1814
visibility = [
1915
"//adev/shared-docs/components:__pkg__",
2016
"//adev/shared-docs/components/viewers:__pkg__",
2117
],
2218
deps = [
2319
"//:node_modules/@angular/cdk",
2420
"//adev/shared-docs/components/icon:icon_rjs",
21+
"//packages/common:common_rjs",
22+
"//packages/core:core_rjs",
2523
],
2624
)
2725

@@ -31,14 +29,12 @@ ts_project(
3129
srcs = glob(
3230
["*.spec.ts"],
3331
),
34-
interop_deps = [
35-
":copy-source-code-button",
36-
"//packages/core",
37-
"//packages/core/testing",
38-
"//packages/platform-browser",
39-
],
4032
deps = [
33+
":copy-source-code-button_rjs",
4134
"//:node_modules/@angular/cdk",
35+
"//packages/core:core_rjs",
36+
"//packages/core/testing:testing_rjs",
37+
"//packages/platform-browser:platform-browser_rjs",
4238
],
4339
)
4440

‎adev/shared-docs/components/icon/BUILD.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ ng_project(
1111
assets = [
1212
":icon.component.css",
1313
],
14-
interop_deps = [
15-
"//packages/common",
16-
"//packages/core",
17-
],
1814
visibility = [
1915
"//adev/shared-docs/components:__pkg__",
2016
"//adev/shared-docs/components/copy-source-code-button:__pkg__",
@@ -24,6 +20,10 @@ ng_project(
2420
"//adev/shared-docs/components/top-level-banner:__pkg__",
2521
"//adev/shared-docs/components/viewers:__pkg__",
2622
],
23+
deps = [
24+
"//packages/common:common_rjs",
25+
"//packages/core:core_rjs",
26+
],
2727
)
2828

2929
sass_binary(

‎adev/shared-docs/components/navigation-list/BUILD.bazel‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ ng_project(
1313
":navigation-list.component.css",
1414
"navigation-list.component.html",
1515
],
16-
interop_deps = [
17-
"//packages/common",
18-
"//packages/core",
19-
"//packages/router",
20-
],
2116
visibility = [
2217
"//adev/shared-docs/components:__pkg__",
2318
],
@@ -27,6 +22,9 @@ ng_project(
2722
"//adev/shared-docs/interfaces:interfaces_rjs",
2823
"//adev/shared-docs/pipes:pipes_rjs",
2924
"//adev/shared-docs/services:services_rjs",
25+
"//packages/common:common_rjs",
26+
"//packages/core:core_rjs",
27+
"//packages/router:router_rjs",
3028
],
3129
)
3230

@@ -44,15 +42,15 @@ ts_project(
4442
srcs = glob(
4543
["*.spec.ts"],
4644
),
47-
interop_deps = [
48-
":navigation-list",
49-
"//adev/shared-docs/interfaces",
50-
"//adev/shared-docs/services",
51-
"//packages/core",
52-
"//packages/core/testing",
53-
"//packages/platform-browser",
54-
"//packages/router",
55-
"//packages/router/testing",
45+
deps = [
46+
":navigation-list_rjs",
47+
"//adev/shared-docs/interfaces:interfaces_rjs",
48+
"//adev/shared-docs/services:services_rjs",
49+
"//packages/core:core_rjs",
50+
"//packages/core/testing:testing_rjs",
51+
"//packages/platform-browser:platform-browser_rjs",
52+
"//packages/router:router_rjs",
53+
"//packages/router/testing:testing_rjs",
5654
],
5755
)
5856

‎adev/shared-docs/components/search-dialog/BUILD.bazel‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ ng_project(
1313
":search-dialog.component.css",
1414
"search-dialog.component.html",
1515
],
16-
interop_deps = [
17-
"//packages/common",
18-
"//packages/core",
19-
"//packages/forms",
20-
"//packages/router",
21-
],
2216
visibility = [
2317
"//adev/shared-docs/components:__pkg__",
2418
],
@@ -32,6 +26,10 @@ ng_project(
3226
"//adev/shared-docs/interfaces:interfaces_rjs",
3327
"//adev/shared-docs/pipes:pipes_rjs",
3428
"//adev/shared-docs/services:services_rjs",
29+
"//packages/common:common_rjs",
30+
"//packages/core:core_rjs",
31+
"//packages/forms:forms_rjs",
32+
"//packages/router:router_rjs",
3533
],
3634
)
3735

@@ -46,18 +44,18 @@ ts_project(
4644
srcs = glob(
4745
["*.spec.ts"],
4846
),
49-
interop_deps = [
50-
":search-dialog",
51-
"//adev/shared-docs/components/algolia-icon",
52-
"//adev/shared-docs/interfaces",
53-
"//adev/shared-docs/providers",
54-
"//adev/shared-docs/services",
55-
"//adev/shared-docs/testing",
56-
"//packages/core",
57-
"//packages/core/testing",
58-
"//packages/platform-browser",
59-
"//packages/router",
60-
"//packages/router/testing",
47+
deps = [
48+
":search-dialog_rjs",
49+
"//adev/shared-docs/components/algolia-icon:algolia-icon_rjs",
50+
"//adev/shared-docs/interfaces:interfaces_rjs",
51+
"//adev/shared-docs/providers:providers_rjs",
52+
"//adev/shared-docs/services:services_rjs",
53+
"//adev/shared-docs/testing:testing_rjs",
54+
"//packages/core:core_rjs",
55+
"//packages/core/testing:testing_rjs",
56+
"//packages/platform-browser:platform-browser_rjs",
57+
"//packages/router:router_rjs",
58+
"//packages/router/testing:testing_rjs",
6159
],
6260
)
6361

0 commit comments

Comments
 (0)