diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 61d0f67fba84..ae9cb3173605 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -65,6 +65,7 @@ /src/cdk/coercion/** @jelbourn /src/cdk/collections/** @jelbourn @crisbeto @andrewseguin /src/cdk/drag-drop/** @crisbeto +/src/cdk/private/testing/** @devversion /src/cdk/keycodes/** @jelbourn /src/cdk/layout/** @josephperrott /src/cdk/observers/** @jelbourn @crisbeto @@ -75,7 +76,7 @@ /src/cdk/scrolling/** @andrewseguin @crisbeto /src/cdk/stepper/** @mmalerba /src/cdk/table/** @andrewseguin -/src/cdk/testing/** @devversion +/src/cdk/testing/** @mmalerba @devversion /src/cdk/text-field/** @mmalerba /src/cdk/tree/** @jelbourn @andrewseguin diff --git a/src/cdk-experimental/scrolling/BUILD.bazel b/src/cdk-experimental/scrolling/BUILD.bazel index 8680540155bb..60ce9e543994 100644 --- a/src/cdk-experimental/scrolling/BUILD.bazel +++ b/src/cdk-experimental/scrolling/BUILD.bazel @@ -40,7 +40,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -48,6 +48,6 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/cdk-experimental/testing/protractor/BUILD b/src/cdk-experimental/testing/protractor/BUILD.bazel similarity index 100% rename from src/cdk-experimental/testing/protractor/BUILD rename to src/cdk-experimental/testing/protractor/BUILD.bazel diff --git a/src/cdk-experimental/testing/testbed/BUILD b/src/cdk-experimental/testing/testbed/BUILD.bazel similarity index 100% rename from src/cdk-experimental/testing/testbed/BUILD rename to src/cdk-experimental/testing/testbed/BUILD.bazel diff --git a/src/cdk/overlay/BUILD.bazel b/src/cdk/overlay/BUILD.bazel index e3e3c9c5775c..4374492e6954 100644 --- a/src/cdk/overlay/BUILD.bazel +++ b/src/cdk/overlay/BUILD.bazel @@ -54,6 +54,7 @@ ng_test_library( "//src/cdk/keycodes", "//src/cdk/platform", "//src/cdk/portal", + "//src/cdk/private/testing", "//src/cdk/scrolling", "//src/cdk/testing", "@npm//@angular/common", @@ -72,7 +73,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -80,7 +81,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/cdk/overlay/overlay.spec.ts b/src/cdk/overlay/overlay.spec.ts index c40aecc5269c..d2231a50d469 100644 --- a/src/cdk/overlay/overlay.spec.ts +++ b/src/cdk/overlay/overlay.spec.ts @@ -10,7 +10,8 @@ import { NgZone, } from '@angular/core'; import {Direction, Directionality} from '@angular/cdk/bidi'; -import {dispatchFakeEvent, MockNgZone} from '@angular/cdk/testing'; +import {MockNgZone} from '@angular/cdk/private/testing'; +import {dispatchFakeEvent} from '@angular/cdk/testing'; import { ComponentPortal, PortalModule, diff --git a/src/cdk/overlay/position/connected-position-strategy.spec.ts b/src/cdk/overlay/position/connected-position-strategy.spec.ts index 09a049dde797..ae5be0ae81f9 100644 --- a/src/cdk/overlay/position/connected-position-strategy.spec.ts +++ b/src/cdk/overlay/position/connected-position-strategy.spec.ts @@ -1,6 +1,6 @@ import {ComponentPortal, PortalModule} from '@angular/cdk/portal'; import {CdkScrollable, ScrollingModule} from '@angular/cdk/scrolling'; -import {MockNgZone} from '@angular/cdk/testing'; +import {MockNgZone} from '@angular/cdk/private/testing'; import {Component, ElementRef, NgModule, NgZone} from '@angular/core'; import {inject, TestBed} from '@angular/core/testing'; import {Subscription} from 'rxjs'; diff --git a/src/cdk/overlay/position/flexible-connected-position-strategy.spec.ts b/src/cdk/overlay/position/flexible-connected-position-strategy.spec.ts index 4609aaad4349..7aa7cb491375 100644 --- a/src/cdk/overlay/position/flexible-connected-position-strategy.spec.ts +++ b/src/cdk/overlay/position/flexible-connected-position-strategy.spec.ts @@ -1,6 +1,6 @@ import {ComponentPortal, PortalModule} from '@angular/cdk/portal'; import {CdkScrollable, ScrollingModule, ViewportRuler} from '@angular/cdk/scrolling'; -import {MockNgZone} from '@angular/cdk/testing'; +import {MockNgZone} from '@angular/cdk/private/testing'; import {Component, ElementRef, NgModule, NgZone} from '@angular/core'; import {inject, TestBed} from '@angular/core/testing'; import {Subscription} from 'rxjs'; diff --git a/src/cdk/overlay/position/global-position-strategy.spec.ts b/src/cdk/overlay/position/global-position-strategy.spec.ts index bc5cdd74ef2e..871fc7a13e63 100644 --- a/src/cdk/overlay/position/global-position-strategy.spec.ts +++ b/src/cdk/overlay/position/global-position-strategy.spec.ts @@ -1,6 +1,6 @@ import {NgModule, NgZone, Component} from '@angular/core'; import {TestBed, inject} from '@angular/core/testing'; -import {MockNgZone} from '@angular/cdk/testing'; +import {MockNgZone} from '@angular/cdk/private/testing'; import {PortalModule, ComponentPortal} from '@angular/cdk/portal'; import {OverlayModule, Overlay, OverlayConfig, OverlayRef, OverlayContainer} from '../index'; diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts b/src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts index ec1c15cf4a21..fe9c22d0bc30 100644 --- a/src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts +++ b/src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser, Key, element, by} from 'protractor'; -import {getScrollPosition} from '@angular/cdk/testing/e2e'; +import {getScrollPosition} from '@angular/cdk/private/testing/e2e'; describe('scroll blocking', () => { diff --git a/src/cdk/private/testing/BUILD.bazel b/src/cdk/private/testing/BUILD.bazel new file mode 100644 index 000000000000..57095d4d9221 --- /dev/null +++ b/src/cdk/private/testing/BUILD.bazel @@ -0,0 +1,15 @@ +package(default_visibility = ["//visibility:public"]) + +load("//tools:defaults.bzl", "ts_library") + +ts_library( + name = "testing", + srcs = glob( + ["**/*.ts"], + exclude = ["**/*.spec.ts"], + ), + module_name = "@angular/cdk/private/testing", + deps = [ + "@npm//@angular/core", + ], +) diff --git a/src/cdk/testing/e2e/BUILD.bazel b/src/cdk/private/testing/e2e/BUILD.bazel similarity index 80% rename from src/cdk/testing/e2e/BUILD.bazel rename to src/cdk/private/testing/e2e/BUILD.bazel index 80d57ba4abd3..bf9f111b3cb4 100644 --- a/src/cdk/testing/e2e/BUILD.bazel +++ b/src/cdk/private/testing/e2e/BUILD.bazel @@ -7,5 +7,5 @@ exports_files(["tsconfig-e2e.json"]) ng_e2e_test_library( name = "e2e", srcs = glob(["**/*.ts"]), - module_name = "@angular/cdk/testing/e2e", + module_name = "@angular/cdk/private/testing/e2e", ) diff --git a/src/cdk/testing/e2e/actions.ts b/src/cdk/private/testing/e2e/actions.ts similarity index 100% rename from src/cdk/testing/e2e/actions.ts rename to src/cdk/private/testing/e2e/actions.ts diff --git a/src/cdk/testing/e2e/asserts.ts b/src/cdk/private/testing/e2e/asserts.ts similarity index 100% rename from src/cdk/testing/e2e/asserts.ts rename to src/cdk/private/testing/e2e/asserts.ts diff --git a/src/cdk/testing/e2e/index.ts b/src/cdk/private/testing/e2e/index.ts similarity index 100% rename from src/cdk/testing/e2e/index.ts rename to src/cdk/private/testing/e2e/index.ts diff --git a/src/cdk/testing/e2e/query.ts b/src/cdk/private/testing/e2e/query.ts similarity index 100% rename from src/cdk/testing/e2e/query.ts rename to src/cdk/private/testing/e2e/query.ts diff --git a/src/cdk/private/testing/index.ts b/src/cdk/private/testing/index.ts new file mode 100644 index 000000000000..676ca90f1ffa --- /dev/null +++ b/src/cdk/private/testing/index.ts @@ -0,0 +1,9 @@ +/** + * @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/mock-ng-zone.ts b/src/cdk/private/testing/mock-ng-zone.ts similarity index 100% rename from src/cdk/testing/mock-ng-zone.ts rename to src/cdk/private/testing/mock-ng-zone.ts diff --git a/src/cdk/private/testing/public-api.ts b/src/cdk/private/testing/public-api.ts new file mode 100644 index 000000000000..b0e9f7f02cc8 --- /dev/null +++ b/src/cdk/private/testing/public-api.ts @@ -0,0 +1,10 @@ +/** + * @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 './wrapped-error-message'; +export * from './mock-ng-zone'; diff --git a/src/cdk/testing/wrapped-error-message.ts b/src/cdk/private/testing/wrapped-error-message.ts similarity index 100% rename from src/cdk/testing/wrapped-error-message.ts rename to src/cdk/private/testing/wrapped-error-message.ts diff --git a/src/cdk/testing/dispatch-events.ts b/src/cdk/testing/dispatch-events.ts index d1970f344218..ae14aee84a7d 100644 --- a/src/cdk/testing/dispatch-events.ts +++ b/src/cdk/testing/dispatch-events.ts @@ -13,30 +13,45 @@ import { createTouchEvent } from './event-objects'; -/** Utility to dispatch any event on a Node. */ +/** + * Utility to dispatch any event on a Node. + * @docs-private + */ export function dispatchEvent(node: Node | Window, event: Event): Event { node.dispatchEvent(event); return event; } -/** Shorthand to dispatch a fake event on a specified node. */ +/** + * Shorthand to dispatch a fake event on a specified node. + * @docs-private + */ export function dispatchFakeEvent(node: Node | Window, type: string, canBubble?: boolean): Event { return dispatchEvent(node, createFakeEvent(type, canBubble)); } -/** Shorthand to dispatch a keyboard event with a specified key code. */ +/** + * Shorthand to dispatch a keyboard event with a specified key code. + * @docs-private + */ export function dispatchKeyboardEvent(node: Node, type: string, keyCode: number, target?: Element): KeyboardEvent { return dispatchEvent(node, createKeyboardEvent(type, keyCode, target)) as KeyboardEvent; } -/** Shorthand to dispatch a mouse event on the specified coordinates. */ +/** + * Shorthand to dispatch a mouse event on the specified coordinates. + * @docs-private + */ export function dispatchMouseEvent(node: Node, type: string, x = 0, y = 0, event = createMouseEvent(type, x, y)): MouseEvent { return dispatchEvent(node, event) as MouseEvent; } -/** Shorthand to dispatch a touch event on the specified coordinates. */ +/** + * Shorthand to dispatch a touch event on the specified coordinates. + * @docs-private + */ export function dispatchTouchEvent(node: Node, type: string, x = 0, y = 0) { return dispatchEvent(node, createTouchEvent(type, x, y)); } diff --git a/src/cdk/testing/element-focus.ts b/src/cdk/testing/element-focus.ts index d7ba09db14f3..075ce6913ba1 100644 --- a/src/cdk/testing/element-focus.ts +++ b/src/cdk/testing/element-focus.ts @@ -8,16 +8,6 @@ import {dispatchFakeEvent} from './dispatch-events'; -/** - * Patches an elements focus and blur methods to emit events consistently and predictably. - * This is necessary, because some browsers, like IE11, will call the focus handlers asynchronously, - * while others won't fire them at all if the browser window is not focused. - */ -export function patchElementFocus(element: HTMLElement) { - element.focus = () => dispatchFakeEvent(element, 'focus'); - element.blur = () => dispatchFakeEvent(element, 'blur'); -} - function triggerFocusChange(element: HTMLElement, event: 'focus' | 'blur') { let eventFired = false; const handler = () => eventFired = true; @@ -29,10 +19,23 @@ function triggerFocusChange(element: HTMLElement, event: 'focus' | 'blur') { } } +/** + * Patches an elements focus and blur methods to emit events consistently and predictably. + * This is necessary, because some browsers, like IE11, will call the focus handlers asynchronously, + * while others won't fire them at all if the browser window is not focused. + * @docs-private + */ +export function patchElementFocus(element: HTMLElement) { + element.focus = () => dispatchFakeEvent(element, 'focus'); + element.blur = () => dispatchFakeEvent(element, 'blur'); +} + +/** @docs-private */ export function triggerFocus(element: HTMLElement) { triggerFocusChange(element, 'focus'); } +/** @docs-private */ export function triggerBlur(element: HTMLElement) { triggerFocusChange(element, 'blur'); } diff --git a/src/cdk/testing/event-objects.ts b/src/cdk/testing/event-objects.ts index 4f57a121d6d8..dbc0e6914829 100644 --- a/src/cdk/testing/event-objects.ts +++ b/src/cdk/testing/event-objects.ts @@ -6,7 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ -/** Creates a browser MouseEvent with the specified options. */ +/** + * Creates a browser MouseEvent with the specified options. + * @docs-private + */ export function createMouseEvent(type: string, x = 0, y = 0, button = 0) { const event = document.createEvent('MouseEvent'); @@ -33,7 +36,10 @@ export function createMouseEvent(type: string, x = 0, y = 0, button = 0) { return event; } -/** Creates a browser TouchEvent with the specified pointer coordinates. */ +/** + * Creates a browser TouchEvent with the specified pointer coordinates. + * @docs-private + */ export function createTouchEvent(type: string, pageX = 0, pageY = 0) { // In favor of creating events that work for most of the browsers, the event is created // as a basic UI Event. The necessary details for the event will be set manually. @@ -53,7 +59,10 @@ export function createTouchEvent(type: string, pageX = 0, pageY = 0) { return event; } -/** Dispatches a keydown event from an element. */ +/** + * Dispatches a keydown event from an element. + * @docs-private + */ export function createKeyboardEvent(type: string, keyCode: number, target?: Element, key?: string) { let event = document.createEvent('KeyboardEvent') as any; let originalPreventDefault = event.preventDefault; @@ -82,7 +91,10 @@ export function createKeyboardEvent(type: string, keyCode: number, target?: Elem return event; } -/** Creates a fake event object with any desired event type. */ +/** + * Creates a fake event object with any desired event type. + * @docs-private + */ export function createFakeEvent(type: string, canBubble = false, cancelable = true) { const event = document.createEvent('Event'); event.initEvent(type, canBubble, cancelable); diff --git a/src/cdk/testing/public-api.ts b/src/cdk/testing/public-api.ts index 819791050ca7..e1cdbe4e352a 100644 --- a/src/cdk/testing/public-api.ts +++ b/src/cdk/testing/public-api.ts @@ -9,6 +9,4 @@ export * from './dispatch-events'; export * from './event-objects'; export * from './type-in-element'; -export * from './wrapped-error-message'; -export * from './mock-ng-zone'; export * from './element-focus'; diff --git a/src/cdk/testing/type-in-element.ts b/src/cdk/testing/type-in-element.ts index 4a16bf588965..ba33d8a6550a 100644 --- a/src/cdk/testing/type-in-element.ts +++ b/src/cdk/testing/type-in-element.ts @@ -13,6 +13,7 @@ import {dispatchFakeEvent} from './dispatch-events'; * the `input` event, simulating the user typing. * @param value Value to be set on the input. * @param element Element onto which to set the value. + * @docs-private */ export function typeInElement(value: string, element: HTMLInputElement) { element.focus(); diff --git a/src/material-experimental/mdc-button/BUILD.bazel b/src/material-experimental/mdc-button/BUILD.bazel index 9cdc67e24ca5..8bc27146defc 100644 --- a/src/material-experimental/mdc-button/BUILD.bazel +++ b/src/material-experimental/mdc-button/BUILD.bazel @@ -115,7 +115,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -123,6 +123,6 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material-experimental/mdc-card/BUILD.bazel b/src/material-experimental/mdc-card/BUILD.bazel index f891dbf59bdc..c18afd08558d 100644 --- a/src/material-experimental/mdc-card/BUILD.bazel +++ b/src/material-experimental/mdc-card/BUILD.bazel @@ -35,7 +35,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -43,6 +43,6 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material-experimental/mdc-checkbox/BUILD.bazel b/src/material-experimental/mdc-checkbox/BUILD.bazel index 4fdf3dd4e1c3..21aafed54e91 100644 --- a/src/material-experimental/mdc-checkbox/BUILD.bazel +++ b/src/material-experimental/mdc-checkbox/BUILD.bazel @@ -94,7 +94,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -102,6 +102,6 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material-experimental/mdc-chips/BUILD.bazel b/src/material-experimental/mdc-chips/BUILD.bazel index c6af183692d7..bcef509699f7 100644 --- a/src/material-experimental/mdc-chips/BUILD.bazel +++ b/src/material-experimental/mdc-chips/BUILD.bazel @@ -57,6 +57,7 @@ ng_test_library( "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/platform", + "//src/cdk/private/testing", "//src/cdk/testing", "//src/material/core", "//src/material/form-field", diff --git a/src/material-experimental/mdc-chips/chip-grid.spec.ts b/src/material-experimental/mdc-chips/chip-grid.spec.ts index 2e294ec820aa..588667d69b36 100644 --- a/src/material-experimental/mdc-chips/chip-grid.spec.ts +++ b/src/material-experimental/mdc-chips/chip-grid.spec.ts @@ -9,13 +9,13 @@ import { SPACE, TAB } from '@angular/cdk/keycodes'; +import {MockNgZone} from '@angular/cdk/private/testing'; import { createFakeEvent, createKeyboardEvent, dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent, - MockNgZone, typeInElement, } from '@angular/cdk/testing'; import { diff --git a/src/material-experimental/mdc-chips/chip-listbox.spec.ts b/src/material-experimental/mdc-chips/chip-listbox.spec.ts index a3dadda74cb1..44eae9762af7 100644 --- a/src/material-experimental/mdc-chips/chip-listbox.spec.ts +++ b/src/material-experimental/mdc-chips/chip-listbox.spec.ts @@ -8,11 +8,11 @@ import { SPACE, TAB, } from '@angular/cdk/keycodes'; +import {MockNgZone} from '@angular/cdk/private/testing'; import { createKeyboardEvent, dispatchFakeEvent, dispatchKeyboardEvent, - MockNgZone, } from '@angular/cdk/testing'; import { Component, diff --git a/src/material-experimental/mdc-menu/BUILD.bazel b/src/material-experimental/mdc-menu/BUILD.bazel index 28dd6c0dd9e9..b13304bb1984 100644 --- a/src/material-experimental/mdc-menu/BUILD.bazel +++ b/src/material-experimental/mdc-menu/BUILD.bazel @@ -56,6 +56,7 @@ ng_test_library( "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/overlay", + "//src/cdk/private/testing", "//src/cdk/scrolling", "//src/cdk/testing", "//src/material/core", @@ -75,7 +76,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -83,6 +84,6 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material-experimental/mdc-menu/menu.e2e.spec.ts b/src/material-experimental/mdc-menu/menu.e2e.spec.ts index 4a79dddc37f3..dbeb914eab75 100644 --- a/src/material-experimental/mdc-menu/menu.e2e.spec.ts +++ b/src/material-experimental/mdc-menu/menu.e2e.spec.ts @@ -5,7 +5,7 @@ import { expectLocation, expectToExist, pressKeys, -} from '@angular/cdk/testing/e2e'; +} from '@angular/cdk/private/testing/e2e'; const presenceOf = ExpectedConditions.presenceOf; const not = ExpectedConditions.not; diff --git a/src/material-experimental/mdc-menu/menu.spec.ts b/src/material-experimental/mdc-menu/menu.spec.ts index 7c9a6c6a019b..d4a289768ae5 100644 --- a/src/material-experimental/mdc-menu/menu.spec.ts +++ b/src/material-experimental/mdc-menu/menu.spec.ts @@ -20,6 +20,7 @@ import {OverlayContainer, Overlay} from '@angular/cdk/overlay'; import {ESCAPE, LEFT_ARROW, RIGHT_ARROW, DOWN_ARROW, TAB, HOME, END} from '@angular/cdk/keycodes'; import {MatMenu, MatMenuModule, MatMenuItem} from './index'; import {MatRipple} from '@angular/material/core'; +import {MockNgZone} from '@angular/cdk/private/testing'; import { dispatchKeyboardEvent, dispatchMouseEvent, @@ -28,7 +29,6 @@ import { createMouseEvent, dispatchFakeEvent, patchElementFocus, - MockNgZone, } from '@angular/cdk/testing'; import {Subject} from 'rxjs'; import {ScrollDispatcher} from '@angular/cdk/scrolling'; diff --git a/src/material-experimental/mdc-radio/BUILD.bazel b/src/material-experimental/mdc-radio/BUILD.bazel index eb74204552e2..ae706cadee97 100644 --- a/src/material-experimental/mdc-radio/BUILD.bazel +++ b/src/material-experimental/mdc-radio/BUILD.bazel @@ -44,7 +44,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -52,6 +52,6 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material-experimental/mdc-slide-toggle/BUILD.bazel b/src/material-experimental/mdc-slide-toggle/BUILD.bazel index 288f27134ff5..00a141726927 100644 --- a/src/material-experimental/mdc-slide-toggle/BUILD.bazel +++ b/src/material-experimental/mdc-slide-toggle/BUILD.bazel @@ -93,7 +93,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -101,6 +101,6 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts b/src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts index 6401e51e5f0b..cf09e551be74 100644 --- a/src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts +++ b/src/material-experimental/mdc-slide-toggle/slide-toggle.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser, element, by, Key} from 'protractor'; -import {expectToExist} from '@angular/cdk/testing/e2e'; +import {expectToExist} from '@angular/cdk/private/testing/e2e'; describe('slide-toggle', () => { diff --git a/src/material-experimental/mdc-tabs/BUILD.bazel b/src/material-experimental/mdc-tabs/BUILD.bazel index 8354a5212b37..70a6611366e3 100644 --- a/src/material-experimental/mdc-tabs/BUILD.bazel +++ b/src/material-experimental/mdc-tabs/BUILD.bazel @@ -45,7 +45,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -53,6 +53,6 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/autocomplete/BUILD.bazel b/src/material/autocomplete/BUILD.bazel index f6d1a5b81f71..721285cf5681 100644 --- a/src/material/autocomplete/BUILD.bazel +++ b/src/material/autocomplete/BUILD.bazel @@ -60,6 +60,7 @@ ng_test_library( "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/overlay", + "//src/cdk/private/testing", "//src/cdk/scrolling", "//src/cdk/testing", "//src/material/core", diff --git a/src/material/autocomplete/autocomplete.spec.ts b/src/material/autocomplete/autocomplete.spec.ts index edde6a91ac26..7aa4e0b854a1 100644 --- a/src/material/autocomplete/autocomplete.spec.ts +++ b/src/material/autocomplete/autocomplete.spec.ts @@ -2,11 +2,11 @@ import {Directionality} from '@angular/cdk/bidi'; import {DOWN_ARROW, ENTER, ESCAPE, SPACE, TAB, UP_ARROW} from '@angular/cdk/keycodes'; import {Overlay, OverlayContainer} from '@angular/cdk/overlay'; import {ScrollDispatcher} from '@angular/cdk/scrolling'; +import {MockNgZone} from '@angular/cdk/private/testing'; import { createKeyboardEvent, dispatchFakeEvent, dispatchKeyboardEvent, - MockNgZone, typeInElement, dispatchEvent, } from '@angular/cdk/testing'; diff --git a/src/material/button-toggle/BUILD.bazel b/src/material/button-toggle/BUILD.bazel index fd607fb35a33..ae460c14576b 100644 --- a/src/material/button-toggle/BUILD.bazel +++ b/src/material/button-toggle/BUILD.bazel @@ -67,7 +67,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -75,7 +75,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/button/BUILD.bazel b/src/material/button/BUILD.bazel index 56260d8849ae..ebf3dfcc135e 100644 --- a/src/material/button/BUILD.bazel +++ b/src/material/button/BUILD.bazel @@ -67,7 +67,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -75,7 +75,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/card/BUILD.bazel b/src/material/card/BUILD.bazel index e5b219560919..ed10c36220ac 100644 --- a/src/material/card/BUILD.bazel +++ b/src/material/card/BUILD.bazel @@ -37,7 +37,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -45,7 +45,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/checkbox/BUILD.bazel b/src/material/checkbox/BUILD.bazel index 665088cf5bcf..20b5ca06aefd 100644 --- a/src/material/checkbox/BUILD.bazel +++ b/src/material/checkbox/BUILD.bazel @@ -74,7 +74,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -82,7 +82,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/chips/BUILD.bazel b/src/material/chips/BUILD.bazel index 9a40c4637520..3eaac32a0ca7 100644 --- a/src/material/chips/BUILD.bazel +++ b/src/material/chips/BUILD.bazel @@ -59,6 +59,7 @@ ng_test_library( "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/platform", + "//src/cdk/private/testing", "//src/cdk/testing", "//src/material/core", "//src/material/form-field", diff --git a/src/material/chips/chip-list.spec.ts b/src/material/chips/chip-list.spec.ts index 3f9e35c4697a..126cf0f00299 100644 --- a/src/material/chips/chip-list.spec.ts +++ b/src/material/chips/chip-list.spec.ts @@ -12,13 +12,13 @@ import { HOME, END, } from '@angular/cdk/keycodes'; +import {MockNgZone} from '@angular/cdk/private/testing'; import { createKeyboardEvent, dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent, typeInElement, - MockNgZone, } from '@angular/cdk/testing'; import { Component, diff --git a/src/material/datepicker/BUILD.bazel b/src/material/datepicker/BUILD.bazel index b90de635c53c..ce66736df066 100644 --- a/src/material/datepicker/BUILD.bazel +++ b/src/material/datepicker/BUILD.bazel @@ -81,6 +81,7 @@ ng_test_library( "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/overlay", + "//src/cdk/private/testing", "//src/cdk/scrolling", "//src/cdk/testing", "//src/material/core", diff --git a/src/material/datepicker/calendar.spec.ts b/src/material/datepicker/calendar.spec.ts index 56a8184ab03e..c7c887689ffa 100644 --- a/src/material/datepicker/calendar.spec.ts +++ b/src/material/datepicker/calendar.spec.ts @@ -1,10 +1,10 @@ import {Directionality} from '@angular/cdk/bidi'; import {ENTER, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes'; +import {MockNgZone} from '@angular/cdk/private/testing'; import { dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent, - MockNgZone, } from '@angular/cdk/testing'; import {Component, NgZone} from '@angular/core'; import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing'; diff --git a/src/material/dialog/BUILD.bazel b/src/material/dialog/BUILD.bazel index ab5b7c9df5d4..23f2669899bc 100644 --- a/src/material/dialog/BUILD.bazel +++ b/src/material/dialog/BUILD.bazel @@ -76,7 +76,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -84,7 +84,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/dialog/dialog.e2e.spec.ts b/src/material/dialog/dialog.e2e.spec.ts index 2ac803f3ee83..b1985ffe2b36 100644 --- a/src/material/dialog/dialog.e2e.spec.ts +++ b/src/material/dialog/dialog.e2e.spec.ts @@ -5,7 +5,7 @@ import { pressKeys, clickElementAtPoint, waitForElement, -} from '@angular/cdk/testing/e2e'; +} from '@angular/cdk/private/testing/e2e'; describe('dialog', () => { beforeEach(async () => await browser.get('/dialog')); diff --git a/src/material/expansion/BUILD.bazel b/src/material/expansion/BUILD.bazel index b455ea7e4d67..651bdfc9997a 100644 --- a/src/material/expansion/BUILD.bazel +++ b/src/material/expansion/BUILD.bazel @@ -81,7 +81,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -89,7 +89,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/grid-list/BUILD.bazel b/src/material/grid-list/BUILD.bazel index a3ac00e9b94f..79a8f30174e6 100644 --- a/src/material/grid-list/BUILD.bazel +++ b/src/material/grid-list/BUILD.bazel @@ -62,7 +62,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -70,7 +70,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/grid-list/grid-list.e2e.spec.ts b/src/material/grid-list/grid-list.e2e.spec.ts index b3b0f1b74c55..babf815ace84 100644 --- a/src/material/grid-list/grid-list.e2e.spec.ts +++ b/src/material/grid-list/grid-list.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser} from 'protractor'; -import {expectToExist} from '@angular/cdk/testing/e2e'; +import {expectToExist} from '@angular/cdk/private/testing/e2e'; describe('grid-list', () => { beforeEach(async () => await browser.get('/grid-list')); diff --git a/src/material/icon/BUILD.bazel b/src/material/icon/BUILD.bazel index 543a8b037e7b..d94230333986 100644 --- a/src/material/icon/BUILD.bazel +++ b/src/material/icon/BUILD.bazel @@ -49,6 +49,7 @@ ng_test_library( ), deps = [ ":icon", + "//src/cdk/private/testing", "//src/cdk/testing", "@npm//@angular/common", "@npm//@angular/platform-browser", @@ -64,7 +65,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -72,7 +73,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/icon/icon.spec.ts b/src/material/icon/icon.spec.ts index f7da96d6e881..6f0c24db3346 100644 --- a/src/material/icon/icon.spec.ts +++ b/src/material/icon/icon.spec.ts @@ -5,7 +5,7 @@ import {Component} from '@angular/core'; import {MatIconModule, MAT_ICON_LOCATION} from './index'; import {MatIconRegistry, getMatIconNoHttpProviderError} from './icon-registry'; import {FAKE_SVGS} from './fake-svgs'; -import {wrappedErrorMessage} from '@angular/cdk/testing'; +import {wrappedErrorMessage} from '@angular/cdk/private/testing'; /** Returns the CSS classes assigned to an element as a sorted array. */ diff --git a/src/material/input/BUILD.bazel b/src/material/input/BUILD.bazel index 5cdce09d9ddb..3fba5f35f266 100644 --- a/src/material/input/BUILD.bazel +++ b/src/material/input/BUILD.bazel @@ -48,6 +48,7 @@ ng_test_library( ":input", "//src/cdk/bidi", "//src/cdk/platform", + "//src/cdk/private/testing", "//src/cdk/testing", "//src/material/core", "//src/material/form-field", @@ -68,7 +69,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -76,7 +77,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/input/input.spec.ts b/src/material/input/input.spec.ts index b8b3095f65fb..159581740eb8 100644 --- a/src/material/input/input.spec.ts +++ b/src/material/input/input.spec.ts @@ -1,9 +1,8 @@ import {Platform, PlatformModule} from '@angular/cdk/platform'; +import {wrappedErrorMessage, MockNgZone} from '@angular/cdk/private/testing'; import { createFakeEvent, dispatchFakeEvent, - wrappedErrorMessage, - MockNgZone, } from '@angular/cdk/testing'; import { ChangeDetectionStrategy, diff --git a/src/material/list/BUILD.bazel b/src/material/list/BUILD.bazel index d87027e4150b..30d4b4994aac 100644 --- a/src/material/list/BUILD.bazel +++ b/src/material/list/BUILD.bazel @@ -74,7 +74,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -82,7 +82,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/list/list.e2e.spec.ts b/src/material/list/list.e2e.spec.ts index 8795501bcf67..95cb6c256ea0 100644 --- a/src/material/list/list.e2e.spec.ts +++ b/src/material/list/list.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser} from 'protractor'; -import {expectToExist} from '@angular/cdk/testing/e2e'; +import {expectToExist} from '@angular/cdk/private/testing/e2e'; describe('list', () => { beforeEach(async () => await browser.get('/list')); diff --git a/src/material/menu/BUILD.bazel b/src/material/menu/BUILD.bazel index 5125348eef35..63fd67d1d906 100644 --- a/src/material/menu/BUILD.bazel +++ b/src/material/menu/BUILD.bazel @@ -62,6 +62,7 @@ ng_test_library( "//src/cdk/bidi", "//src/cdk/keycodes", "//src/cdk/overlay", + "//src/cdk/private/testing", "//src/cdk/scrolling", "//src/cdk/testing", "//src/material/core", @@ -79,7 +80,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -87,7 +88,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/menu/menu.e2e.spec.ts b/src/material/menu/menu.e2e.spec.ts index 96914679dda0..1b3d5bcc4da8 100644 --- a/src/material/menu/menu.e2e.spec.ts +++ b/src/material/menu/menu.e2e.spec.ts @@ -5,7 +5,7 @@ import { expectLocation, expectToExist, pressKeys, -} from '@angular/cdk/testing/e2e'; +} from '@angular/cdk/private/testing/e2e'; const presenceOf = ExpectedConditions.presenceOf; const not = ExpectedConditions.not; diff --git a/src/material/menu/menu.spec.ts b/src/material/menu/menu.spec.ts index c03b4c7b6522..e6517bfeaaab 100644 --- a/src/material/menu/menu.spec.ts +++ b/src/material/menu/menu.spec.ts @@ -3,6 +3,7 @@ import {Direction, Directionality} from '@angular/cdk/bidi'; import {DOWN_ARROW, END, ESCAPE, HOME, LEFT_ARROW, RIGHT_ARROW, TAB} from '@angular/cdk/keycodes'; import {Overlay, OverlayContainer} from '@angular/cdk/overlay'; import {ScrollDispatcher} from '@angular/cdk/scrolling'; +import {MockNgZone} from '@angular/cdk/private/testing'; import { createKeyboardEvent, createMouseEvent, @@ -10,7 +11,6 @@ import { dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent, - MockNgZone, patchElementFocus, } from '@angular/cdk/testing'; import { diff --git a/src/material/progress-bar/BUILD.bazel b/src/material/progress-bar/BUILD.bazel index cbc2560c094d..292e95fde765 100644 --- a/src/material/progress-bar/BUILD.bazel +++ b/src/material/progress-bar/BUILD.bazel @@ -66,7 +66,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -74,7 +74,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/progress-bar/progress-bar.e2e.spec.ts b/src/material/progress-bar/progress-bar.e2e.spec.ts index 3c2d7ccf8a19..47a5a83e8482 100644 --- a/src/material/progress-bar/progress-bar.e2e.spec.ts +++ b/src/material/progress-bar/progress-bar.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser} from 'protractor'; -import {expectToExist} from '@angular/cdk/testing/e2e'; +import {expectToExist} from '@angular/cdk/private/testing/e2e'; describe('progress-bar', () => { beforeEach(async () => await browser.get('/progress-bar')); diff --git a/src/material/progress-spinner/BUILD.bazel b/src/material/progress-spinner/BUILD.bazel index d0d54ec86f30..6fbdaf810b16 100644 --- a/src/material/progress-spinner/BUILD.bazel +++ b/src/material/progress-spinner/BUILD.bazel @@ -64,7 +64,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -72,7 +72,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/radio/BUILD.bazel b/src/material/radio/BUILD.bazel index 49956092e456..1b34ddf53ac2 100644 --- a/src/material/radio/BUILD.bazel +++ b/src/material/radio/BUILD.bazel @@ -70,7 +70,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -78,7 +78,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/select/BUILD.bazel b/src/material/select/BUILD.bazel index 2be153e1df65..72fc1fc715ff 100644 --- a/src/material/select/BUILD.bazel +++ b/src/material/select/BUILD.bazel @@ -63,6 +63,7 @@ ng_test_library( "//src/cdk/keycodes", "//src/cdk/overlay", "//src/cdk/platform", + "//src/cdk/private/testing", "//src/cdk/scrolling", "//src/cdk/testing", "//src/material/core", diff --git a/src/material/select/select.spec.ts b/src/material/select/select.spec.ts index 2a68ced25c9c..8d77a5d1ea85 100644 --- a/src/material/select/select.spec.ts +++ b/src/material/select/select.spec.ts @@ -14,12 +14,12 @@ import { import {OverlayContainer} from '@angular/cdk/overlay'; import {Platform} from '@angular/cdk/platform'; import {ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling'; +import {wrappedErrorMessage} from '@angular/cdk/private/testing'; import { createKeyboardEvent, dispatchEvent, dispatchFakeEvent, dispatchKeyboardEvent, - wrappedErrorMessage, } from '@angular/cdk/testing'; import { ChangeDetectionStrategy, diff --git a/src/material/sidenav/BUILD.bazel b/src/material/sidenav/BUILD.bazel index 2c0fea091542..e7823f4a7793 100644 --- a/src/material/sidenav/BUILD.bazel +++ b/src/material/sidenav/BUILD.bazel @@ -77,7 +77,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -85,7 +85,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/slide-toggle/BUILD.bazel b/src/material/slide-toggle/BUILD.bazel index 2ba7d502de5c..25cdab7ab9ad 100644 --- a/src/material/slide-toggle/BUILD.bazel +++ b/src/material/slide-toggle/BUILD.bazel @@ -57,6 +57,7 @@ ng_test_library( ":slide-toggle", "//src/cdk/bidi", "//src/cdk/observers", + "//src/cdk/private/testing", "//src/cdk/testing", "//src/material/testing", "@npm//@angular/forms", @@ -73,7 +74,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -81,7 +82,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/slide-toggle/slide-toggle.e2e.spec.ts b/src/material/slide-toggle/slide-toggle.e2e.spec.ts index 175d4031ac4f..c411e5d3d0db 100644 --- a/src/material/slide-toggle/slide-toggle.e2e.spec.ts +++ b/src/material/slide-toggle/slide-toggle.e2e.spec.ts @@ -1,5 +1,5 @@ import {browser, element, by, Key} from 'protractor'; -import {expectToExist} from '@angular/cdk/testing/e2e'; +import {expectToExist} from '@angular/cdk/private/testing/e2e'; describe('slide-toggle', () => { diff --git a/src/material/sort/BUILD.bazel b/src/material/sort/BUILD.bazel index 6198519894bc..77fe25feb684 100644 --- a/src/material/sort/BUILD.bazel +++ b/src/material/sort/BUILD.bazel @@ -47,6 +47,7 @@ ng_test_library( deps = [ ":sort", "//src/cdk/collections", + "//src/cdk/private/testing", "//src/cdk/table", "//src/cdk/testing", "//src/material/table", diff --git a/src/material/sort/sort.spec.ts b/src/material/sort/sort.spec.ts index 970dfa4ae347..6ea28bf2e464 100644 --- a/src/material/sort/sort.spec.ts +++ b/src/material/sort/sort.spec.ts @@ -1,10 +1,10 @@ import {CollectionViewer, DataSource} from '@angular/cdk/collections'; import {CdkTableModule} from '@angular/cdk/table'; +import {wrappedErrorMessage} from '@angular/cdk/private/testing'; import { createFakeEvent, createMouseEvent, dispatchMouseEvent, - wrappedErrorMessage } from '@angular/cdk/testing'; import {Component, ElementRef, ViewChild} from '@angular/core'; import {async, ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing'; diff --git a/src/material/stepper/BUILD.bazel b/src/material/stepper/BUILD.bazel index 1e8ab563d7f4..9530f18c8150 100644 --- a/src/material/stepper/BUILD.bazel +++ b/src/material/stepper/BUILD.bazel @@ -86,7 +86,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -94,7 +94,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/stepper/stepper.e2e.spec.ts b/src/material/stepper/stepper.e2e.spec.ts index d03f84e1c204..cf5a413e4756 100644 --- a/src/material/stepper/stepper.e2e.spec.ts +++ b/src/material/stepper/stepper.e2e.spec.ts @@ -1,6 +1,6 @@ import {browser, by, element, ElementFinder, ExpectedConditions} from 'protractor'; import {Key} from 'selenium-webdriver'; -import {expectFocusOn, expectToExist, pressKeys} from '@angular/cdk/testing/e2e'; +import {expectFocusOn, expectToExist, pressKeys} from '@angular/cdk/private/testing/e2e'; describe('stepper', () => { beforeEach(async () => await browser.get('/stepper')); diff --git a/src/material/tabs/BUILD.bazel b/src/material/tabs/BUILD.bazel index 23d1718b62d3..148757bc2ec4 100644 --- a/src/material/tabs/BUILD.bazel +++ b/src/material/tabs/BUILD.bazel @@ -113,7 +113,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -121,7 +121,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/src/material/tabs/tabs.e2e.spec.ts b/src/material/tabs/tabs.e2e.spec.ts index 6fdba6c262f4..0dce18f45509 100644 --- a/src/material/tabs/tabs.e2e.spec.ts +++ b/src/material/tabs/tabs.e2e.spec.ts @@ -6,7 +6,7 @@ import { Key, ExpectedConditions } from 'protractor'; -import {pressKeys} from '@angular/cdk/testing/e2e'; +import {pressKeys} from '@angular/cdk/private/testing/e2e'; describe('tabs', () => { describe('basic behavior', () => { diff --git a/src/material/toolbar/BUILD.bazel b/src/material/toolbar/BUILD.bazel index c8c675dd9fca..63231c0c48b6 100644 --- a/src/material/toolbar/BUILD.bazel +++ b/src/material/toolbar/BUILD.bazel @@ -63,7 +63,7 @@ ng_e2e_test_library( name = "e2e_test_sources", srcs = glob(["**/*.e2e.spec.ts"]), deps = [ - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) @@ -71,7 +71,7 @@ e2e_test_suite( name = "e2e_tests", deps = [ ":e2e_test_sources", - "//src/cdk/testing/e2e", + "//src/cdk/private/testing/e2e", ], ) diff --git a/test/karma-system-config.js b/test/karma-system-config.js index d2f3e0486d50..d810b21e1f0a 100644 --- a/test/karma-system-config.js +++ b/test/karma-system-config.js @@ -75,6 +75,7 @@ System.config({ '@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js', '@angular/cdk/collections': 'dist/packages/cdk/collections/index.js', '@angular/cdk/drag-drop': 'dist/packages/cdk/drag-drop/index.js', + '@angular/cdk/private/testing': 'dist/packages/cdk/private/testing/index.js', '@angular/cdk/keycodes': 'dist/packages/cdk/keycodes/index.js', '@angular/cdk/layout': 'dist/packages/cdk/layout/index.js', '@angular/cdk/observers': 'dist/packages/cdk/observers/index.js', diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts index 79a543320acc..fc3ac9496104 100644 --- a/tools/package-tools/rollup-globals.ts +++ b/tools/package-tools/rollup-globals.ts @@ -112,7 +112,8 @@ export const rollupGlobals = { ...rollupCdkExperimentalEntryPoints, ...rollupMaterialExperimentalEntryPoints, - '@angular/cdk/testing/e2e': 'ng.cdk.testing.e2e', + '@angular/cdk/private/testing': 'ng.cdk.private.testing', + '@angular/cdk/private/testing/e2e': 'ng.cdk.private.testing.e2e', 'rxjs': 'rxjs', 'rxjs/operators': 'rxjs.operators', diff --git a/tools/public_api_guard/cdk/testing.d.ts b/tools/public_api_guard/cdk/testing.d.ts new file mode 100644 index 000000000000..d0ef4b7b0a73 --- /dev/null +++ b/tools/public_api_guard/cdk/testing.d.ts @@ -0,0 +1,25 @@ +export declare function createFakeEvent(type: string, canBubble?: boolean, cancelable?: boolean): Event; + +export declare function createKeyboardEvent(type: string, keyCode: number, target?: Element, key?: string): any; + +export declare function createMouseEvent(type: string, x?: number, y?: number, button?: number): MouseEvent; + +export declare function createTouchEvent(type: string, pageX?: number, pageY?: number): UIEvent; + +export declare function dispatchEvent(node: Node | Window, event: Event): Event; + +export declare function dispatchFakeEvent(node: Node | Window, type: string, canBubble?: boolean): Event; + +export declare function dispatchKeyboardEvent(node: Node, type: string, keyCode: number, target?: Element): KeyboardEvent; + +export declare function dispatchMouseEvent(node: Node, type: string, x?: number, y?: number, event?: MouseEvent): MouseEvent; + +export declare function dispatchTouchEvent(node: Node, type: string, x?: number, y?: number): Event; + +export declare function patchElementFocus(element: HTMLElement): void; + +export declare function triggerBlur(element: HTMLElement): void; + +export declare function triggerFocus(element: HTMLElement): void; + +export declare function typeInElement(value: string, element: HTMLInputElement): void;