Skip to content

Commit 2e2d7c6

Browse files
committed
WIP: move e2e testing utils under cdk/testing
1 parent 184ee37 commit 2e2d7c6

File tree

46 files changed

+108
-106
lines changed

Some content is hidden

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

46 files changed

+108
-106
lines changed

src/cdk-experimental/scrolling/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ ng_web_test_suite(
3333
ts_library(
3434
name = "e2e_test_sources",
3535
srcs = glob(["**/*.e2e.spec.ts"]),
36-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
36+
tsconfig = "//src/cdk/testing:e2e/tsconfig-tests.json",
3737
deps = [
3838
"@npm//@types/jasmine",
3939
"@npm//@types/selenium-webdriver",
4040
"@npm//protractor",
41-
"//src/e2e-app:e2e_utils_lib",
41+
"//src/cdk/testing:e2e",
4242
]
4343
)
4444

@@ -51,7 +51,7 @@ protractor_web_test_suite(
5151
deps = [
5252
"@npm//protractor",
5353
":e2e_test_sources",
54-
"//src/e2e-app:e2e_utils_lib",
54+
"//src/cdk/testing:e2e",
5555
],
5656
data = [
5757
"@npm//@angular/bazel",

src/cdk/overlay/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ ng_web_test_suite(
5959
ts_library(
6060
name = "e2e_test_sources",
6161
srcs = glob(["**/*.e2e.spec.ts"]),
62-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
62+
tsconfig = "//src/cdk/testing:e2e/tsconfig-tests.json",
6363
deps = [
6464
"@npm//@types/jasmine",
6565
"@npm//@types/selenium-webdriver",
6666
"@npm//protractor",
67-
"//src/e2e-app:e2e_utils_lib",
67+
"//src/cdk/testing:e2e",
6868
]
6969
)
7070

@@ -77,7 +77,7 @@ protractor_web_test_suite(
7777
deps = [
7878
"@npm//protractor",
7979
":e2e_test_sources",
80-
"//src/e2e-app:e2e_utils_lib",
80+
"//src/cdk/testing:e2e",
8181
],
8282
data = [
8383
"@npm//@angular/bazel",

src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {browser, Key, element, by} from 'protractor';
2-
import {getScrollPosition} from '../../../e2e-app/test-util';
2+
import {getScrollPosition} from '../../testing/e2e';
33

44

55
describe('scroll blocking', () => {

src/cdk/testing/BUILD.bazel

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,23 @@ package(default_visibility=["//visibility:public"])
22

33
load("//tools:defaults.bzl", "ng_module")
44

5+
exports_files = ["e2e/tsconfig-tests.json"]
6+
57
ng_module(
68
name = "testing",
7-
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
9+
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts", "e2e/**"]),
810
module_name = "@angular/cdk/testing",
911
deps = [
1012
"@npm//@angular/core",
1113
],
1214
)
15+
16+
ng_module(
17+
name = "e2e",
18+
srcs = glob(["e2e/**/*.ts"], exclude=["e2e/**/*.spec.ts"]),
19+
tsconfig = "e2e/tsconfig-tests.json",
20+
module_name = "@angular/cdk/testing/e2e",
21+
deps = [
22+
"@npm//@angular/core",
23+
],
24+
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/e2e-app/BUILD.bazel

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ load("//:packages.bzl", "ANGULAR_LIBRARY_UMDS")
77

88
exports_files(["protractor.conf.js", "start-devserver.js", "tsconfig-e2e.json"])
99

10-
ts_library(
11-
name = "e2e_utils_lib",
12-
srcs = glob(["test-util/**/*.ts"]),
13-
tsconfig = ":tsconfig-e2e.json",
14-
deps = [
15-
"@npm//@types/jasmine",
16-
"@npm//protractor"
17-
]
18-
)
19-
2010
ng_module(
2111
name = "e2e-app",
2212
srcs = glob(["**/*.ts"], exclude = ["test-util/**"]),

0 commit comments

Comments
 (0)