Skip to content

Commit c61cd5b

Browse files
mmalerbammalerba
committed
move e2e test utils under @angular/cdk/testing
1 parent 184ee37 commit c61cd5b

Some content is hidden

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

51 files changed

+160
-284
lines changed

‎src/cdk-experimental/scrolling/BUILD.bazel

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(default_visibility=["//visibility:public"])
22

33
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
4-
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library")
4+
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ng_e2e_test_library")
55

66
ng_module(
77
name = "scrolling",
@@ -30,15 +30,11 @@ ng_web_test_suite(
3030
deps = [":unit_test_sources"]
3131
)
3232

33-
ts_library(
33+
ng_e2e_test_library(
3434
name = "e2e_test_sources",
3535
srcs = glob(["**/*.e2e.spec.ts"]),
36-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
3736
deps = [
38-
"@npm//@types/jasmine",
39-
"@npm//@types/selenium-webdriver",
40-
"@npm//protractor",
41-
"//src/e2e-app:e2e_utils_lib",
37+
"//src/cdk/testing/e2e",
4238
]
4339
)
4440

@@ -49,9 +45,8 @@ protractor_web_test_suite(
4945
on_prepare = "//src/e2e-app:start-devserver.js",
5046
server = "//src/e2e-app:devserver",
5147
deps = [
52-
"@npm//protractor",
5348
":e2e_test_sources",
54-
"//src/e2e-app:e2e_utils_lib",
49+
"//src/cdk/testing/e2e",
5550
],
5651
data = [
5752
"@npm//@angular/bazel",

‎src/cdk-experimental/tsconfig-tests.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,8 @@
2727
// Include the index.ts for each secondary entry-point
2828
"./*/index.ts",
2929
"**/*.spec.ts"
30+
],
31+
"exclude": [
32+
"**/*.e2e.spec.ts"
3033
]
3134
}

‎src/cdk/overlay/BUILD.bazel

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package(default_visibility=["//visibility:public"])
33
load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary")
44
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
55
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite",
6-
"markdown_to_html", "ts_library")
6+
"markdown_to_html", "ng_e2e_test_library")
77

88
ng_module(
99
name = "overlay",
@@ -56,15 +56,11 @@ ng_web_test_suite(
5656
static_css = ["overlay_prebuilt_scss"],
5757
)
5858

59-
ts_library(
59+
ng_e2e_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",
65-
"@npm//@types/selenium-webdriver",
66-
"@npm//protractor",
67-
"//src/e2e-app:e2e_utils_lib",
63+
"//src/cdk/testing/e2e",
6864
]
6965
)
7066

@@ -75,9 +71,8 @@ protractor_web_test_suite(
7571
on_prepare = "//src/e2e-app:start-devserver.js",
7672
server = "//src/e2e-app:devserver",
7773
deps = [
78-
"@npm//protractor",
7974
":e2e_test_sources",
80-
"//src/e2e-app:e2e_utils_lib",
75+
"//src/cdk/testing/e2e",
8176
],
8277
data = [
8378
"@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: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package(default_visibility=["//visibility:public"])
2+
3+
load("//tools:defaults.bzl", "ng_e2e_test_library")
4+
5+
exports_files(["tsconfig-e2e.json"])
6+
7+
ng_e2e_test_library(
8+
name = "e2e",
9+
srcs = glob(["**/*.ts"]),
10+
module_name = "@angular/cdk/testing/e2e"
11+
)

‎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/cdk/tsconfig-tests.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
"**/*.spec.ts"
3535
],
3636
"exclude": [
37-
"**/schematics/**/*.ts"
37+
"**/schematics/**/*.ts",
38+
// Exclude end-to-end tests and utilities
39+
"**/*.e2e.spec.ts",
40+
"./testing/e2e/**"
3841
]
3942
}

‎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/e2e-app/tsconfig-e2e.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
22

33
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library")
44
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
5-
load("//tools:defaults.bzl", "ng_module", "ts_library")
5+
load("//tools:defaults.bzl", "ng_module", "ng_e2e_test_library")
66

77
ng_module(
88
name = "mdc-button",
@@ -66,15 +66,11 @@ sass_binary(
6666
],
6767
)
6868

69-
ts_library(
69+
ng_e2e_test_library(
7070
name = "e2e_test_sources",
7171
srcs = glob(["**/*.e2e.spec.ts"]),
72-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
7372
deps = [
74-
"@npm//@types/jasmine",
75-
"@npm//@types/selenium-webdriver",
76-
"@npm//protractor",
77-
"//src/e2e-app:e2e_utils_lib",
73+
"//src/cdk/testing/e2e",
7874
]
7975
)
8076

@@ -85,9 +81,8 @@ protractor_web_test_suite(
8581
on_prepare = "//src/e2e-app:start-devserver.js",
8682
server = "//src/e2e-app:devserver",
8783
deps = [
88-
"@npm//protractor",
8984
":e2e_test_sources",
90-
"//src/e2e-app:e2e_utils_lib",
85+
"//src/cdk/testing/e2e",
9186
],
9287
data = [
9388
"@npm//@angular/bazel",

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"])
22

33
load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary")
44
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
5-
load("//tools:defaults.bzl", "ng_module", "ts_library")
5+
load("//tools:defaults.bzl", "ng_module", "ng_e2e_test_library")
66

77
ng_module(
88
name = "mdc-card",
@@ -29,15 +29,11 @@ sass_binary(
2929
src = "card.scss",
3030
)
3131

32-
ts_library(
32+
ng_e2e_test_library(
3333
name = "e2e_test_sources",
3434
srcs = glob(["**/*.e2e.spec.ts"]),
35-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
3635
deps = [
37-
"@npm//@types/jasmine",
38-
"@npm//@types/selenium-webdriver",
39-
"@npm//protractor",
40-
"//src/e2e-app:e2e_utils_lib",
36+
"//src/cdk/testing/e2e",
4137
]
4238
)
4339

@@ -48,9 +44,8 @@ protractor_web_test_suite(
4844
on_prepare = "//src/e2e-app:start-devserver.js",
4945
server = "//src/e2e-app:devserver",
5046
deps = [
51-
"@npm//protractor",
5247
":e2e_test_sources",
53-
"//src/e2e-app:e2e_utils_lib",
48+
"//src/cdk/testing/e2e",
5449
],
5550
data = [
5651
"@npm//@angular/bazel",

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"])
22

33
load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary")
44
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
5-
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library")
5+
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ng_e2e_test_library")
66

77
ng_module(
88
name = "mdc-checkbox",
@@ -65,15 +65,11 @@ ng_web_test_suite(
6565
],
6666
)
6767

68-
ts_library(
68+
ng_e2e_test_library(
6969
name = "e2e_test_sources",
7070
srcs = glob(["**/*.e2e.spec.ts"]),
71-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
7271
deps = [
73-
"@npm//@types/jasmine",
74-
"@npm//@types/selenium-webdriver",
75-
"@npm//protractor",
76-
"//src/e2e-app:e2e_utils_lib",
72+
"//src/cdk/testing/e2e",
7773
]
7874
)
7975

@@ -84,9 +80,8 @@ protractor_web_test_suite(
8480
on_prepare = "//src/e2e-app:start-devserver.js",
8581
server = "//src/e2e-app:devserver",
8682
deps = [
87-
"@npm//protractor",
8883
":e2e_test_sources",
89-
"//src/e2e-app:e2e_utils_lib",
84+
"//src/cdk/testing/e2e",
9085
],
9186
data = [
9287
"@npm//@angular/bazel",

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"])
22

33
load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary")
44
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
5-
load("//tools:defaults.bzl", "ng_module", "ts_library")
5+
load("//tools:defaults.bzl", "ng_module", "ng_e2e_test_library")
66

77
ng_module(
88
name = "mdc-chips",
@@ -39,15 +39,11 @@ sass_binary(
3939
]
4040
)
4141

42-
ts_library(
42+
ng_e2e_test_library(
4343
name = "e2e_test_sources",
4444
srcs = glob(["**/*.e2e.spec.ts"]),
45-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
4645
deps = [
47-
"@npm//@types/jasmine",
48-
"@npm//@types/selenium-webdriver",
49-
"@npm//protractor",
50-
"//src/e2e-app:e2e_utils_lib",
46+
"//src/cdk/testing/e2e",
5147
]
5248
)
5349

@@ -58,9 +54,8 @@ protractor_web_test_suite(
5854
on_prepare = "//src/e2e-app:start-devserver.js",
5955
server = "//src/e2e-app:devserver",
6056
deps = [
61-
"@npm//protractor",
6257
":e2e_test_sources",
63-
"//src/e2e-app:e2e_utils_lib",
58+
"//src/cdk/testing/e2e",
6459
],
6560
data = [
6661
"@npm//@angular/bazel",

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"])
22

33
load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary")
44
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
5-
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ts_library")
5+
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite", "ng_e2e_test_library")
66

77
ng_module(
88
name = "mdc-menu",
@@ -66,15 +66,11 @@ ng_web_test_suite(
6666
],
6767
)
6868

69-
ts_library(
69+
ng_e2e_test_library(
7070
name = "e2e_test_sources",
7171
srcs = glob(["**/*.e2e.spec.ts"]),
72-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
7372
deps = [
74-
"@npm//@types/jasmine",
75-
"@npm//@types/selenium-webdriver",
76-
"@npm//protractor",
77-
"//src/e2e-app:e2e_utils_lib",
73+
"//src/cdk/testing/e2e",
7874
]
7975
)
8076

@@ -85,9 +81,8 @@ protractor_web_test_suite(
8581
on_prepare = "//src/e2e-app:start-devserver.js",
8682
server = "//src/e2e-app:devserver",
8783
deps = [
88-
"@npm//protractor",
8984
":e2e_test_sources",
90-
"//src/e2e-app:e2e_utils_lib",
85+
"//src/cdk/testing/e2e",
9186
],
9287
data = [
9388
"@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: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package(default_visibility=["//visibility:public"])
22

33
load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary")
44
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
5-
load("//tools:defaults.bzl", "ng_module", "ts_library")
5+
load("//tools:defaults.bzl", "ng_module", "ng_e2e_test_library")
66

77
ng_module(
88
name = "mdc-radio",
@@ -29,15 +29,11 @@ sass_binary(
2929
src = "radio.scss",
3030
)
3131

32-
ts_library(
32+
ng_e2e_test_library(
3333
name = "e2e_test_sources",
3434
srcs = glob(["**/*.e2e.spec.ts"]),
35-
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
3635
deps = [
37-
"@npm//@types/jasmine",
38-
"@npm//@types/selenium-webdriver",
39-
"@npm//protractor",
40-
"//src/e2e-app:e2e_utils_lib",
36+
"//src/cdk/testing/e2e",
4137
]
4238
)
4339

@@ -48,9 +44,8 @@ protractor_web_test_suite(
4844
on_prepare = "//src/e2e-app:start-devserver.js",
4945
server = "//src/e2e-app:devserver",
5046
deps = [
51-
"@npm//protractor",
5247
":e2e_test_sources",
53-
"//src/e2e-app:e2e_utils_lib",
48+
"//src/cdk/testing/e2e",
5449
],
5550
data = [
5651
"@npm//@angular/bazel",

0 commit comments

Comments
 (0)