Skip to content

Commit bacdc85

Browse files
mmalerbajelbourn
authored andcommitted
feat(cdk/testing): move harness code from cdk-experimental (#17026)
1 parent 52aebd0 commit bacdc85

File tree

112 files changed

+286
-205
lines changed

Some content is hidden

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

112 files changed

+286
-205
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@
117117
/src/cdk-experimental/dialog/** @jelbourn @josephperrott @crisbeto
118118
/src/cdk-experimental/popover-edit/** @kseamon @andrewseguin
119119
/src/cdk-experimental/scrolling/** @mmalerba
120-
/src/cdk-experimental/testing/** @mmalerba
121120

122121
# Docs examples & guides
123122
/guides/** @jelbourn

src/cdk-experimental/testing/BUILD.bazel

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

src/cdk-experimental/testing/public-api.ts

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

src/cdk-experimental/testing/testbed/index.ts

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

src/cdk/testing/BUILD.bazel

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

3-
load("//tools:defaults.bzl", "ng_module")
3+
load("//src/e2e-app:test_suite.bzl", "e2e_test_suite")
4+
load("//tools:defaults.bzl", "ng_module", "ng_web_test_suite")
45

56
ng_module(
67
name = "testing",
78
srcs = glob(
89
["**/*.ts"],
9-
exclude = ["**/*.spec.ts"],
10+
exclude = [
11+
"**/*.spec.ts",
12+
],
1013
),
1114
module_name = "@angular/cdk/testing",
15+
)
16+
17+
ng_web_test_suite(
18+
name = "unit_tests",
19+
deps = ["//src/cdk/testing/tests:unit_test_sources"],
20+
)
21+
22+
e2e_test_suite(
23+
name = "e2e_tests",
1224
deps = [
13-
"@npm//@angular/core",
25+
"//src/cdk/testing/tests:e2e_test_sources",
26+
"@npm//protractor",
1427
],
1528
)

src/cdk-experimental/testing/protractor/BUILD.bazel renamed to src/cdk/testing/protractor/BUILD.bazel

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ ts_library(
88
["**/*.ts"],
99
exclude = ["**/*.spec.ts"],
1010
),
11-
module_name = "@angular/cdk-experimental/testing/protractor",
11+
module_name = "@angular/cdk/testing/protractor",
1212
deps = [
13-
"//src/cdk-experimental/testing",
1413
"//src/cdk/testing",
1514
"@npm//protractor",
1615
],

src/cdk/testing/public-api.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9+
export * from './component-harness';
910
export * from './dispatch-events';
11+
export * from './element-focus';
1012
export * from './event-objects';
13+
export * from './harness-environment';
14+
export * from './test-element';
1115
export * from './type-in-element';
12-
export * from './element-focus';

src/cdk-experimental/testing/testbed/BUILD.bazel renamed to src/cdk/testing/testbed/BUILD.bazel

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ ts_library(
88
["**/*.ts"],
99
exclude = ["**/*.spec.ts"],
1010
),
11-
module_name = "@angular/cdk-experimental/testing/testbed",
11+
module_name = "@angular/cdk/testing/testbed",
1212
deps = [
13-
"//src/cdk-experimental/testing",
1413
"//src/cdk/keycodes",
1514
"//src/cdk/testing",
1615
"@npm//@angular/core",

src/cdk-experimental/testing/tests/BUILD.bazel renamed to src/cdk/testing/tests/BUILD.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ng_module(
1212
],
1313
),
1414
assets = glob(["**/*.html"]),
15-
module_name = "@angular/cdk-experimental/testing/tests",
15+
module_name = "@angular/cdk/testing/tests",
1616
deps = [
1717
"//src/cdk/keycodes",
1818
"@npm//@angular/forms",
@@ -23,7 +23,7 @@ ts_library(
2323
name = "test_harnesses",
2424
srcs = glob(["harnesses/**/*.ts"]),
2525
deps = [
26-
"//src/cdk-experimental/testing",
26+
"//src/cdk/testing",
2727
],
2828
)
2929

@@ -36,8 +36,8 @@ ng_test_library(
3636
deps = [
3737
":test_components",
3838
":test_harnesses",
39-
"//src/cdk-experimental/testing",
40-
"//src/cdk-experimental/testing/testbed",
39+
"//src/cdk/testing",
40+
"//src/cdk/testing/testbed",
4141
],
4242
)
4343

@@ -46,7 +46,7 @@ ng_e2e_test_library(
4646
srcs = glob(["**/*.e2e.spec.ts"]),
4747
deps = [
4848
":test_harnesses",
49-
"//src/cdk-experimental/testing",
50-
"//src/cdk-experimental/testing/protractor",
49+
"//src/cdk/testing",
50+
"//src/cdk/testing/protractor",
5151
],
5252
)

src/cdk-experimental/testing/tests/protractor.e2e.spec.ts renamed to src/cdk/testing/tests/protractor.e2e.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {HarnessLoader} from '@angular/cdk-experimental/testing';
2-
import {ProtractorHarnessEnvironment} from '@angular/cdk-experimental/testing/protractor';
1+
import {HarnessLoader} from '@angular/cdk/testing';
2+
import {ProtractorHarnessEnvironment} from '@angular/cdk/testing/protractor';
33
import {browser} from 'protractor';
44
import {MainComponentHarness} from './harnesses/main-component-harness';
55
import {SubComponentHarness} from './harnesses/sub-component-harness';

src/cdk-experimental/testing/tests/testbed.spec.ts renamed to src/cdk/testing/tests/testbed.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {HarnessLoader} from '@angular/cdk-experimental/testing';
2-
import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed';
1+
import {HarnessLoader} from '@angular/cdk/testing';
2+
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {ComponentFixture, TestBed} from '@angular/core/testing';
44
import {MainComponentHarness} from './harnesses/main-component-harness';
55
import {SubComponentHarness} from './harnesses/sub-component-harness';

src/e2e-app/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ ng_module(
2727
deps = [
2828
"//src/cdk-experimental/dialog",
2929
"//src/cdk-experimental/scrolling",
30-
"//src/cdk-experimental/testing/tests:test_components",
3130
"//src/cdk/drag-drop",
3231
"//src/cdk/overlay",
3332
"//src/cdk/scrolling",
33+
"//src/cdk/testing/tests:test_components",
3434
"//src/material-examples:examples",
3535
"//src/material-experimental/mdc-button",
3636
"//src/material-experimental/mdc-card",

src/e2e-app/component-harness/component-harness-e2e-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import {TestComponentsModule} from '@angular/cdk-experimental/testing/tests';
8+
import {TestComponentsModule} from '@angular/cdk/testing/tests';
99
import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule} from '@angular/forms';

src/material-experimental/mdc-autocomplete/BUILD.bazel

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ ts_library(
2929
exclude = ["**/*.spec.ts"],
3030
),
3131
deps = [
32-
"//src/cdk-experimental/testing",
3332
"//src/cdk/coercion",
33+
"//src/cdk/testing",
3434
],
3535
)
3636

@@ -65,11 +65,10 @@ ng_test_library(
6565
deps = [
6666
":harness",
6767
":mdc-autocomplete",
68-
"//src/cdk-experimental/testing",
69-
"//src/cdk-experimental/testing/testbed",
7068
"//src/cdk/overlay",
7169
"//src/cdk/platform",
7270
"//src/cdk/testing",
71+
"//src/cdk/testing/testbed",
7372
"//src/material/autocomplete",
7473
"@npm//@angular/platform-browser",
7574
],

src/material-experimental/mdc-autocomplete/harness/autocomplete-harness-filters.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {BaseHarnessFilters} from '@angular/cdk-experimental/testing';
9+
import {BaseHarnessFilters} from '@angular/cdk/testing';
1010

1111
export interface AutocompleteHarnessFilters extends BaseHarnessFilters {}

src/material-experimental/mdc-autocomplete/harness/autocomplete-harness.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {HarnessLoader} from '@angular/cdk-experimental/testing';
2-
import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed';
1+
import {HarnessLoader} from '@angular/cdk/testing';
2+
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {Component, Type} from '@angular/core';
44
import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
55
import {MatAutocompleteModule} from '@angular/material/autocomplete';

src/material-experimental/mdc-autocomplete/harness/autocomplete-harness.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {ComponentHarness, HarnessPredicate, TestElement} from '@angular/cdk-experimental/testing';
9+
import {ComponentHarness, HarnessPredicate, TestElement} from '@angular/cdk/testing';
1010
import {coerceBooleanProperty} from '@angular/cdk/coercion';
1111
import {AutocompleteHarnessFilters} from './autocomplete-harness-filters';
1212

src/material-experimental/mdc-autocomplete/harness/mdc-autocomplete-harness.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {ComponentHarness} from '@angular/cdk-experimental/testing';
9+
import {ComponentHarness} from '@angular/cdk/testing';
1010

1111

1212
/**

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ ts_library(
3333
exclude = ["**/*.spec.ts"],
3434
),
3535
deps = [
36-
"//src/cdk-experimental/testing",
3736
"//src/cdk/coercion",
37+
"//src/cdk/testing",
3838
],
3939
)
4040

@@ -100,10 +100,9 @@ ng_test_library(
100100
deps = [
101101
":harness",
102102
":mdc-button",
103-
"//src/cdk-experimental/testing",
104-
"//src/cdk-experimental/testing/testbed",
105103
"//src/cdk/platform",
106104
"//src/cdk/testing",
105+
"//src/cdk/testing/testbed",
107106
"//src/material/button",
108107
"@npm//@angular/platform-browser",
109108
],

src/material-experimental/mdc-button/harness/button-harness-filters.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {BaseHarnessFilters} from '@angular/cdk-experimental/testing';
9+
import {BaseHarnessFilters} from '@angular/cdk/testing';
1010

1111
export interface ButtonHarnessFilters extends BaseHarnessFilters {
1212
text?: string | RegExp;

src/material-experimental/mdc-button/harness/button-harness.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {HarnessLoader} from '@angular/cdk-experimental/testing';
2-
import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed';
1+
import {HarnessLoader} from '@angular/cdk/testing';
2+
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {Platform, PlatformModule} from '@angular/cdk/platform';
44
import {Component} from '@angular/core';
55
import {ComponentFixture, inject, TestBed} from '@angular/core/testing';

src/material-experimental/mdc-button/harness/button-harness.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing';
9+
import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing';
1010
import {coerceBooleanProperty} from '@angular/cdk/coercion';
1111
import {ButtonHarnessFilters} from './button-harness-filters';
1212

src/material-experimental/mdc-button/harness/mdc-button-harness.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing';
9+
import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing';
1010
import {coerceBooleanProperty} from '@angular/cdk/coercion';
1111
import {ButtonHarnessFilters} from './button-harness-filters';
1212

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ ts_library(
3636
exclude = ["**/*.spec.ts"],
3737
),
3838
deps = [
39-
"//src/cdk-experimental/testing",
4039
"//src/cdk/coercion",
40+
"//src/cdk/testing",
4141
],
4242
)
4343

@@ -71,9 +71,8 @@ ng_test_library(
7171
deps = [
7272
":harness",
7373
":mdc-checkbox",
74-
"//src/cdk-experimental/testing",
75-
"//src/cdk-experimental/testing/testbed",
7674
"//src/cdk/testing",
75+
"//src/cdk/testing/testbed",
7776
"//src/material/checkbox",
7877
"@npm//@angular/forms",
7978
"@npm//@angular/platform-browser",

src/material-experimental/mdc-checkbox/harness/checkbox-harness-filters.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {BaseHarnessFilters} from '@angular/cdk-experimental/testing';
9+
import {BaseHarnessFilters} from '@angular/cdk/testing';
1010

1111
export interface CheckboxHarnessFilters extends BaseHarnessFilters {
1212
label?: string | RegExp;

src/material-experimental/mdc-checkbox/harness/checkbox-harness.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {HarnessLoader} from '@angular/cdk-experimental/testing';
2-
import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed';
1+
import {HarnessLoader} from '@angular/cdk/testing';
2+
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {Component} from '@angular/core';
44
import {ComponentFixture, TestBed} from '@angular/core/testing';
55
import {FormControl, ReactiveFormsModule} from '@angular/forms';

src/material-experimental/mdc-checkbox/harness/checkbox-harness.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing';
9+
import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing';
1010
import {coerceBooleanProperty} from '@angular/cdk/coercion';
1111
import {CheckboxHarnessFilters} from './checkbox-harness-filters';
1212

src/material-experimental/mdc-checkbox/harness/mdc-checkbox-harness.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing';
9+
import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing';
1010
import {coerceBooleanProperty} from '@angular/cdk/coercion';
1111
import {CheckboxHarnessFilters} from './checkbox-harness-filters';
1212

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ts_library(
3333
exclude = ["**/*.spec.ts"],
3434
),
3535
deps = [
36-
"//src/cdk-experimental/testing",
36+
"//src/cdk/testing",
3737
],
3838
)
3939

@@ -68,14 +68,13 @@ ng_test_library(
6868
deps = [
6969
":harness",
7070
":mdc-chips",
71-
"//src/cdk-experimental/testing",
72-
"//src/cdk-experimental/testing/testbed",
7371
"//src/cdk/a11y",
7472
"//src/cdk/bidi",
7573
"//src/cdk/keycodes",
7674
"//src/cdk/platform",
7775
"//src/cdk/private/testing",
7876
"//src/cdk/testing",
77+
"//src/cdk/testing/testbed",
7978
"//src/material/core",
8079
"//src/material/form-field",
8180
"//src/material/input",

0 commit comments

Comments
 (0)