From ae76738df78fa2391c7db5bf2640e578f5c32dc1 Mon Sep 17 00:00:00 2001 From: Miles Malerba Date: Mon, 9 Sep 2019 17:33:24 -0700 Subject: [PATCH] feat(cdk/testing): merge all code from cdk-experimental/testing into cdk/testing --- .github/CODEOWNERS | 1 - src/cdk-experimental/testing/BUILD.bazel | 31 ----- src/cdk-experimental/testing/public-api.ts | 11 -- src/cdk-experimental/testing/testbed/index.ts | 9 -- src/cdk/testing/BUILD.bazel | 19 ++- .../testing/component-harness.ts | 0 .../testing/element-dimensions.ts | 0 .../testing/harness-environment.ts | 0 .../testing/protractor/BUILD.bazel | 3 +- .../testing/protractor}/index.ts | 0 .../testing/protractor/protractor-element.ts | 0 .../protractor-harness-environment.ts | 0 .../testing/protractor/public-api.ts | 0 src/cdk/testing/public-api.ts | 5 +- .../testing/test-element.ts | 0 .../testing/testbed/BUILD.bazel | 3 +- .../testing/testbed}/index.ts | 0 .../testing/testbed/public-api.ts | 0 .../testbed/testbed-harness-environment.ts | 0 .../testing/testbed/unit-test-element.ts | 0 .../testing/tests/BUILD.bazel | 12 +- .../tests/harnesses/main-component-harness.ts | 0 .../tests/harnesses/sub-component-harness.ts | 0 .../testing/tests/index.ts | 0 .../testing/tests/protractor.e2e.spec.ts | 4 +- .../testing/tests/test-components-module.ts | 0 .../testing/tests/test-main-component.html | 0 .../testing/tests/test-main-component.ts | 0 .../testing/tests/test-sub-component.ts | 0 .../testing/tests/testbed.spec.ts | 4 +- src/e2e-app/BUILD.bazel | 2 +- .../component-harness-e2e-module.ts | 2 +- .../mdc-autocomplete/BUILD.bazel | 5 +- .../harness/autocomplete-harness-filters.ts | 2 +- .../harness/autocomplete-harness.spec.ts | 4 +- .../harness/autocomplete-harness.ts | 2 +- .../harness/mdc-autocomplete-harness.ts | 2 +- .../mdc-button/BUILD.bazel | 5 +- .../harness/button-harness-filters.ts | 2 +- .../mdc-button/harness/button-harness.spec.ts | 4 +- .../mdc-button/harness/button-harness.ts | 2 +- .../mdc-button/harness/mdc-button-harness.ts | 2 +- .../mdc-checkbox/BUILD.bazel | 5 +- .../harness/checkbox-harness-filters.ts | 2 +- .../harness/checkbox-harness.spec.ts | 4 +- .../mdc-checkbox/harness/checkbox-harness.ts | 2 +- .../harness/mdc-checkbox-harness.ts | 2 +- .../mdc-chips/BUILD.bazel | 5 +- .../harness/chip-grid-harness.spec.ts | 4 +- .../mdc-chips/harness/chip-grid-harness.ts | 2 +- .../mdc-chips/harness/chip-harness.spec.ts | 4 +- .../mdc-chips/harness/chip-harness.ts | 2 +- .../mdc-chips/harness/chip-input.spec.ts | 4 +- .../mdc-chips/harness/chip-input.ts | 2 +- .../harness/chip-listbox-harness.spec.ts | 4 +- .../mdc-chips/harness/chip-listbox-harness.ts | 2 +- .../harness/chip-option-harness.spec.ts | 4 +- .../harness/chip-row-harness.spec.ts | 4 +- .../harness/chip-set-harness.spec.ts | 4 +- .../mdc-chips/harness/chip-set-harness.ts | 2 +- .../mdc-dialog/harness/BUILD.bazel | 6 +- .../harness/dialog-harness-filters.ts | 2 +- .../mdc-dialog/harness/dialog-harness.spec.ts | 4 +- .../mdc-dialog/harness/dialog-harness.ts | 2 +- .../mdc-input/harness/BUILD.bazel | 6 +- .../harness/input-harness-filters.ts | 2 +- .../mdc-input/harness/input-harness.spec.ts | 4 +- .../mdc-input/harness/input-harness.ts | 2 +- .../mdc-menu/BUILD.bazel | 5 +- .../mdc-menu/harness/mdc-menu-harness.ts | 2 +- .../mdc-menu/harness/mdc-menu-item-harness.ts | 2 +- .../mdc-menu/harness/menu-harness-filters.ts | 2 +- .../mdc-menu/harness/menu-harness.spec.ts | 4 +- .../mdc-menu/harness/menu-harness.ts | 2 +- .../mdc-menu/harness/menu-item-harness.ts | 2 +- .../mdc-progress-bar/BUILD.bazel | 5 +- .../harness/progress-bar-harness.spec.ts | 4 +- .../harness/progress-bar-harness.ts | 2 +- .../mdc-progress-spinner/BUILD.bazel | 5 +- .../harness/progress-spinner-harness.spec.ts | 4 +- .../harness/progress-spinner-harness.ts | 2 +- .../mdc-radio/harness/BUILD.bazel | 6 +- .../harness/radio-harness-filters.ts | 2 +- .../mdc-radio/harness/radio-harness.spec.ts | 4 +- .../mdc-radio/harness/radio-harness.ts | 2 +- .../mdc-select/BUILD.bazel | 5 +- .../mdc-select/harness/mdc-select-harness.ts | 2 +- .../harness/select-harness-filters.ts | 2 +- .../mdc-select/harness/select-harness.spec.ts | 4 +- .../mdc-select/harness/select-harness.ts | 2 +- .../mdc-sidenav/BUILD.bazel | 5 +- .../harness/mdc-sidenav-harness.ts | 2 +- .../harness/sidenav-harness-filters.ts | 2 +- .../harness/sidenav-harness.spec.ts | 4 +- .../mdc-sidenav/harness/sidenav-harness.ts | 2 +- .../mdc-slide-toggle/BUILD.bazel | 5 +- .../harness/mdc-slide-toggle-harness.ts | 2 +- .../harness/slide-toggle-harness-filters.ts | 2 +- .../harness/slide-toggle-harness.spec.ts | 4 +- .../harness/slide-toggle-harness.ts | 2 +- .../mdc-slider/harness/BUILD.bazel | 6 +- .../harness/slider-harness-filters.ts | 2 +- .../mdc-slider/harness/slider-harness.spec.ts | 4 +- .../mdc-slider/harness/slider-harness.ts | 2 +- .../mdc-tabs/BUILD.bazel | 3 +- .../mdc-tabs/harness/BUILD.bazel | 6 +- .../harness/tab-group-harness-filters.ts | 2 +- .../harness/tab-group-harness.spec.ts | 4 +- .../mdc-tabs/harness/tab-group-harness.ts | 2 +- .../mdc-tabs/harness/tab-harness.ts | 2 +- test/karma-system-config.js | 5 +- tools/public_api_guard/cdk/testing.d.ts | 131 ++++++++++++++++++ 112 files changed, 286 insertions(+), 205 deletions(-) delete mode 100644 src/cdk-experimental/testing/BUILD.bazel delete mode 100644 src/cdk-experimental/testing/public-api.ts delete mode 100644 src/cdk-experimental/testing/testbed/index.ts rename src/{cdk-experimental => cdk}/testing/component-harness.ts (100%) rename src/{cdk-experimental => cdk}/testing/element-dimensions.ts (100%) rename src/{cdk-experimental => cdk}/testing/harness-environment.ts (100%) rename src/{cdk-experimental => cdk}/testing/protractor/BUILD.bazel (73%) rename src/{cdk-experimental/testing => cdk/testing/protractor}/index.ts (100%) rename src/{cdk-experimental => cdk}/testing/protractor/protractor-element.ts (100%) rename src/{cdk-experimental => cdk}/testing/protractor/protractor-harness-environment.ts (100%) rename src/{cdk-experimental => cdk}/testing/protractor/public-api.ts (100%) rename src/{cdk-experimental => cdk}/testing/test-element.ts (100%) rename src/{cdk-experimental => cdk}/testing/testbed/BUILD.bazel (75%) rename src/{cdk-experimental/testing/protractor => cdk/testing/testbed}/index.ts (100%) rename src/{cdk-experimental => cdk}/testing/testbed/public-api.ts (100%) rename src/{cdk-experimental => cdk}/testing/testbed/testbed-harness-environment.ts (100%) rename src/{cdk-experimental => cdk}/testing/testbed/unit-test-element.ts (100%) rename src/{cdk-experimental => cdk}/testing/tests/BUILD.bazel (75%) rename src/{cdk-experimental => cdk}/testing/tests/harnesses/main-component-harness.ts (100%) rename src/{cdk-experimental => cdk}/testing/tests/harnesses/sub-component-harness.ts (100%) rename src/{cdk-experimental => cdk}/testing/tests/index.ts (100%) rename src/{cdk-experimental => cdk}/testing/tests/protractor.e2e.spec.ts (98%) rename src/{cdk-experimental => cdk}/testing/tests/test-components-module.ts (100%) rename src/{cdk-experimental => cdk}/testing/tests/test-main-component.html (100%) rename src/{cdk-experimental => cdk}/testing/tests/test-main-component.ts (100%) rename src/{cdk-experimental => cdk}/testing/tests/test-sub-component.ts (100%) rename src/{cdk-experimental => cdk}/testing/tests/testbed.spec.ts (99%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 33aea27e33af..54fa87603b10 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -117,7 +117,6 @@ /src/cdk-experimental/dialog/** @jelbourn @josephperrott @crisbeto /src/cdk-experimental/popover-edit/** @kseamon @andrewseguin /src/cdk-experimental/scrolling/** @mmalerba -/src/cdk-experimental/testing/** @mmalerba # Docs examples & guides /guides/** @jelbourn diff --git a/src/cdk-experimental/testing/BUILD.bazel b/src/cdk-experimental/testing/BUILD.bazel deleted file mode 100644 index 7fb45a781570..000000000000 --- a/src/cdk-experimental/testing/BUILD.bazel +++ /dev/null @@ -1,31 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") -load("//tools:defaults.bzl", "ng_module", "ng_web_test_suite") - -ng_module( - name = "testing", - srcs = glob( - ["**/*.ts"], - exclude = [ - "**/*.spec.ts", - ], - ), - module_name = "@angular/cdk-experimental/testing", - deps = [ - "//src/cdk/testing", - ], -) - -ng_web_test_suite( - name = "unit_tests", - deps = ["//src/cdk-experimental/testing/tests:unit_test_sources"], -) - -e2e_test_suite( - name = "e2e_tests", - deps = [ - "//src/cdk-experimental/testing/tests:e2e_test_sources", - "@npm//protractor", - ], -) diff --git a/src/cdk-experimental/testing/public-api.ts b/src/cdk-experimental/testing/public-api.ts deleted file mode 100644 index 5c8698a549e6..000000000000 --- a/src/cdk-experimental/testing/public-api.ts +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -export * from './component-harness'; -export * from './harness-environment'; -export * from './test-element'; diff --git a/src/cdk-experimental/testing/testbed/index.ts b/src/cdk-experimental/testing/testbed/index.ts deleted file mode 100644 index 676ca90f1ffa..000000000000 --- a/src/cdk-experimental/testing/testbed/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -export * from './public-api'; diff --git a/src/cdk/testing/BUILD.bazel b/src/cdk/testing/BUILD.bazel index 788b6f4a4195..6e9978b49f51 100644 --- a/src/cdk/testing/BUILD.bazel +++ b/src/cdk/testing/BUILD.bazel @@ -1,15 +1,28 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:defaults.bzl", "ng_module") +load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") +load("//tools:defaults.bzl", "ng_module", "ng_web_test_suite") ng_module( name = "testing", srcs = glob( ["**/*.ts"], - exclude = ["**/*.spec.ts"], + exclude = [ + "**/*.spec.ts", + ], ), module_name = "@angular/cdk/testing", +) + +ng_web_test_suite( + name = "unit_tests", + deps = ["//src/cdk/testing/tests:unit_test_sources"], +) + +e2e_test_suite( + name = "e2e_tests", deps = [ - "@npm//@angular/core", + "//src/cdk/testing/tests:e2e_test_sources", + "@npm//protractor", ], ) diff --git a/src/cdk-experimental/testing/component-harness.ts b/src/cdk/testing/component-harness.ts similarity index 100% rename from src/cdk-experimental/testing/component-harness.ts rename to src/cdk/testing/component-harness.ts diff --git a/src/cdk-experimental/testing/element-dimensions.ts b/src/cdk/testing/element-dimensions.ts similarity index 100% rename from src/cdk-experimental/testing/element-dimensions.ts rename to src/cdk/testing/element-dimensions.ts diff --git a/src/cdk-experimental/testing/harness-environment.ts b/src/cdk/testing/harness-environment.ts similarity index 100% rename from src/cdk-experimental/testing/harness-environment.ts rename to src/cdk/testing/harness-environment.ts diff --git a/src/cdk-experimental/testing/protractor/BUILD.bazel b/src/cdk/testing/protractor/BUILD.bazel similarity index 73% rename from src/cdk-experimental/testing/protractor/BUILD.bazel rename to src/cdk/testing/protractor/BUILD.bazel index 3e8361c5b8f1..49734091ec78 100644 --- a/src/cdk-experimental/testing/protractor/BUILD.bazel +++ b/src/cdk/testing/protractor/BUILD.bazel @@ -8,9 +8,8 @@ ts_library( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - module_name = "@angular/cdk-experimental/testing/protractor", + module_name = "@angular/cdk/testing/protractor", deps = [ - "//src/cdk-experimental/testing", "//src/cdk/testing", "@npm//protractor", ], diff --git a/src/cdk-experimental/testing/index.ts b/src/cdk/testing/protractor/index.ts similarity index 100% rename from src/cdk-experimental/testing/index.ts rename to src/cdk/testing/protractor/index.ts diff --git a/src/cdk-experimental/testing/protractor/protractor-element.ts b/src/cdk/testing/protractor/protractor-element.ts similarity index 100% rename from src/cdk-experimental/testing/protractor/protractor-element.ts rename to src/cdk/testing/protractor/protractor-element.ts diff --git a/src/cdk-experimental/testing/protractor/protractor-harness-environment.ts b/src/cdk/testing/protractor/protractor-harness-environment.ts similarity index 100% rename from src/cdk-experimental/testing/protractor/protractor-harness-environment.ts rename to src/cdk/testing/protractor/protractor-harness-environment.ts diff --git a/src/cdk-experimental/testing/protractor/public-api.ts b/src/cdk/testing/protractor/public-api.ts similarity index 100% rename from src/cdk-experimental/testing/protractor/public-api.ts rename to src/cdk/testing/protractor/public-api.ts diff --git a/src/cdk/testing/public-api.ts b/src/cdk/testing/public-api.ts index e1cdbe4e352a..4083c4ddf643 100644 --- a/src/cdk/testing/public-api.ts +++ b/src/cdk/testing/public-api.ts @@ -6,7 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ +export * from './component-harness'; export * from './dispatch-events'; +export * from './element-focus'; export * from './event-objects'; +export * from './harness-environment'; +export * from './test-element'; export * from './type-in-element'; -export * from './element-focus'; diff --git a/src/cdk-experimental/testing/test-element.ts b/src/cdk/testing/test-element.ts similarity index 100% rename from src/cdk-experimental/testing/test-element.ts rename to src/cdk/testing/test-element.ts diff --git a/src/cdk-experimental/testing/testbed/BUILD.bazel b/src/cdk/testing/testbed/BUILD.bazel similarity index 75% rename from src/cdk-experimental/testing/testbed/BUILD.bazel rename to src/cdk/testing/testbed/BUILD.bazel index c11582297441..6ffb86e19428 100644 --- a/src/cdk-experimental/testing/testbed/BUILD.bazel +++ b/src/cdk/testing/testbed/BUILD.bazel @@ -8,9 +8,8 @@ ts_library( ["**/*.ts"], exclude = ["**/*.spec.ts"], ), - module_name = "@angular/cdk-experimental/testing/testbed", + module_name = "@angular/cdk/testing/testbed", deps = [ - "//src/cdk-experimental/testing", "//src/cdk/keycodes", "//src/cdk/testing", "@npm//@angular/core", diff --git a/src/cdk-experimental/testing/protractor/index.ts b/src/cdk/testing/testbed/index.ts similarity index 100% rename from src/cdk-experimental/testing/protractor/index.ts rename to src/cdk/testing/testbed/index.ts diff --git a/src/cdk-experimental/testing/testbed/public-api.ts b/src/cdk/testing/testbed/public-api.ts similarity index 100% rename from src/cdk-experimental/testing/testbed/public-api.ts rename to src/cdk/testing/testbed/public-api.ts diff --git a/src/cdk-experimental/testing/testbed/testbed-harness-environment.ts b/src/cdk/testing/testbed/testbed-harness-environment.ts similarity index 100% rename from src/cdk-experimental/testing/testbed/testbed-harness-environment.ts rename to src/cdk/testing/testbed/testbed-harness-environment.ts diff --git a/src/cdk-experimental/testing/testbed/unit-test-element.ts b/src/cdk/testing/testbed/unit-test-element.ts similarity index 100% rename from src/cdk-experimental/testing/testbed/unit-test-element.ts rename to src/cdk/testing/testbed/unit-test-element.ts diff --git a/src/cdk-experimental/testing/tests/BUILD.bazel b/src/cdk/testing/tests/BUILD.bazel similarity index 75% rename from src/cdk-experimental/testing/tests/BUILD.bazel rename to src/cdk/testing/tests/BUILD.bazel index 6dd9f69ce9b3..631c0bd8363a 100644 --- a/src/cdk-experimental/testing/tests/BUILD.bazel +++ b/src/cdk/testing/tests/BUILD.bazel @@ -12,7 +12,7 @@ ng_module( ], ), assets = glob(["**/*.html"]), - module_name = "@angular/cdk-experimental/testing/tests", + module_name = "@angular/cdk/testing/tests", deps = [ "//src/cdk/keycodes", "@npm//@angular/forms", @@ -23,7 +23,7 @@ ts_library( name = "test_harnesses", srcs = glob(["harnesses/**/*.ts"]), deps = [ - "//src/cdk-experimental/testing", + "//src/cdk/testing", ], ) @@ -36,8 +36,8 @@ ng_test_library( deps = [ ":test_components", ":test_harnesses", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", + "//src/cdk/testing", + "//src/cdk/testing/testbed", ], ) @@ -46,7 +46,7 @@ ng_e2e_test_library( srcs = glob(["**/*.e2e.spec.ts"]), deps = [ ":test_harnesses", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/protractor", + "//src/cdk/testing", + "//src/cdk/testing/protractor", ], ) diff --git a/src/cdk-experimental/testing/tests/harnesses/main-component-harness.ts b/src/cdk/testing/tests/harnesses/main-component-harness.ts similarity index 100% rename from src/cdk-experimental/testing/tests/harnesses/main-component-harness.ts rename to src/cdk/testing/tests/harnesses/main-component-harness.ts diff --git a/src/cdk-experimental/testing/tests/harnesses/sub-component-harness.ts b/src/cdk/testing/tests/harnesses/sub-component-harness.ts similarity index 100% rename from src/cdk-experimental/testing/tests/harnesses/sub-component-harness.ts rename to src/cdk/testing/tests/harnesses/sub-component-harness.ts diff --git a/src/cdk-experimental/testing/tests/index.ts b/src/cdk/testing/tests/index.ts similarity index 100% rename from src/cdk-experimental/testing/tests/index.ts rename to src/cdk/testing/tests/index.ts diff --git a/src/cdk-experimental/testing/tests/protractor.e2e.spec.ts b/src/cdk/testing/tests/protractor.e2e.spec.ts similarity index 98% rename from src/cdk-experimental/testing/tests/protractor.e2e.spec.ts rename to src/cdk/testing/tests/protractor.e2e.spec.ts index d58c96ac746a..12879ba91689 100644 --- a/src/cdk-experimental/testing/tests/protractor.e2e.spec.ts +++ b/src/cdk/testing/tests/protractor.e2e.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {ProtractorHarnessEnvironment} from '@angular/cdk-experimental/testing/protractor'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {ProtractorHarnessEnvironment} from '@angular/cdk/testing/protractor'; import {browser} from 'protractor'; import {MainComponentHarness} from './harnesses/main-component-harness'; import {SubComponentHarness} from './harnesses/sub-component-harness'; diff --git a/src/cdk-experimental/testing/tests/test-components-module.ts b/src/cdk/testing/tests/test-components-module.ts similarity index 100% rename from src/cdk-experimental/testing/tests/test-components-module.ts rename to src/cdk/testing/tests/test-components-module.ts diff --git a/src/cdk-experimental/testing/tests/test-main-component.html b/src/cdk/testing/tests/test-main-component.html similarity index 100% rename from src/cdk-experimental/testing/tests/test-main-component.html rename to src/cdk/testing/tests/test-main-component.html diff --git a/src/cdk-experimental/testing/tests/test-main-component.ts b/src/cdk/testing/tests/test-main-component.ts similarity index 100% rename from src/cdk-experimental/testing/tests/test-main-component.ts rename to src/cdk/testing/tests/test-main-component.ts diff --git a/src/cdk-experimental/testing/tests/test-sub-component.ts b/src/cdk/testing/tests/test-sub-component.ts similarity index 100% rename from src/cdk-experimental/testing/tests/test-sub-component.ts rename to src/cdk/testing/tests/test-sub-component.ts diff --git a/src/cdk-experimental/testing/tests/testbed.spec.ts b/src/cdk/testing/tests/testbed.spec.ts similarity index 99% rename from src/cdk-experimental/testing/tests/testbed.spec.ts rename to src/cdk/testing/tests/testbed.spec.ts index 7515d98fd7a2..b6ec95e0e25e 100644 --- a/src/cdk-experimental/testing/tests/testbed.spec.ts +++ b/src/cdk/testing/tests/testbed.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MainComponentHarness} from './harnesses/main-component-harness'; import {SubComponentHarness} from './harnesses/sub-component-harness'; diff --git a/src/e2e-app/BUILD.bazel b/src/e2e-app/BUILD.bazel index ef26c3456887..6faa47d4f761 100644 --- a/src/e2e-app/BUILD.bazel +++ b/src/e2e-app/BUILD.bazel @@ -27,10 +27,10 @@ ng_module( deps = [ "//src/cdk-experimental/dialog", "//src/cdk-experimental/scrolling", - "//src/cdk-experimental/testing/tests:test_components", "//src/cdk/drag-drop", "//src/cdk/overlay", "//src/cdk/scrolling", + "//src/cdk/testing/tests:test_components", "//src/material-examples:examples", "//src/material-experimental/mdc-button", "//src/material-experimental/mdc-card", diff --git a/src/e2e-app/component-harness/component-harness-e2e-module.ts b/src/e2e-app/component-harness/component-harness-e2e-module.ts index 529de6ffce6b..0a4c57705af3 100644 --- a/src/e2e-app/component-harness/component-harness-e2e-module.ts +++ b/src/e2e-app/component-harness/component-harness-e2e-module.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {TestComponentsModule} from '@angular/cdk-experimental/testing/tests'; +import {TestComponentsModule} from '@angular/cdk/testing/tests'; import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; diff --git a/src/material-experimental/mdc-autocomplete/BUILD.bazel b/src/material-experimental/mdc-autocomplete/BUILD.bazel index 7f914e997af9..96279aae5d25 100644 --- a/src/material-experimental/mdc-autocomplete/BUILD.bazel +++ b/src/material-experimental/mdc-autocomplete/BUILD.bazel @@ -29,8 +29,8 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -65,11 +65,10 @@ ng_test_library( deps = [ ":harness", ":mdc-autocomplete", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", "//src/cdk/overlay", "//src/cdk/platform", "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/autocomplete", "@npm//@angular/platform-browser", ], diff --git a/src/material-experimental/mdc-autocomplete/harness/autocomplete-harness-filters.ts b/src/material-experimental/mdc-autocomplete/harness/autocomplete-harness-filters.ts index 88ad72a586d0..3abf42268820 100644 --- a/src/material-experimental/mdc-autocomplete/harness/autocomplete-harness-filters.ts +++ b/src/material-experimental/mdc-autocomplete/harness/autocomplete-harness-filters.ts @@ -6,6 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ -import {BaseHarnessFilters} from '@angular/cdk-experimental/testing'; +import {BaseHarnessFilters} from '@angular/cdk/testing'; export interface AutocompleteHarnessFilters extends BaseHarnessFilters {} diff --git a/src/material-experimental/mdc-autocomplete/harness/autocomplete-harness.spec.ts b/src/material-experimental/mdc-autocomplete/harness/autocomplete-harness.spec.ts index 444badfab372..ac4618b217e7 100644 --- a/src/material-experimental/mdc-autocomplete/harness/autocomplete-harness.spec.ts +++ b/src/material-experimental/mdc-autocomplete/harness/autocomplete-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component, Type} from '@angular/core'; import {ComponentFixture, TestBed, inject} from '@angular/core/testing'; import {MatAutocompleteModule} from '@angular/material/autocomplete'; diff --git a/src/material-experimental/mdc-autocomplete/harness/autocomplete-harness.ts b/src/material-experimental/mdc-autocomplete/harness/autocomplete-harness.ts index 804bc6880d51..0fd5f2fd2000 100644 --- a/src/material-experimental/mdc-autocomplete/harness/autocomplete-harness.ts +++ b/src/material-experimental/mdc-autocomplete/harness/autocomplete-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate, TestElement} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate, TestElement} from '@angular/cdk/testing'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; import {AutocompleteHarnessFilters} from './autocomplete-harness-filters'; diff --git a/src/material-experimental/mdc-autocomplete/harness/mdc-autocomplete-harness.ts b/src/material-experimental/mdc-autocomplete/harness/mdc-autocomplete-harness.ts index b2b7291af27c..e003f1582654 100644 --- a/src/material-experimental/mdc-autocomplete/harness/mdc-autocomplete-harness.ts +++ b/src/material-experimental/mdc-autocomplete/harness/mdc-autocomplete-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness} from '@angular/cdk-experimental/testing'; +import {ComponentHarness} from '@angular/cdk/testing'; /** diff --git a/src/material-experimental/mdc-button/BUILD.bazel b/src/material-experimental/mdc-button/BUILD.bazel index 049edd988653..0b098be9986e 100644 --- a/src/material-experimental/mdc-button/BUILD.bazel +++ b/src/material-experimental/mdc-button/BUILD.bazel @@ -33,8 +33,8 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -100,10 +100,9 @@ ng_test_library( deps = [ ":harness", ":mdc-button", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", "//src/cdk/platform", "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/button", "@npm//@angular/platform-browser", ], diff --git a/src/material-experimental/mdc-button/harness/button-harness-filters.ts b/src/material-experimental/mdc-button/harness/button-harness-filters.ts index 40ce1eccf260..ed3cc535ca2e 100644 --- a/src/material-experimental/mdc-button/harness/button-harness-filters.ts +++ b/src/material-experimental/mdc-button/harness/button-harness-filters.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {BaseHarnessFilters} from '@angular/cdk-experimental/testing'; +import {BaseHarnessFilters} from '@angular/cdk/testing'; export interface ButtonHarnessFilters extends BaseHarnessFilters { text?: string | RegExp; diff --git a/src/material-experimental/mdc-button/harness/button-harness.spec.ts b/src/material-experimental/mdc-button/harness/button-harness.spec.ts index d8564079750f..ffb9a646f2c7 100644 --- a/src/material-experimental/mdc-button/harness/button-harness.spec.ts +++ b/src/material-experimental/mdc-button/harness/button-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Platform, PlatformModule} from '@angular/cdk/platform'; import {Component} from '@angular/core'; import {ComponentFixture, inject, TestBed} from '@angular/core/testing'; diff --git a/src/material-experimental/mdc-button/harness/button-harness.ts b/src/material-experimental/mdc-button/harness/button-harness.ts index 8f116605e1a7..7d21c1d58526 100644 --- a/src/material-experimental/mdc-button/harness/button-harness.ts +++ b/src/material-experimental/mdc-button/harness/button-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; import {ButtonHarnessFilters} from './button-harness-filters'; diff --git a/src/material-experimental/mdc-button/harness/mdc-button-harness.ts b/src/material-experimental/mdc-button/harness/mdc-button-harness.ts index 7a000dcc141e..13bac181757b 100644 --- a/src/material-experimental/mdc-button/harness/mdc-button-harness.ts +++ b/src/material-experimental/mdc-button/harness/mdc-button-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; import {ButtonHarnessFilters} from './button-harness-filters'; diff --git a/src/material-experimental/mdc-checkbox/BUILD.bazel b/src/material-experimental/mdc-checkbox/BUILD.bazel index 68abcb485f2a..e5f24ed86b83 100644 --- a/src/material-experimental/mdc-checkbox/BUILD.bazel +++ b/src/material-experimental/mdc-checkbox/BUILD.bazel @@ -36,8 +36,8 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -71,9 +71,8 @@ ng_test_library( deps = [ ":harness", ":mdc-checkbox", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/checkbox", "@npm//@angular/forms", "@npm//@angular/platform-browser", diff --git a/src/material-experimental/mdc-checkbox/harness/checkbox-harness-filters.ts b/src/material-experimental/mdc-checkbox/harness/checkbox-harness-filters.ts index 94769804c44c..2031779c1834 100644 --- a/src/material-experimental/mdc-checkbox/harness/checkbox-harness-filters.ts +++ b/src/material-experimental/mdc-checkbox/harness/checkbox-harness-filters.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {BaseHarnessFilters} from '@angular/cdk-experimental/testing'; +import {BaseHarnessFilters} from '@angular/cdk/testing'; export interface CheckboxHarnessFilters extends BaseHarnessFilters { label?: string | RegExp; diff --git a/src/material-experimental/mdc-checkbox/harness/checkbox-harness.spec.ts b/src/material-experimental/mdc-checkbox/harness/checkbox-harness.spec.ts index a7fee8d40390..a5bc5a34f856 100644 --- a/src/material-experimental/mdc-checkbox/harness/checkbox-harness.spec.ts +++ b/src/material-experimental/mdc-checkbox/harness/checkbox-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {FormControl, ReactiveFormsModule} from '@angular/forms'; diff --git a/src/material-experimental/mdc-checkbox/harness/checkbox-harness.ts b/src/material-experimental/mdc-checkbox/harness/checkbox-harness.ts index fc3010c39b2e..5ca7c2577ede 100644 --- a/src/material-experimental/mdc-checkbox/harness/checkbox-harness.ts +++ b/src/material-experimental/mdc-checkbox/harness/checkbox-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; import {CheckboxHarnessFilters} from './checkbox-harness-filters'; diff --git a/src/material-experimental/mdc-checkbox/harness/mdc-checkbox-harness.ts b/src/material-experimental/mdc-checkbox/harness/mdc-checkbox-harness.ts index a8af0ecd4a2d..8bba9f1aa21d 100644 --- a/src/material-experimental/mdc-checkbox/harness/mdc-checkbox-harness.ts +++ b/src/material-experimental/mdc-checkbox/harness/mdc-checkbox-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; import {CheckboxHarnessFilters} from './checkbox-harness-filters'; diff --git a/src/material-experimental/mdc-chips/BUILD.bazel b/src/material-experimental/mdc-chips/BUILD.bazel index 8ea42828692c..f88fe5d45a31 100644 --- a/src/material-experimental/mdc-chips/BUILD.bazel +++ b/src/material-experimental/mdc-chips/BUILD.bazel @@ -33,7 +33,7 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", + "//src/cdk/testing", ], ) @@ -68,14 +68,13 @@ ng_test_library( deps = [ ":harness", ":mdc-chips", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/platform", "//src/cdk/private/testing", "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/core", "//src/material/form-field", "//src/material/input", diff --git a/src/material-experimental/mdc-chips/harness/chip-grid-harness.spec.ts b/src/material-experimental/mdc-chips/harness/chip-grid-harness.spec.ts index 7d2bea1138ee..32beff05bd7e 100644 --- a/src/material-experimental/mdc-chips/harness/chip-grid-harness.spec.ts +++ b/src/material-experimental/mdc-chips/harness/chip-grid-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatChipsModule} from '../index'; diff --git a/src/material-experimental/mdc-chips/harness/chip-grid-harness.ts b/src/material-experimental/mdc-chips/harness/chip-grid-harness.ts index b74f84bb51b7..a3e9d7a418d0 100644 --- a/src/material-experimental/mdc-chips/harness/chip-grid-harness.ts +++ b/src/material-experimental/mdc-chips/harness/chip-grid-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness} from '@angular/cdk-experimental/testing'; +import {ComponentHarness} from '@angular/cdk/testing'; import {MatChipRowHarness} from './chip-row-harness'; import {MatChipInputHarness} from './chip-input'; diff --git a/src/material-experimental/mdc-chips/harness/chip-harness.spec.ts b/src/material-experimental/mdc-chips/harness/chip-harness.spec.ts index 72f0e0082629..4f0a35ec250f 100644 --- a/src/material-experimental/mdc-chips/harness/chip-harness.spec.ts +++ b/src/material-experimental/mdc-chips/harness/chip-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatChipsModule} from '../index'; diff --git a/src/material-experimental/mdc-chips/harness/chip-harness.ts b/src/material-experimental/mdc-chips/harness/chip-harness.ts index f47e9766804f..e330bacede38 100644 --- a/src/material-experimental/mdc-chips/harness/chip-harness.ts +++ b/src/material-experimental/mdc-chips/harness/chip-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness} from '@angular/cdk-experimental/testing'; +import {ComponentHarness} from '@angular/cdk/testing'; /** * Harness for interacting with a mat-chip in tests. diff --git a/src/material-experimental/mdc-chips/harness/chip-input.spec.ts b/src/material-experimental/mdc-chips/harness/chip-input.spec.ts index beb8ac56af7d..de8a31c663af 100644 --- a/src/material-experimental/mdc-chips/harness/chip-input.spec.ts +++ b/src/material-experimental/mdc-chips/harness/chip-input.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatChipsModule} from '../index'; diff --git a/src/material-experimental/mdc-chips/harness/chip-input.ts b/src/material-experimental/mdc-chips/harness/chip-input.ts index f2fd1b63293f..0d621018cf4d 100644 --- a/src/material-experimental/mdc-chips/harness/chip-input.ts +++ b/src/material-experimental/mdc-chips/harness/chip-input.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness} from '@angular/cdk-experimental/testing'; +import {ComponentHarness} from '@angular/cdk/testing'; /** * Harness for interacting with a grid's chip input in tests. diff --git a/src/material-experimental/mdc-chips/harness/chip-listbox-harness.spec.ts b/src/material-experimental/mdc-chips/harness/chip-listbox-harness.spec.ts index f767a67299e6..b61c8af6575c 100644 --- a/src/material-experimental/mdc-chips/harness/chip-listbox-harness.spec.ts +++ b/src/material-experimental/mdc-chips/harness/chip-listbox-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatChipsModule} from '../index'; diff --git a/src/material-experimental/mdc-chips/harness/chip-listbox-harness.ts b/src/material-experimental/mdc-chips/harness/chip-listbox-harness.ts index d8b45341ef25..5c35bbf83038 100644 --- a/src/material-experimental/mdc-chips/harness/chip-listbox-harness.ts +++ b/src/material-experimental/mdc-chips/harness/chip-listbox-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness} from '@angular/cdk-experimental/testing'; +import {ComponentHarness} from '@angular/cdk/testing'; import {MatChipOptionHarness} from './chip-option-harness'; /** diff --git a/src/material-experimental/mdc-chips/harness/chip-option-harness.spec.ts b/src/material-experimental/mdc-chips/harness/chip-option-harness.spec.ts index bace8a219001..58a581e5cb63 100644 --- a/src/material-experimental/mdc-chips/harness/chip-option-harness.spec.ts +++ b/src/material-experimental/mdc-chips/harness/chip-option-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatChipsModule} from '../index'; diff --git a/src/material-experimental/mdc-chips/harness/chip-row-harness.spec.ts b/src/material-experimental/mdc-chips/harness/chip-row-harness.spec.ts index 73c138aa89d2..a8d2641d0cc6 100644 --- a/src/material-experimental/mdc-chips/harness/chip-row-harness.spec.ts +++ b/src/material-experimental/mdc-chips/harness/chip-row-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatChipsModule} from '../index'; diff --git a/src/material-experimental/mdc-chips/harness/chip-set-harness.spec.ts b/src/material-experimental/mdc-chips/harness/chip-set-harness.spec.ts index ec4d8efaec87..5d3a29c4b8c4 100644 --- a/src/material-experimental/mdc-chips/harness/chip-set-harness.spec.ts +++ b/src/material-experimental/mdc-chips/harness/chip-set-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatChipsModule} from '../index'; diff --git a/src/material-experimental/mdc-chips/harness/chip-set-harness.ts b/src/material-experimental/mdc-chips/harness/chip-set-harness.ts index 486d84078089..84b47397b5fe 100644 --- a/src/material-experimental/mdc-chips/harness/chip-set-harness.ts +++ b/src/material-experimental/mdc-chips/harness/chip-set-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness} from '@angular/cdk-experimental/testing'; +import {ComponentHarness} from '@angular/cdk/testing'; import {MatChipHarness} from './chip-harness'; /** diff --git a/src/material-experimental/mdc-dialog/harness/BUILD.bazel b/src/material-experimental/mdc-dialog/harness/BUILD.bazel index 1233bcbda1fa..5c9f53839b23 100644 --- a/src/material-experimental/mdc-dialog/harness/BUILD.bazel +++ b/src/material-experimental/mdc-dialog/harness/BUILD.bazel @@ -9,7 +9,7 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", + "//src/cdk/testing", "//src/material/dialog", ], ) @@ -19,9 +19,9 @@ ng_test_library( srcs = glob(["**/*.spec.ts"]), deps = [ ":harness", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", "//src/cdk/overlay", + "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/dialog", "@npm//@angular/platform-browser", ], diff --git a/src/material-experimental/mdc-dialog/harness/dialog-harness-filters.ts b/src/material-experimental/mdc-dialog/harness/dialog-harness-filters.ts index 68d99c11c8f6..01999a9d418e 100644 --- a/src/material-experimental/mdc-dialog/harness/dialog-harness-filters.ts +++ b/src/material-experimental/mdc-dialog/harness/dialog-harness-filters.ts @@ -6,6 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ - import {BaseHarnessFilters} from '@angular/cdk-experimental/testing'; + import {BaseHarnessFilters} from '@angular/cdk/testing'; export interface DialogHarnessFilters extends BaseHarnessFilters {} diff --git a/src/material-experimental/mdc-dialog/harness/dialog-harness.spec.ts b/src/material-experimental/mdc-dialog/harness/dialog-harness.spec.ts index ce6f18becb9e..2abc1e64672c 100644 --- a/src/material-experimental/mdc-dialog/harness/dialog-harness.spec.ts +++ b/src/material-experimental/mdc-dialog/harness/dialog-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component, TemplateRef, ViewChild} from '@angular/core'; import {ComponentFixture, TestBed, inject} from '@angular/core/testing'; import {MatDialog, MatDialogConfig, MatDialogModule} from '@angular/material/dialog'; diff --git a/src/material-experimental/mdc-dialog/harness/dialog-harness.ts b/src/material-experimental/mdc-dialog/harness/dialog-harness.ts index 8b5273ad6041..c9f9a4709c7e 100644 --- a/src/material-experimental/mdc-dialog/harness/dialog-harness.ts +++ b/src/material-experimental/mdc-dialog/harness/dialog-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate, TestKey} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate, TestKey} from '@angular/cdk/testing'; import {DialogRole} from '@angular/material/dialog'; import {DialogHarnessFilters} from './dialog-harness-filters'; diff --git a/src/material-experimental/mdc-input/harness/BUILD.bazel b/src/material-experimental/mdc-input/harness/BUILD.bazel index c72a6c83d780..fcd152bad183 100644 --- a/src/material-experimental/mdc-input/harness/BUILD.bazel +++ b/src/material-experimental/mdc-input/harness/BUILD.bazel @@ -9,8 +9,8 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -19,8 +19,8 @@ ng_test_library( srcs = glob(["**/*.spec.ts"]), deps = [ ":harness", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", + "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/input", "@npm//@angular/forms", "@npm//@angular/platform-browser", diff --git a/src/material-experimental/mdc-input/harness/input-harness-filters.ts b/src/material-experimental/mdc-input/harness/input-harness-filters.ts index 8d3d30d605ec..7b253c2624e0 100644 --- a/src/material-experimental/mdc-input/harness/input-harness-filters.ts +++ b/src/material-experimental/mdc-input/harness/input-harness-filters.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {BaseHarnessFilters} from '@angular/cdk-experimental/testing'; +import {BaseHarnessFilters} from '@angular/cdk/testing'; export interface InputHarnessFilters extends BaseHarnessFilters { value?: string; diff --git a/src/material-experimental/mdc-input/harness/input-harness.spec.ts b/src/material-experimental/mdc-input/harness/input-harness.spec.ts index 4ad52348dcf7..be304f6d4141 100644 --- a/src/material-experimental/mdc-input/harness/input-harness.spec.ts +++ b/src/material-experimental/mdc-input/harness/input-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {ReactiveFormsModule} from '@angular/forms'; diff --git a/src/material-experimental/mdc-input/harness/input-harness.ts b/src/material-experimental/mdc-input/harness/input-harness.ts index 24c4b9572fba..72882fee9dc5 100644 --- a/src/material-experimental/mdc-input/harness/input-harness.ts +++ b/src/material-experimental/mdc-input/harness/input-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {InputHarnessFilters} from './input-harness-filters'; /** diff --git a/src/material-experimental/mdc-menu/BUILD.bazel b/src/material-experimental/mdc-menu/BUILD.bazel index 6c5e61715f02..2ed61bec3c3e 100644 --- a/src/material-experimental/mdc-menu/BUILD.bazel +++ b/src/material-experimental/mdc-menu/BUILD.bazel @@ -32,8 +32,8 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -67,8 +67,6 @@ ng_test_library( deps = [ ":harness", ":mdc-menu", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", "//src/cdk/a11y", "//src/cdk/bidi", "//src/cdk/keycodes", @@ -76,6 +74,7 @@ ng_test_library( "//src/cdk/private/testing", "//src/cdk/scrolling", "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/core", "//src/material/menu", "@npm//@angular/platform-browser", diff --git a/src/material-experimental/mdc-menu/harness/mdc-menu-harness.ts b/src/material-experimental/mdc-menu/harness/mdc-menu-harness.ts index d06cc1ddb3a6..5f3b21a0040e 100644 --- a/src/material-experimental/mdc-menu/harness/mdc-menu-harness.ts +++ b/src/material-experimental/mdc-menu/harness/mdc-menu-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; import {MatMenuItemHarness} from './mdc-menu-item-harness'; import {MenuHarnessFilters} from './menu-harness-filters'; diff --git a/src/material-experimental/mdc-menu/harness/mdc-menu-item-harness.ts b/src/material-experimental/mdc-menu/harness/mdc-menu-item-harness.ts index a8a69c170679..ca4c7ed50056 100644 --- a/src/material-experimental/mdc-menu/harness/mdc-menu-item-harness.ts +++ b/src/material-experimental/mdc-menu/harness/mdc-menu-item-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; import {MenuItemHarnessFilters} from './menu-harness-filters'; diff --git a/src/material-experimental/mdc-menu/harness/menu-harness-filters.ts b/src/material-experimental/mdc-menu/harness/menu-harness-filters.ts index d47d9c93e893..314068022393 100644 --- a/src/material-experimental/mdc-menu/harness/menu-harness-filters.ts +++ b/src/material-experimental/mdc-menu/harness/menu-harness-filters.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {BaseHarnessFilters} from '@angular/cdk-experimental/testing'; +import {BaseHarnessFilters} from '@angular/cdk/testing'; export interface MenuHarnessFilters extends BaseHarnessFilters { triggerText?: string | RegExp; diff --git a/src/material-experimental/mdc-menu/harness/menu-harness.spec.ts b/src/material-experimental/mdc-menu/harness/menu-harness.spec.ts index 65abc91693ce..ce10815a3806 100644 --- a/src/material-experimental/mdc-menu/harness/menu-harness.spec.ts +++ b/src/material-experimental/mdc-menu/harness/menu-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component, Type} from '@angular/core'; import {ComponentFixture, TestBed, inject} from '@angular/core/testing'; import {MatMenuModule} from '@angular/material/menu'; diff --git a/src/material-experimental/mdc-menu/harness/menu-harness.ts b/src/material-experimental/mdc-menu/harness/menu-harness.ts index 2f03a1dbb427..d9b245d269b7 100644 --- a/src/material-experimental/mdc-menu/harness/menu-harness.ts +++ b/src/material-experimental/mdc-menu/harness/menu-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; import {MenuHarnessFilters} from './menu-harness-filters'; import {MatMenuItemHarness} from './menu-item-harness'; diff --git a/src/material-experimental/mdc-menu/harness/menu-item-harness.ts b/src/material-experimental/mdc-menu/harness/menu-item-harness.ts index 4db78c0ff4f9..224a338e5b8c 100644 --- a/src/material-experimental/mdc-menu/harness/menu-item-harness.ts +++ b/src/material-experimental/mdc-menu/harness/menu-item-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; import {MenuItemHarnessFilters} from './menu-harness-filters'; diff --git a/src/material-experimental/mdc-progress-bar/BUILD.bazel b/src/material-experimental/mdc-progress-bar/BUILD.bazel index 79c3513fdac6..e8378a76979c 100644 --- a/src/material-experimental/mdc-progress-bar/BUILD.bazel +++ b/src/material-experimental/mdc-progress-bar/BUILD.bazel @@ -9,8 +9,8 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -21,10 +21,9 @@ ng_test_library( ), deps = [ ":harness", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", "//src/cdk/coercion", "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/progress-bar", ], ) diff --git a/src/material-experimental/mdc-progress-bar/harness/progress-bar-harness.spec.ts b/src/material-experimental/mdc-progress-bar/harness/progress-bar-harness.spec.ts index d8b520061cf8..eb3e0f32578b 100644 --- a/src/material-experimental/mdc-progress-bar/harness/progress-bar-harness.spec.ts +++ b/src/material-experimental/mdc-progress-bar/harness/progress-bar-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatProgressBarModule} from '@angular/material/progress-bar'; diff --git a/src/material-experimental/mdc-progress-bar/harness/progress-bar-harness.ts b/src/material-experimental/mdc-progress-bar/harness/progress-bar-harness.ts index d60a5cc7d91f..1ea09a63c291 100644 --- a/src/material-experimental/mdc-progress-bar/harness/progress-bar-harness.ts +++ b/src/material-experimental/mdc-progress-bar/harness/progress-bar-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness} from '@angular/cdk-experimental/testing'; +import {ComponentHarness} from '@angular/cdk/testing'; import {coerceNumberProperty} from '@angular/cdk/coercion'; /** diff --git a/src/material-experimental/mdc-progress-spinner/BUILD.bazel b/src/material-experimental/mdc-progress-spinner/BUILD.bazel index 1c53c28f331b..f9ccae46fa96 100644 --- a/src/material-experimental/mdc-progress-spinner/BUILD.bazel +++ b/src/material-experimental/mdc-progress-spinner/BUILD.bazel @@ -9,8 +9,8 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", "//src/cdk/coercion", + "//src/cdk/testing", "//src/material/progress-spinner", ], ) @@ -22,9 +22,8 @@ ng_test_library( ), deps = [ ":harness", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/progress-spinner", ], ) diff --git a/src/material-experimental/mdc-progress-spinner/harness/progress-spinner-harness.spec.ts b/src/material-experimental/mdc-progress-spinner/harness/progress-spinner-harness.spec.ts index 77864ca622ab..4365d9b7d10f 100644 --- a/src/material-experimental/mdc-progress-spinner/harness/progress-spinner-harness.spec.ts +++ b/src/material-experimental/mdc-progress-spinner/harness/progress-spinner-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatProgressSpinnerModule, ProgressSpinnerMode} from '@angular/material/progress-spinner'; diff --git a/src/material-experimental/mdc-progress-spinner/harness/progress-spinner-harness.ts b/src/material-experimental/mdc-progress-spinner/harness/progress-spinner-harness.ts index dec66a7b08d1..09904216b53d 100644 --- a/src/material-experimental/mdc-progress-spinner/harness/progress-spinner-harness.ts +++ b/src/material-experimental/mdc-progress-spinner/harness/progress-spinner-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness} from '@angular/cdk-experimental/testing'; +import {ComponentHarness} from '@angular/cdk/testing'; import {ProgressSpinnerMode} from '@angular/material/progress-spinner'; import {coerceNumberProperty} from '@angular/cdk/coercion'; diff --git a/src/material-experimental/mdc-radio/harness/BUILD.bazel b/src/material-experimental/mdc-radio/harness/BUILD.bazel index 28a1dd42d816..02916ef92407 100644 --- a/src/material-experimental/mdc-radio/harness/BUILD.bazel +++ b/src/material-experimental/mdc-radio/harness/BUILD.bazel @@ -9,8 +9,8 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -19,8 +19,8 @@ ng_test_library( srcs = glob(["**/*.spec.ts"]), deps = [ ":harness", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", + "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/radio", "@npm//@angular/forms", ], diff --git a/src/material-experimental/mdc-radio/harness/radio-harness-filters.ts b/src/material-experimental/mdc-radio/harness/radio-harness-filters.ts index 3b24768c0d3f..ebd91da2ddcd 100644 --- a/src/material-experimental/mdc-radio/harness/radio-harness-filters.ts +++ b/src/material-experimental/mdc-radio/harness/radio-harness-filters.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {BaseHarnessFilters} from '@angular/cdk-experimental/testing'; +import {BaseHarnessFilters} from '@angular/cdk/testing'; export interface RadioGroupHarnessFilters extends BaseHarnessFilters { name?: string; diff --git a/src/material-experimental/mdc-radio/harness/radio-harness.spec.ts b/src/material-experimental/mdc-radio/harness/radio-harness.spec.ts index 0a7ececb1342..61b1bb5977bb 100644 --- a/src/material-experimental/mdc-radio/harness/radio-harness.spec.ts +++ b/src/material-experimental/mdc-radio/harness/radio-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {ReactiveFormsModule} from '@angular/forms'; diff --git a/src/material-experimental/mdc-radio/harness/radio-harness.ts b/src/material-experimental/mdc-radio/harness/radio-harness.ts index e08ee98d7c46..b4bee558e531 100644 --- a/src/material-experimental/mdc-radio/harness/radio-harness.ts +++ b/src/material-experimental/mdc-radio/harness/radio-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; import {RadioButtonHarnessFilters, RadioGroupHarnessFilters} from './radio-harness-filters'; diff --git a/src/material-experimental/mdc-select/BUILD.bazel b/src/material-experimental/mdc-select/BUILD.bazel index edb021092056..97d84d0ba092 100644 --- a/src/material-experimental/mdc-select/BUILD.bazel +++ b/src/material-experimental/mdc-select/BUILD.bazel @@ -29,7 +29,7 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", + "//src/cdk/testing", ], ) @@ -64,11 +64,10 @@ ng_test_library( deps = [ ":harness", ":mdc-select", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", "//src/cdk/overlay", "//src/cdk/platform", "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/form-field", "//src/material/select", "@npm//@angular/forms", diff --git a/src/material-experimental/mdc-select/harness/mdc-select-harness.ts b/src/material-experimental/mdc-select/harness/mdc-select-harness.ts index 1e76a61b361b..ea75c9929e58 100644 --- a/src/material-experimental/mdc-select/harness/mdc-select-harness.ts +++ b/src/material-experimental/mdc-select/harness/mdc-select-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness} from '@angular/cdk-experimental/testing'; +import {ComponentHarness} from '@angular/cdk/testing'; /** diff --git a/src/material-experimental/mdc-select/harness/select-harness-filters.ts b/src/material-experimental/mdc-select/harness/select-harness-filters.ts index 563cfcf12b59..cc7556c160aa 100644 --- a/src/material-experimental/mdc-select/harness/select-harness-filters.ts +++ b/src/material-experimental/mdc-select/harness/select-harness-filters.ts @@ -6,6 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ -import {BaseHarnessFilters} from '@angular/cdk-experimental/testing'; +import {BaseHarnessFilters} from '@angular/cdk/testing'; export interface SelectHarnessFilters extends BaseHarnessFilters {} diff --git a/src/material-experimental/mdc-select/harness/select-harness.spec.ts b/src/material-experimental/mdc-select/harness/select-harness.spec.ts index 126fe6f366a8..f8883c20254e 100644 --- a/src/material-experimental/mdc-select/harness/select-harness.spec.ts +++ b/src/material-experimental/mdc-select/harness/select-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component, Type} from '@angular/core'; import {ComponentFixture, TestBed, inject} from '@angular/core/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; diff --git a/src/material-experimental/mdc-select/harness/select-harness.ts b/src/material-experimental/mdc-select/harness/select-harness.ts index fb06b98a7a79..d5b1e5e8c7fa 100644 --- a/src/material-experimental/mdc-select/harness/select-harness.ts +++ b/src/material-experimental/mdc-select/harness/select-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate, TestElement} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate, TestElement} from '@angular/cdk/testing'; import {SelectHarnessFilters} from './select-harness-filters'; /** Selector for the select panel. */ diff --git a/src/material-experimental/mdc-sidenav/BUILD.bazel b/src/material-experimental/mdc-sidenav/BUILD.bazel index f3e843f6c2b7..7485f16103e1 100644 --- a/src/material-experimental/mdc-sidenav/BUILD.bazel +++ b/src/material-experimental/mdc-sidenav/BUILD.bazel @@ -29,7 +29,7 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", + "//src/cdk/testing", ], ) @@ -62,9 +62,8 @@ ng_test_library( deps = [ ":harness", ":mdc-sidenav", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/sidenav", "@npm//@angular/platform-browser", ], diff --git a/src/material-experimental/mdc-sidenav/harness/mdc-sidenav-harness.ts b/src/material-experimental/mdc-sidenav/harness/mdc-sidenav-harness.ts index 7c92bce1cc4f..889d090b1a63 100644 --- a/src/material-experimental/mdc-sidenav/harness/mdc-sidenav-harness.ts +++ b/src/material-experimental/mdc-sidenav/harness/mdc-sidenav-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness} from '@angular/cdk-experimental/testing'; +import {ComponentHarness} from '@angular/cdk/testing'; /** diff --git a/src/material-experimental/mdc-sidenav/harness/sidenav-harness-filters.ts b/src/material-experimental/mdc-sidenav/harness/sidenav-harness-filters.ts index dbd2f2a5fc56..95f90097bced 100644 --- a/src/material-experimental/mdc-sidenav/harness/sidenav-harness-filters.ts +++ b/src/material-experimental/mdc-sidenav/harness/sidenav-harness-filters.ts @@ -6,6 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ -import {BaseHarnessFilters} from '@angular/cdk-experimental/testing'; +import {BaseHarnessFilters} from '@angular/cdk/testing'; export interface SidenavHarnessFilters extends BaseHarnessFilters {} diff --git a/src/material-experimental/mdc-sidenav/harness/sidenav-harness.spec.ts b/src/material-experimental/mdc-sidenav/harness/sidenav-harness.spec.ts index c96fb0604d95..e6440e0015f8 100644 --- a/src/material-experimental/mdc-sidenav/harness/sidenav-harness.spec.ts +++ b/src/material-experimental/mdc-sidenav/harness/sidenav-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatSidenavModule} from '@angular/material/sidenav'; diff --git a/src/material-experimental/mdc-sidenav/harness/sidenav-harness.ts b/src/material-experimental/mdc-sidenav/harness/sidenav-harness.ts index 0a3c5a9eaf33..94864d10032c 100644 --- a/src/material-experimental/mdc-sidenav/harness/sidenav-harness.ts +++ b/src/material-experimental/mdc-sidenav/harness/sidenav-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {SidenavHarnessFilters} from './sidenav-harness-filters'; /** diff --git a/src/material-experimental/mdc-slide-toggle/BUILD.bazel b/src/material-experimental/mdc-slide-toggle/BUILD.bazel index 7bee5b9c9847..d12c3d848b5d 100644 --- a/src/material-experimental/mdc-slide-toggle/BUILD.bazel +++ b/src/material-experimental/mdc-slide-toggle/BUILD.bazel @@ -35,8 +35,8 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -70,10 +70,9 @@ ng_test_library( deps = [ ":harness", ":mdc-slide-toggle", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", "//src/cdk/bidi", "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/slide-toggle", "@npm//@angular/forms", "@npm//@angular/platform-browser", diff --git a/src/material-experimental/mdc-slide-toggle/harness/mdc-slide-toggle-harness.ts b/src/material-experimental/mdc-slide-toggle/harness/mdc-slide-toggle-harness.ts index 5b4dc3bdd575..963a692f8fbc 100644 --- a/src/material-experimental/mdc-slide-toggle/harness/mdc-slide-toggle-harness.ts +++ b/src/material-experimental/mdc-slide-toggle/harness/mdc-slide-toggle-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; import {SlideToggleHarnessFilters} from './slide-toggle-harness-filters'; diff --git a/src/material-experimental/mdc-slide-toggle/harness/slide-toggle-harness-filters.ts b/src/material-experimental/mdc-slide-toggle/harness/slide-toggle-harness-filters.ts index 7e3e39c6dd39..9143009d8421 100644 --- a/src/material-experimental/mdc-slide-toggle/harness/slide-toggle-harness-filters.ts +++ b/src/material-experimental/mdc-slide-toggle/harness/slide-toggle-harness-filters.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {BaseHarnessFilters} from '@angular/cdk-experimental/testing'; +import {BaseHarnessFilters} from '@angular/cdk/testing'; export interface SlideToggleHarnessFilters extends BaseHarnessFilters { label?: string | RegExp; diff --git a/src/material-experimental/mdc-slide-toggle/harness/slide-toggle-harness.spec.ts b/src/material-experimental/mdc-slide-toggle/harness/slide-toggle-harness.spec.ts index f7629eb778ba..12224ea5f4e7 100644 --- a/src/material-experimental/mdc-slide-toggle/harness/slide-toggle-harness.spec.ts +++ b/src/material-experimental/mdc-slide-toggle/harness/slide-toggle-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {FormControl, ReactiveFormsModule} from '@angular/forms'; diff --git a/src/material-experimental/mdc-slide-toggle/harness/slide-toggle-harness.ts b/src/material-experimental/mdc-slide-toggle/harness/slide-toggle-harness.ts index b607703489fc..0589709391a2 100644 --- a/src/material-experimental/mdc-slide-toggle/harness/slide-toggle-harness.ts +++ b/src/material-experimental/mdc-slide-toggle/harness/slide-toggle-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {coerceBooleanProperty} from '@angular/cdk/coercion'; import {SlideToggleHarnessFilters} from './slide-toggle-harness-filters'; diff --git a/src/material-experimental/mdc-slider/harness/BUILD.bazel b/src/material-experimental/mdc-slider/harness/BUILD.bazel index fd28fde6bc19..f9d39239d623 100644 --- a/src/material-experimental/mdc-slider/harness/BUILD.bazel +++ b/src/material-experimental/mdc-slider/harness/BUILD.bazel @@ -9,8 +9,8 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -19,8 +19,8 @@ ng_test_library( srcs = glob(["**/*.spec.ts"]), deps = [ ":harness", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", + "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/slider", ], ) diff --git a/src/material-experimental/mdc-slider/harness/slider-harness-filters.ts b/src/material-experimental/mdc-slider/harness/slider-harness-filters.ts index 84bdc39ff3c9..ebb72c5f3464 100644 --- a/src/material-experimental/mdc-slider/harness/slider-harness-filters.ts +++ b/src/material-experimental/mdc-slider/harness/slider-harness-filters.ts @@ -5,6 +5,6 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {BaseHarnessFilters} from '@angular/cdk-experimental/testing'; +import {BaseHarnessFilters} from '@angular/cdk/testing'; export interface SliderHarnessFilters extends BaseHarnessFilters {} diff --git a/src/material-experimental/mdc-slider/harness/slider-harness.spec.ts b/src/material-experimental/mdc-slider/harness/slider-harness.spec.ts index b60eae16e270..5a43797ca518 100644 --- a/src/material-experimental/mdc-slider/harness/slider-harness.spec.ts +++ b/src/material-experimental/mdc-slider/harness/slider-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatSliderModule} from '@angular/material/slider'; diff --git a/src/material-experimental/mdc-slider/harness/slider-harness.ts b/src/material-experimental/mdc-slider/harness/slider-harness.ts index 09954dba5c52..695ccae8a9a9 100644 --- a/src/material-experimental/mdc-slider/harness/slider-harness.ts +++ b/src/material-experimental/mdc-slider/harness/slider-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion'; import {SliderHarnessFilters} from './slider-harness-filters'; diff --git a/src/material-experimental/mdc-tabs/BUILD.bazel b/src/material-experimental/mdc-tabs/BUILD.bazel index d5671021f9a7..7cb1c62e08de 100644 --- a/src/material-experimental/mdc-tabs/BUILD.bazel +++ b/src/material-experimental/mdc-tabs/BUILD.bazel @@ -99,14 +99,13 @@ ng_test_library( ), deps = [ ":mdc-tabs", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/observers", "//src/cdk/portal", "//src/cdk/scrolling", "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/core", "@npm//@angular/common", "@npm//@angular/platform-browser", diff --git a/src/material-experimental/mdc-tabs/harness/BUILD.bazel b/src/material-experimental/mdc-tabs/harness/BUILD.bazel index 3d181b78e4ce..a3b64ddfb67a 100644 --- a/src/material-experimental/mdc-tabs/harness/BUILD.bazel +++ b/src/material-experimental/mdc-tabs/harness/BUILD.bazel @@ -9,8 +9,8 @@ ts_library( exclude = ["**/*.spec.ts"], ), deps = [ - "//src/cdk-experimental/testing", "//src/cdk/coercion", + "//src/cdk/testing", ], ) @@ -19,8 +19,8 @@ ng_test_library( srcs = glob(["**/*.spec.ts"]), deps = [ ":harness", - "//src/cdk-experimental/testing", - "//src/cdk-experimental/testing/testbed", + "//src/cdk/testing", + "//src/cdk/testing/testbed", "//src/material/tabs", "@npm//@angular/platform-browser", ], diff --git a/src/material-experimental/mdc-tabs/harness/tab-group-harness-filters.ts b/src/material-experimental/mdc-tabs/harness/tab-group-harness-filters.ts index 1349aa5e1972..d69de6fad271 100644 --- a/src/material-experimental/mdc-tabs/harness/tab-group-harness-filters.ts +++ b/src/material-experimental/mdc-tabs/harness/tab-group-harness-filters.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {BaseHarnessFilters} from '@angular/cdk-experimental/testing'; +import {BaseHarnessFilters} from '@angular/cdk/testing'; export interface TabGroupHarnessFilters extends BaseHarnessFilters { selectedTabLabel?: string | RegExp; diff --git a/src/material-experimental/mdc-tabs/harness/tab-group-harness.spec.ts b/src/material-experimental/mdc-tabs/harness/tab-group-harness.spec.ts index 766d33b1736f..3f1cb5633909 100644 --- a/src/material-experimental/mdc-tabs/harness/tab-group-harness.spec.ts +++ b/src/material-experimental/mdc-tabs/harness/tab-group-harness.spec.ts @@ -1,5 +1,5 @@ -import {HarnessLoader} from '@angular/cdk-experimental/testing'; -import {TestbedHarnessEnvironment} from '@angular/cdk-experimental/testing/testbed'; +import {HarnessLoader} from '@angular/cdk/testing'; +import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatTabsModule} from '@angular/material/tabs'; diff --git a/src/material-experimental/mdc-tabs/harness/tab-group-harness.ts b/src/material-experimental/mdc-tabs/harness/tab-group-harness.ts index b871472ede75..bb1a1d249729 100644 --- a/src/material-experimental/mdc-tabs/harness/tab-group-harness.ts +++ b/src/material-experimental/mdc-tabs/harness/tab-group-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, HarnessPredicate} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; import {TabGroupHarnessFilters} from './tab-group-harness-filters'; import {MatTabHarness} from './tab-harness'; diff --git a/src/material-experimental/mdc-tabs/harness/tab-harness.ts b/src/material-experimental/mdc-tabs/harness/tab-harness.ts index 15d8118862e1..b3fb2ec6493b 100644 --- a/src/material-experimental/mdc-tabs/harness/tab-harness.ts +++ b/src/material-experimental/mdc-tabs/harness/tab-harness.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ComponentHarness, TestElement} from '@angular/cdk-experimental/testing'; +import {ComponentHarness, TestElement} from '@angular/cdk/testing'; /** * Harness for interacting with a standard Angular Material tab-label in tests. diff --git a/test/karma-system-config.js b/test/karma-system-config.js index bc5646dce737..4dd9fea1dd6b 100644 --- a/test/karma-system-config.js +++ b/test/karma-system-config.js @@ -86,15 +86,14 @@ System.config({ '@angular/cdk/stepper': 'dist/packages/cdk/stepper/index.js', '@angular/cdk/table': 'dist/packages/cdk/table/index.js', '@angular/cdk/testing': 'dist/packages/cdk/testing/index.js', + '@angular/cdk/testing/testbed': 'dist/packages/cdk/testing/testbed/index.js', + '@angular/cdk/testing/protractor': 'dist/packages/cdk/testing/protractor/index.js', '@angular/cdk/text-field': 'dist/packages/cdk/text-field/index.js', '@angular/cdk/tree': 'dist/packages/cdk/tree/index.js', '@angular/cdk-experimental/dialog': 'dist/packages/cdk-experimental/dialog/index.js', '@angular/cdk-experimental/popover-edit': 'dist/packages/cdk-experimental/popover-edit/index.js', '@angular/cdk-experimental/scrolling': 'dist/packages/cdk-experimental/scrolling/index.js', - '@angular/cdk-experimental/testing': 'dist/packages/cdk-experimental/testing/index.js', - '@angular/cdk-experimental/testing/testbed': 'dist/packages/cdk-experimental/testing/testbed/index.js', - '@angular/cdk-experimental/testing/protractor': 'dist/packages/cdk-experimental/testing/protractor/index.js', '@angular/material/autocomplete': 'dist/packages/material/autocomplete/index.js', '@angular/material/badge': 'dist/packages/material/badge/index.js', diff --git a/tools/public_api_guard/cdk/testing.d.ts b/tools/public_api_guard/cdk/testing.d.ts index a625e49763a8..91c76566d24f 100644 --- a/tools/public_api_guard/cdk/testing.d.ts +++ b/tools/public_api_guard/cdk/testing.d.ts @@ -1,5 +1,33 @@ +export declare type AsyncFactoryFn = () => Promise; + +export declare type AsyncOptionPredicate = (item: T, option: O) => Promise; + +export declare type AsyncPredicate = (item: T) => Promise; + +export interface BaseHarnessFilters { + ancestor?: string; + selector?: string; +} + export declare function clearElement(element: HTMLInputElement | HTMLTextAreaElement): void; +export declare abstract class ComponentHarness { + constructor(locatorFactory: LocatorFactory); + protected documentRootLocatorFactory(): LocatorFactory; + host(): Promise; + protected locatorFor(selector: string): AsyncFactoryFn; + protected locatorFor(harnessType: ComponentHarnessConstructor | HarnessPredicate): AsyncFactoryFn; + protected locatorForAll(selector: string): AsyncFactoryFn; + protected locatorForAll(harnessType: ComponentHarnessConstructor | HarnessPredicate): AsyncFactoryFn; + protected locatorForOptional(selector: string): AsyncFactoryFn; + protected locatorForOptional(harnessType: ComponentHarnessConstructor | HarnessPredicate): AsyncFactoryFn; +} + +export interface ComponentHarnessConstructor { + hostSelector: string; + new (locatorFactory: LocatorFactory): T; +} + export declare function createFakeEvent(type: string, canBubble?: boolean, cancelable?: boolean): Event; export declare function createKeyboardEvent(type: string, keyCode?: number, key?: string, target?: Element, modifiers?: ModifierKeys): any; @@ -18,8 +46,60 @@ export declare function dispatchMouseEvent(node: Node, type: string, x?: number, export declare function dispatchTouchEvent(node: Node, type: string, x?: number, y?: number): Event; +export declare abstract class HarnessEnvironment implements HarnessLoader, LocatorFactory { + protected rawRootElement: E; + rootElement: TestElement; + protected constructor(rawRootElement: E); + protected createComponentHarness(harnessType: ComponentHarnessConstructor, element: E): T; + protected abstract createEnvironment(element: E): HarnessEnvironment; + protected abstract createTestElement(element: E): TestElement; + documentRootLocatorFactory(): LocatorFactory; + getAllChildLoaders(selector: string): Promise; + getAllHarnesses(harnessType: ComponentHarnessConstructor | HarnessPredicate): Promise; + protected abstract getAllRawElements(selector: string): Promise; + getChildLoader(selector: string): Promise; + protected abstract getDocumentRoot(): E; + getHarness(harnessType: ComponentHarnessConstructor | HarnessPredicate): Promise; + locatorFor(harnessType: ComponentHarnessConstructor | HarnessPredicate): AsyncFactoryFn; + locatorFor(selector: string): AsyncFactoryFn; + locatorForAll(harnessType: ComponentHarnessConstructor | HarnessPredicate): AsyncFactoryFn; + locatorForAll(selector: string): AsyncFactoryFn; + locatorForOptional(harnessType: ComponentHarnessConstructor | HarnessPredicate): AsyncFactoryFn; + locatorForOptional(selector: string): AsyncFactoryFn; +} + +export interface HarnessLoader { + getAllChildLoaders(selector: string): Promise; + getAllHarnesses(harnessType: ComponentHarnessConstructor | HarnessPredicate): Promise; + getChildLoader(selector: string): Promise; + getHarness(harnessType: ComponentHarnessConstructor | HarnessPredicate): Promise; +} + +export declare class HarnessPredicate { + harnessType: ComponentHarnessConstructor; + constructor(harnessType: ComponentHarnessConstructor, options: BaseHarnessFilters); + add(description: string, predicate: AsyncPredicate): this; + addOption(name: string, option: O | undefined, predicate: AsyncOptionPredicate): this; + evaluate(harness: T): Promise; + filter(harnesses: T[]): Promise; + getDescription(): string; + getSelector(): string; + static stringMatches(s: string | Promise, pattern: string | RegExp): Promise; +} + export declare function isTextInput(element: Element): element is HTMLInputElement | HTMLTextAreaElement; +export interface LocatorFactory { + rootElement: TestElement; + documentRootLocatorFactory(): LocatorFactory; + locatorFor(selector: string): AsyncFactoryFn; + locatorFor(harnessType: ComponentHarnessConstructor | HarnessPredicate): AsyncFactoryFn; + locatorForAll(selector: string): AsyncFactoryFn; + locatorForAll(harnessType: ComponentHarnessConstructor | HarnessPredicate): AsyncFactoryFn; + locatorForOptional(selector: string): AsyncFactoryFn; + locatorForOptional(harnessType: ComponentHarnessConstructor | HarnessPredicate): AsyncFactoryFn; +} + export interface ModifierKeys { alt?: boolean; control?: boolean; @@ -29,6 +109,57 @@ export interface ModifierKeys { export declare function patchElementFocus(element: HTMLElement): void; +export interface TestElement { + blur(): Promise; + clear(): Promise; + click(relativeX?: number, relativeY?: number): Promise; + focus(): Promise; + forceStabilize(): Promise; + getAttribute(name: string): Promise; + getCssValue(property: string): Promise; + getDimensions(): Promise; + getProperty(name: string): Promise; + hasClass(name: string): Promise; + hover(): Promise; + matchesSelector(selector: string): Promise; + sendKeys(...keys: (string | TestKey)[]): Promise; + sendKeys(modifiers: ModifierKeys, ...keys: (string | TestKey)[]): Promise; + text(): Promise; +} + +export declare enum TestKey { + BACKSPACE = 0, + TAB = 1, + ENTER = 2, + SHIFT = 3, + CONTROL = 4, + ALT = 5, + ESCAPE = 6, + PAGE_UP = 7, + PAGE_DOWN = 8, + END = 9, + HOME = 10, + LEFT_ARROW = 11, + UP_ARROW = 12, + RIGHT_ARROW = 13, + DOWN_ARROW = 14, + INSERT = 15, + DELETE = 16, + F1 = 17, + F2 = 18, + F3 = 19, + F4 = 20, + F5 = 21, + F6 = 22, + F7 = 23, + F8 = 24, + F9 = 25, + F10 = 26, + F11 = 27, + F12 = 28, + META = 29 +} + export declare function triggerBlur(element: HTMLElement): void; export declare function triggerFocus(element: HTMLElement): void;