Skip to content

Commit c3444f2

Browse files
committed
build: migrate all ng_e2e_test_library targets to ts_project
Migrates all `ng_e2e_test_library` targets to use `ts_project` directly. This is simpler and more obvious.
1 parent 44487ec commit c3444f2

File tree

7 files changed

+27
-31
lines changed

7 files changed

+27
-31
lines changed

src/cdk-experimental/scrolling/BUILD.bazel

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("//src/e2e-app:test_suite.bzl", "e2e_test_suite")
2-
load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_web_test_suite")
2+
load("//tools:defaults.bzl", "ng_module", "ng_web_test_suite")
33
load("//tools:defaults2.bzl", "ts_project")
44

55
package(default_visibility = ["//visibility:public"])
@@ -41,9 +41,14 @@ ng_web_test_suite(
4141
deps = [":unit_test_sources"],
4242
)
4343

44-
ng_e2e_test_library(
44+
ts_project(
4545
name = "e2e_test_sources",
46+
testonly = True,
4647
srcs = glob(["**/*.e2e.spec.ts"]),
48+
deps = [
49+
"//:node_modules/@types/selenium-webdriver",
50+
"//:node_modules/protractor",
51+
],
4752
)
4853

4954
e2e_test_suite(

src/cdk/overlay/BUILD.bazel

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ load("//src/e2e-app:test_suite.bzl", "e2e_test_suite")
22
load(
33
"//tools:defaults.bzl",
44
"markdown_to_html",
5-
"ng_e2e_test_library",
65
"ng_module",
76
"ng_web_test_suite",
87
"sass_binary",
@@ -88,9 +87,11 @@ ng_web_test_suite(
8887
deps = [":unit_test_sources"],
8988
)
9089

91-
ng_e2e_test_library(
90+
ts_project(
9291
name = "e2e_test_sources",
92+
testonly = True,
9393
srcs = glob(["**/*.e2e.spec.ts"]),
94+
deps = ["//:node_modules/protractor"],
9495
)
9596

9697
e2e_test_suite(

src/cdk/testing/tests/BUILD.bazel

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module")
1+
load("//tools:defaults.bzl", "ng_module")
22
load("//tools:defaults2.bzl", "ts_project")
33

44
package(default_visibility = ["//visibility:public"])
@@ -70,21 +70,25 @@ ts_project(
7070
],
7171
)
7272

73-
ng_e2e_test_library(
73+
ts_project(
7474
name = "e2e_test_sources",
75+
testonly = True,
7576
srcs = glob(
7677
[
7778
"**/*.e2e.spec.ts",
7879
],
7980
exclude = ["webdriver.e2e.spec.ts"],
8081
),
81-
deps = [
82-
":cross_environment_specs",
83-
":test_harnesses",
82+
interop_deps = [
8483
"//src/cdk/testing",
8584
"//src/cdk/testing/private",
8685
"//src/cdk/testing/protractor",
8786
],
87+
deps = [
88+
":cross_environment_specs_rjs",
89+
":test_harnesses_rjs",
90+
"//:node_modules/protractor",
91+
],
8892
)
8993

9094
ts_project(

src/material/slider/BUILD.bazel

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ load(
33
"//tools:defaults.bzl",
44
"extract_tokens",
55
"markdown_to_html",
6-
"ng_e2e_test_library",
76
"ng_module",
87
"ng_web_test_suite",
98
"sass_binary",
@@ -102,12 +101,11 @@ ng_web_test_suite(
102101
],
103102
)
104103

105-
ng_e2e_test_library(
104+
ts_project(
106105
name = "e2e_test_sources",
106+
testonly = True,
107107
srcs = glob(["**/*.e2e.spec.ts"]),
108-
deps = [
109-
":slider",
110-
],
108+
deps = ["//:node_modules/protractor"],
111109
)
112110

113111
e2e_test_suite(

src/material/slider/slider.e2e.spec.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {$, browser, by, element, ElementFinder} from 'protractor';
10-
import {logging} from 'selenium-webdriver';
9+
import {$, browser, by, element, ElementFinder, logging} from 'protractor';
1110

1211
describe('MatSlider', () => {
1312
const getStandardSlider = () => element(by.id('standard-slider'));

src/universal-app/BUILD.bazel

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_TARGETS")
55
load("//src/components-examples:config.bzl", "ALL_EXAMPLES")
66
load("//src/material:config.bzl", "MATERIAL_TARGETS")
77
load("//src/material-experimental:config.bzl", "MATERIAL_EXPERIMENTAL_TARGETS")
8-
load("//tools:defaults.bzl", "devmode_esbuild", "http_server", "ng_e2e_test_library", "ng_module", "protractor_web_test_suite", "sass_binary")
8+
load("//tools:defaults.bzl", "devmode_esbuild", "http_server", "ng_module", "protractor_web_test_suite", "sass_binary")
99
load("//tools/angular:index.bzl", "LINKER_PROCESSED_FW_PACKAGES")
1010
load("//tools:defaults2.bzl", "ts_project")
1111
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
@@ -159,9 +159,11 @@ http_server(
159159
],
160160
)
161161

162-
ng_e2e_test_library(
162+
ts_project(
163163
name = "hydration_e2e_tests_sources",
164+
testonly = True,
164165
srcs = ["hydration.e2e.spec.ts"],
166+
deps = ["//:node_modules/protractor"],
165167
)
166168

167169
protractor_web_test_suite(

tools/defaults.bzl

-13
Original file line numberDiff line numberDiff line change
@@ -236,19 +236,6 @@ def jasmine_node_test(**kwargs):
236236
kwargs["templated_args"] = ["--bazel_patch_module_resolver"] + kwargs.get("templated_args", [])
237237
_jasmine_node_test(**kwargs)
238238

239-
def ng_e2e_test_library(deps = [], **kwargs):
240-
local_deps = [
241-
"@npm//@types/jasmine",
242-
"@npm//@types/selenium-webdriver",
243-
"@npm//protractor",
244-
] + deps
245-
246-
ts_library(
247-
testonly = True,
248-
deps = local_deps,
249-
**kwargs
250-
)
251-
252239
def karma_web_test_suite(name, **kwargs):
253240
test_deps = kwargs.get("deps", [])
254241

0 commit comments

Comments
 (0)