Skip to content

Commit e31d359

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

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+
)

‎src/e2e-app/test-util/actions.ts renamed to ‎src/cdk/testing/e2e/actions.ts

File renamed without changes.

‎src/e2e-app/test-util/asserts.ts renamed to ‎src/cdk/testing/e2e/asserts.ts

File renamed without changes.

‎src/e2e-app/test-util/index.ts renamed to ‎src/cdk/testing/e2e/index.ts

File renamed without changes.

‎src/e2e-app/test-util/query.ts renamed to ‎src/cdk/testing/e2e/query.ts

File renamed without changes.

‎src/e2e-app/tsconfig-e2e.json renamed to ‎src/cdk/testing/e2e/tsconfig-e2e.json

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"

‎src/e2e-app/BUILD.bazel

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,7 @@ load("@npm_bazel_typescript//:defs.bzl", "ts_devserver", "ts_library")
55
load("//tools:defaults.bzl", "ng_module")
66
load("//:packages.bzl", "ANGULAR_LIBRARY_UMDS")
77

8-
exports_files(["protractor.conf.js", "start-devserver.js", "tsconfig-e2e.json"])
9-
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-
)
8+
exports_files(["protractor.conf.js", "start-devserver.js"])
199

2010
ng_module(
2111
name = "e2e-app",

‎src/material-experimental/mdc-button/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ sass_binary(
6969
ts_library(
7070
name = "e2e_test_sources",
7171
srcs = glob(["**/*.e2e.spec.ts"]),
72-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
72+
tsconfig = "//src/cdk/testing/e2e:tsconfig-e2e.json",
7373
deps = [
7474
"@npm//@types/jasmine",
7575
"@npm//@types/selenium-webdriver",
7676
"@npm//protractor",
77-
"//src/e2e-app:e2e_utils_lib",
77+
"//src/cdk/testing/e2e",
7878
]
7979
)
8080

@@ -87,7 +87,7 @@ protractor_web_test_suite(
8787
deps = [
8888
"@npm//protractor",
8989
":e2e_test_sources",
90-
"//src/e2e-app:e2e_utils_lib",
90+
"//src/cdk/testing/e2e",
9191
],
9292
data = [
9393
"@npm//@angular/bazel",

‎src/material-experimental/mdc-card/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ sass_binary(
3232
ts_library(
3333
name = "e2e_test_sources",
3434
srcs = glob(["**/*.e2e.spec.ts"]),
35-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
35+
tsconfig = "//src/cdk/testing/e2e:tsconfig-e2e.json",
3636
deps = [
3737
"@npm//@types/jasmine",
3838
"@npm//@types/selenium-webdriver",
3939
"@npm//protractor",
40-
"//src/e2e-app:e2e_utils_lib",
40+
"//src/cdk/testing/e2e",
4141
]
4242
)
4343

@@ -50,7 +50,7 @@ protractor_web_test_suite(
5050
deps = [
5151
"@npm//protractor",
5252
":e2e_test_sources",
53-
"//src/e2e-app:e2e_utils_lib",
53+
"//src/cdk/testing/e2e",
5454
],
5555
data = [
5656
"@npm//@angular/bazel",

‎src/material-experimental/mdc-checkbox/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ ng_web_test_suite(
6868
ts_library(
6969
name = "e2e_test_sources",
7070
srcs = glob(["**/*.e2e.spec.ts"]),
71-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
71+
tsconfig = "//src/cdk/testing/e2e:tsconfig-e2e.json",
7272
deps = [
7373
"@npm//@types/jasmine",
7474
"@npm//@types/selenium-webdriver",
7575
"@npm//protractor",
76-
"//src/e2e-app:e2e_utils_lib",
76+
"//src/cdk/testing/e2e",
7777
]
7878
)
7979

@@ -86,7 +86,7 @@ protractor_web_test_suite(
8686
deps = [
8787
"@npm//protractor",
8888
":e2e_test_sources",
89-
"//src/e2e-app:e2e_utils_lib",
89+
"//src/cdk/testing/e2e",
9090
],
9191
data = [
9292
"@npm//@angular/bazel",

‎src/material-experimental/mdc-chips/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ sass_binary(
4242
ts_library(
4343
name = "e2e_test_sources",
4444
srcs = glob(["**/*.e2e.spec.ts"]),
45-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
45+
tsconfig = "//src/cdk/testing/e2e:tsconfig-e2e.json",
4646
deps = [
4747
"@npm//@types/jasmine",
4848
"@npm//@types/selenium-webdriver",
4949
"@npm//protractor",
50-
"//src/e2e-app:e2e_utils_lib",
50+
"//src/cdk/testing/e2e",
5151
]
5252
)
5353

@@ -60,7 +60,7 @@ protractor_web_test_suite(
6060
deps = [
6161
"@npm//protractor",
6262
":e2e_test_sources",
63-
"//src/e2e-app:e2e_utils_lib",
63+
"//src/cdk/testing/e2e",
6464
],
6565
data = [
6666
"@npm//@angular/bazel",

‎src/material-experimental/mdc-menu/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ ng_web_test_suite(
6969
ts_library(
7070
name = "e2e_test_sources",
7171
srcs = glob(["**/*.e2e.spec.ts"]),
72-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
72+
tsconfig = "//src/cdk/testing/e2e:tsconfig-e2e.json",
7373
deps = [
7474
"@npm//@types/jasmine",
7575
"@npm//@types/selenium-webdriver",
7676
"@npm//protractor",
77-
"//src/e2e-app:e2e_utils_lib",
77+
"//src/cdk/testing/e2e",
7878
]
7979
)
8080

@@ -87,7 +87,7 @@ protractor_web_test_suite(
8787
deps = [
8888
"@npm//protractor",
8989
":e2e_test_sources",
90-
"//src/e2e-app:e2e_utils_lib",
90+
"//src/cdk/testing/e2e",
9191
],
9292
data = [
9393
"@npm//@angular/bazel",

‎src/material-experimental/mdc-menu/menu.e2e.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
expectLocation,
66
expectToExist,
77
pressKeys,
8-
} from '../../e2e-app/test-util';
8+
} from '@angular/cdk/testing/e2e';
99

1010
const presenceOf = ExpectedConditions.presenceOf;
1111
const not = ExpectedConditions.not;

‎src/material-experimental/mdc-radio/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ sass_binary(
3232
ts_library(
3333
name = "e2e_test_sources",
3434
srcs = glob(["**/*.e2e.spec.ts"]),
35-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
35+
tsconfig = "//src/cdk/testing/e2e:tsconfig-e2e.json",
3636
deps = [
3737
"@npm//@types/jasmine",
3838
"@npm//@types/selenium-webdriver",
3939
"@npm//protractor",
40-
"//src/e2e-app:e2e_utils_lib",
40+
"//src/cdk/testing/e2e",
4141
]
4242
)
4343

@@ -50,7 +50,7 @@ protractor_web_test_suite(
5050
deps = [
5151
"@npm//protractor",
5252
":e2e_test_sources",
53-
"//src/e2e-app:e2e_utils_lib",
53+
"//src/cdk/testing/e2e",
5454
],
5555
data = [
5656
"@npm//@angular/bazel",

‎src/material-experimental/mdc-slide-toggle/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ ng_web_test_suite(
6666
ts_library(
6767
name = "e2e_test_sources",
6868
srcs = glob(["**/*.e2e.spec.ts"]),
69-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
69+
tsconfig = "//src/cdk/testing/e2e:tsconfig-e2e.json",
7070
deps = [
7171
"@npm//@types/jasmine",
7272
"@npm//@types/selenium-webdriver",
7373
"@npm//protractor",
74-
"//src/e2e-app:e2e_utils_lib",
74+
"//src/cdk/testing/e2e",
7575
]
7676
)
7777

@@ -84,7 +84,7 @@ protractor_web_test_suite(
8484
deps = [
8585
"@npm//protractor",
8686
":e2e_test_sources",
87-
"//src/e2e-app:e2e_utils_lib",
87+
"//src/cdk/testing/e2e",
8888
],
8989
data = [
9090
"@npm//@angular/bazel",

‎src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts

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

44

55
describe('slide-toggle', () => {

‎src/material/button-toggle/BUILD.bazel

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

@@ -72,7 +72,7 @@ protractor_web_test_suite(
7272
deps = [
7373
"@npm//protractor",
7474
":e2e_test_sources",
75-
"//src/e2e-app:e2e_utils_lib",
75+
"//src/cdk/testing/e2e",
7676
],
7777
data = [
7878
"@npm//@angular/bazel",

‎src/material/button/BUILD.bazel

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

@@ -72,7 +72,7 @@ protractor_web_test_suite(
7272
deps = [
7373
"@npm//protractor",
7474
":e2e_test_sources",
75-
"//src/e2e-app:e2e_utils_lib",
75+
"//src/cdk/testing/e2e",
7676
],
7777
data = [
7878
"@npm//@angular/bazel",

‎src/material/card/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ sass_binary(
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/material/checkbox/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ ng_web_test_suite(
6161
ts_library(
6262
name = "e2e_test_sources",
6363
srcs = glob(["**/*.e2e.spec.ts"]),
64-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
64+
tsconfig = "//src/cdk/testing/e2e:tsconfig-e2e.json",
6565
deps = [
6666
"@npm//@types/jasmine",
6767
"@npm//@types/selenium-webdriver",
6868
"@npm//protractor",
69-
"//src/e2e-app:e2e_utils_lib",
69+
"//src/cdk/testing/e2e",
7070
]
7171
)
7272

@@ -79,7 +79,7 @@ protractor_web_test_suite(
7979
deps = [
8080
"@npm//protractor",
8181
":e2e_test_sources",
82-
"//src/e2e-app:e2e_utils_lib",
82+
"//src/cdk/testing/e2e",
8383
],
8484
data = [
8585
"@npm//@angular/bazel",

0 commit comments

Comments
 (0)