Skip to content

Commit c61cd5b

Browse files
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+
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
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
}

0 commit comments

Comments
 (0)