Skip to content

Commit e31d359

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

File tree

47 files changed

+114
-109
lines changed

Some content is hidden

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

47 files changed

+114
-109
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-e2e.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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,13 @@ ng_web_test_suite(
5656
static_css = ["overlay_prebuilt_scss"],
5757
)
5858

59-
ts_library(
59+
ng_test_library(
6060
name = "e2e_test_sources",
6161
srcs = glob(["**/*.e2e.spec.ts"]),
62-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
6362
deps = [
64-
"@npm//@types/jasmine",
6563
"@npm//@types/selenium-webdriver",
6664
"@npm//protractor",
67-
"//src/e2e-app:e2e_utils_lib",
65+
"//src/cdk/testing/e2e",
6866
]
6967
)
7068

@@ -77,7 +75,7 @@ protractor_web_test_suite(
7775
deps = [
7876
"@npm//protractor",
7977
":e2e_test_sources",
80-
"//src/e2e-app:e2e_utils_lib",
78+
"//src/cdk/testing/e2e",
8179
],
8280
data = [
8381
"@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 '@angular/cdk/testing/e2e';
33

44

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

src/cdk/testing/e2e/BUILD.bazel

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package(default_visibility=["//visibility:public"])
2+
3+
load("//tools:defaults.bzl", "ts_library")
4+
5+
exports_files(["tsconfig-e2e.json"])
6+
7+
ts_library(
8+
name = "e2e",
9+
srcs = glob(["test-util/**/*.ts"]),
10+
module_name = "@angular/cdk/testing/e2e",
11+
deps = [
12+
"@npm//@types/jasmine",
13+
"@npm//protractor"
14+
]
15+
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/cdk/tsconfig-tests.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
},
1616
"files": [
1717
"./testing/index.ts",
18+
"./testing/e2e/index.ts",
1819
"typings.d.ts"
1920
],
2021
"angularCompilerOptions": {
@@ -31,7 +32,8 @@
3132
"include": [
3233
// Include the index.ts for each secondary entry-point
3334
"./*/index.ts",
34-
"**/*.spec.ts"
35+
"**/*.spec.ts",
36+
"./testing/e2e/index.ts"
3537
],
3638
"exclude": [
3739
"**/schematics/**/*.ts"

0 commit comments

Comments
 (0)