Skip to content

Commit dae84fe

Browse files
mmalerbammalerba
committed
move e2e tests to the component's src dir
1 parent 0db06b3 commit dae84fe

Some content is hidden

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

57 files changed

+879
-76
lines changed

‎e2e/BUILD.bazel

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

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

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

3-
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")
3+
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")
45

56
ng_module(
67
name = "scrolling",
@@ -28,3 +29,32 @@ ng_web_test_suite(
2829
name = "unit_tests",
2930
deps = [":unit_test_sources"]
3031
)
32+
33+
ts_library(
34+
name = "e2e_test_sources",
35+
srcs = glob(["**/*.e2e.spec.ts"]),
36+
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
37+
deps = [
38+
"@npm//@types/jasmine",
39+
"@npm//@types/selenium-webdriver",
40+
"@npm//protractor",
41+
"//src/e2e-app:e2e_utils_lib",
42+
]
43+
)
44+
45+
protractor_web_test_suite(
46+
name = "e2e_tests",
47+
tags = ["e2e"],
48+
configuration = "//src/e2e-app:protractor.conf.js",
49+
on_prepare = "//src/e2e-app:start-devserver.js",
50+
server = "//src/e2e-app:devserver",
51+
deps = [
52+
"@npm//protractor",
53+
":e2e_test_sources",
54+
"//src/e2e-app:e2e_utils_lib",
55+
],
56+
data = [
57+
"@npm//@angular/bazel",
58+
"//tools/axe-protractor",
59+
],
60+
)

‎e2e/components/virtual-scroll-e2e.spec.ts renamed to ‎src/cdk-experimental/scrolling/virtual-scroll.e2e.spec.ts

File renamed without changes.

‎src/cdk/overlay/BUILD.bazel

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

33
load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary")
4+
load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
45
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite",
5-
"markdown_to_html")
6+
"markdown_to_html", "ts_library")
67

78
ng_module(
89
name = "overlay",
@@ -55,6 +56,35 @@ ng_web_test_suite(
5556
static_css = ["overlay_prebuilt_scss"],
5657
)
5758

59+
ts_library(
60+
name = "e2e_test_sources",
61+
srcs = glob(["**/*.e2e.spec.ts"]),
62+
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
63+
deps = [
64+
"@npm//@types/jasmine",
65+
"@npm//@types/selenium-webdriver",
66+
"@npm//protractor",
67+
"//src/e2e-app:e2e_utils_lib",
68+
]
69+
)
70+
71+
protractor_web_test_suite(
72+
name = "e2e_tests",
73+
tags = ["e2e"],
74+
configuration = "//src/e2e-app:protractor.conf.js",
75+
on_prepare = "//src/e2e-app:start-devserver.js",
76+
server = "//src/e2e-app:devserver",
77+
deps = [
78+
"@npm//protractor",
79+
":e2e_test_sources",
80+
"//src/e2e-app:e2e_utils_lib",
81+
],
82+
data = [
83+
"@npm//@angular/bazel",
84+
"//tools/axe-protractor",
85+
],
86+
)
87+
5888
markdown_to_html(
5989
name = "overview",
6090
srcs = [":overlay.md"],

‎e2e/components/block-scroll-strategy-e2e.spec.ts renamed to ‎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 '../../src/e2e-app/test-util/index';
2+
import {getScrollPosition} from '../../../e2e-app/test-util';
33

44

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

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

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

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

67
ng_module(
78
name = "mdc-button",
@@ -64,3 +65,32 @@ sass_binary(
6465
"//src/material-experimental/mdc-helpers:mdc_scss_deps_lib",
6566
],
6667
)
68+
69+
ts_library(
70+
name = "e2e_test_sources",
71+
srcs = glob(["**/*.e2e.spec.ts"]),
72+
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
73+
deps = [
74+
"@npm//@types/jasmine",
75+
"@npm//@types/selenium-webdriver",
76+
"@npm//protractor",
77+
"//src/e2e-app:e2e_utils_lib",
78+
]
79+
)
80+
81+
protractor_web_test_suite(
82+
name = "e2e_tests",
83+
tags = ["e2e"],
84+
configuration = "//src/e2e-app:protractor.conf.js",
85+
on_prepare = "//src/e2e-app:start-devserver.js",
86+
server = "//src/e2e-app:devserver",
87+
deps = [
88+
"@npm//protractor",
89+
":e2e_test_sources",
90+
"//src/e2e-app:e2e_utils_lib",
91+
],
92+
data = [
93+
"@npm//@angular/bazel",
94+
"//tools/axe-protractor",
95+
],
96+
)

‎e2e/components/mdc-button-e2e.spec.ts renamed to ‎src/material-experimental/mdc-button/button.e2e.spec.ts

File renamed without changes.

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

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

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

67
ng_module(
78
name = "mdc-card",
@@ -27,3 +28,32 @@ sass_binary(
2728
name = "card_scss",
2829
src = "card.scss",
2930
)
31+
32+
ts_library(
33+
name = "e2e_test_sources",
34+
srcs = glob(["**/*.e2e.spec.ts"]),
35+
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
36+
deps = [
37+
"@npm//@types/jasmine",
38+
"@npm//@types/selenium-webdriver",
39+
"@npm//protractor",
40+
"//src/e2e-app:e2e_utils_lib",
41+
]
42+
)
43+
44+
protractor_web_test_suite(
45+
name = "e2e_tests",
46+
tags = ["e2e"],
47+
configuration = "//src/e2e-app:protractor.conf.js",
48+
on_prepare = "//src/e2e-app:start-devserver.js",
49+
server = "//src/e2e-app:devserver",
50+
deps = [
51+
"@npm//protractor",
52+
":e2e_test_sources",
53+
"//src/e2e-app:e2e_utils_lib",
54+
],
55+
data = [
56+
"@npm//@angular/bazel",
57+
"//tools/axe-protractor",
58+
],
59+
)

‎e2e/components/mdc-card-e2e.spec.ts renamed to ‎src/material-experimental/mdc-card/card.e2e.spec.ts

File renamed without changes.

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

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

33
load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary")
4-
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")
4+
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")
56

67
ng_module(
78
name = "mdc-checkbox",
@@ -63,3 +64,32 @@ ng_web_test_suite(
6364
":checkbox_tests_lib",
6465
],
6566
)
67+
68+
ts_library(
69+
name = "e2e_test_sources",
70+
srcs = glob(["**/*.e2e.spec.ts"]),
71+
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
72+
deps = [
73+
"@npm//@types/jasmine",
74+
"@npm//@types/selenium-webdriver",
75+
"@npm//protractor",
76+
"//src/e2e-app:e2e_utils_lib",
77+
]
78+
)
79+
80+
protractor_web_test_suite(
81+
name = "e2e_tests",
82+
tags = ["e2e"],
83+
configuration = "//src/e2e-app:protractor.conf.js",
84+
on_prepare = "//src/e2e-app:start-devserver.js",
85+
server = "//src/e2e-app:devserver",
86+
deps = [
87+
"@npm//protractor",
88+
":e2e_test_sources",
89+
"//src/e2e-app:e2e_utils_lib",
90+
],
91+
data = [
92+
"@npm//@angular/bazel",
93+
"//tools/axe-protractor",
94+
],
95+
)

‎e2e/components/mdc-checkbox-e2e.spec.ts renamed to ‎src/material-experimental/mdc-checkbox/checkbox.e2e.spec.ts

File renamed without changes.

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

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

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

67
ng_module(
78
name = "mdc-chips",
@@ -37,3 +38,32 @@ sass_binary(
3738
"//src/material-experimental/mdc-helpers:mdc_scss_deps_lib",
3839
]
3940
)
41+
42+
ts_library(
43+
name = "e2e_test_sources",
44+
srcs = glob(["**/*.e2e.spec.ts"]),
45+
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
46+
deps = [
47+
"@npm//@types/jasmine",
48+
"@npm//@types/selenium-webdriver",
49+
"@npm//protractor",
50+
"//src/e2e-app:e2e_utils_lib",
51+
]
52+
)
53+
54+
protractor_web_test_suite(
55+
name = "e2e_tests",
56+
tags = ["e2e"],
57+
configuration = "//src/e2e-app:protractor.conf.js",
58+
on_prepare = "//src/e2e-app:start-devserver.js",
59+
server = "//src/e2e-app:devserver",
60+
deps = [
61+
"@npm//protractor",
62+
":e2e_test_sources",
63+
"//src/e2e-app:e2e_utils_lib",
64+
],
65+
data = [
66+
"@npm//@angular/bazel",
67+
"//tools/axe-protractor",
68+
],
69+
)

‎e2e/components/mdc-chips-e2e.spec.ts renamed to ‎src/material-experimental/mdc-chips/chips.e2e.spec.ts

File renamed without changes.

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

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

33
load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary")
4-
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")
4+
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")
56

67
ng_module(
78
name = "mdc-menu",
@@ -64,3 +65,32 @@ ng_web_test_suite(
6465
":menu_tests_lib",
6566
],
6667
)
68+
69+
ts_library(
70+
name = "e2e_test_sources",
71+
srcs = glob(["**/*.e2e.spec.ts"]),
72+
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
73+
deps = [
74+
"@npm//@types/jasmine",
75+
"@npm//@types/selenium-webdriver",
76+
"@npm//protractor",
77+
"//src/e2e-app:e2e_utils_lib",
78+
]
79+
)
80+
81+
protractor_web_test_suite(
82+
name = "e2e_tests",
83+
tags = ["e2e"],
84+
configuration = "//src/e2e-app:protractor.conf.js",
85+
on_prepare = "//src/e2e-app:start-devserver.js",
86+
server = "//src/e2e-app:devserver",
87+
deps = [
88+
"@npm//protractor",
89+
":e2e_test_sources",
90+
"//src/e2e-app:e2e_utils_lib",
91+
],
92+
data = [
93+
"@npm//@angular/bazel",
94+
"//tools/axe-protractor",
95+
],
96+
)

‎e2e/components/mdc-menu-e2e.spec.ts renamed to ‎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 '../../src/e2e-app/test-util/index';
8+
} from '../../e2e-app/test-util';
99

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

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

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

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

67
ng_module(
78
name = "mdc-radio",
@@ -27,3 +28,32 @@ sass_binary(
2728
name = "radio_scss",
2829
src = "radio.scss",
2930
)
31+
32+
ts_library(
33+
name = "e2e_test_sources",
34+
srcs = glob(["**/*.e2e.spec.ts"]),
35+
tsconfig = "//src/e2e-app:tsconfig-e2e.json",
36+
deps = [
37+
"@npm//@types/jasmine",
38+
"@npm//@types/selenium-webdriver",
39+
"@npm//protractor",
40+
"//src/e2e-app:e2e_utils_lib",
41+
]
42+
)
43+
44+
protractor_web_test_suite(
45+
name = "e2e_tests",
46+
tags = ["e2e"],
47+
configuration = "//src/e2e-app:protractor.conf.js",
48+
on_prepare = "//src/e2e-app:start-devserver.js",
49+
server = "//src/e2e-app:devserver",
50+
deps = [
51+
"@npm//protractor",
52+
":e2e_test_sources",
53+
"//src/e2e-app:e2e_utils_lib",
54+
],
55+
data = [
56+
"@npm//@angular/bazel",
57+
"//tools/axe-protractor",
58+
],
59+
)

‎e2e/components/mdc-radio-e2e.spec.ts renamed to ‎src/material-experimental/mdc-radio/radio.e2e.spec.ts

File renamed without changes.

0 commit comments

Comments
 (0)