Skip to content

Commit 3052304

Browse files
crisbetommalerba
authored andcommitted
refactor: remove event faking apis from public api (#17382)
Moves the event faking APIs into `cdk/private/testing` in order to avoid exposing them in the public API of `cdk/testing`. Resolves COMP-239.
1 parent 4b48b96 commit 3052304

File tree

176 files changed

+311
-299
lines changed

Some content is hidden

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

176 files changed

+311
-299
lines changed

src/cdk-experimental/dialog/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ng_test_library(
3939
"//src/cdk/bidi",
4040
"//src/cdk/keycodes",
4141
"//src/cdk/overlay",
42-
"//src/cdk/testing",
42+
"//src/cdk/testing/private",
4343
"@npm//@angular/common",
4444
"@npm//@angular/platform-browser",
4545
],

src/cdk-experimental/dialog/dialog.spec.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ import {Directionality} from '@angular/cdk/bidi';
2626
import {CdkDialogContainer} from './dialog-container';
2727
import {OverlayContainer} from '@angular/cdk/overlay';
2828
import {A, ESCAPE} from '@angular/cdk/keycodes';
29-
import {dispatchKeyboardEvent, createKeyboardEvent, dispatchEvent} from '@angular/cdk/testing';
29+
import {
30+
dispatchKeyboardEvent,
31+
createKeyboardEvent,
32+
dispatchEvent,
33+
} from '@angular/cdk/testing/private';
3034
import {DIALOG_DATA, Dialog, DialogModule, DialogRef} from './index';
3135

3236
describe('Dialog', () => {

src/cdk-experimental/popover-edit/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ng_test_library(
3636
"//src/cdk/keycodes",
3737
"//src/cdk/overlay",
3838
"//src/cdk/table",
39-
"//src/cdk/testing",
39+
"//src/cdk/testing/private",
4040
"@npm//@angular/common",
4141
"@npm//@angular/forms",
4242
"@npm//rxjs",

src/cdk-experimental/popover-edit/popover-edit.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {DataSource} from '@angular/cdk/collections';
22
import {LEFT_ARROW, UP_ARROW, RIGHT_ARROW, DOWN_ARROW, TAB} from '@angular/cdk/keycodes';
33
import {CdkTableModule} from '@angular/cdk/table';
4-
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
4+
import {dispatchKeyboardEvent} from '@angular/cdk/testing/private';
55
import {CommonModule} from '@angular/common';
66
import {Component, Directive, ElementRef, Type, ViewChild} from '@angular/core';
77
import {ComponentFixture, fakeAsync, flush, TestBed, tick, inject} from '@angular/core/testing';

src/cdk-experimental/scrolling/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ ng_e2e_test_library(
4040
name = "e2e_test_sources",
4141
srcs = glob(["**/*.e2e.spec.ts"]),
4242
deps = [
43-
"//src/cdk/private/testing/e2e",
43+
"//src/cdk/testing/private/e2e",
4444
],
4545
)
4646

4747
e2e_test_suite(
4848
name = "e2e_tests",
4949
deps = [
5050
":e2e_test_sources",
51-
"//src/cdk/private/testing/e2e",
51+
"//src/cdk/testing/private/e2e",
5252
],
5353
)

src/cdk-experimental/tsconfig-tests.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"target": "es5",
1010
"types": ["jasmine"],
1111
"paths": {
12-
"@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"],
12+
"@angular/cdk/*": ["../../dist/packages/cdk/*"],
1313
"@angular/cdk-experimental/*": ["./*"]
1414
}
1515
},

src/cdk/a11y/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ ng_test_library(
5050
"//src/cdk/keycodes",
5151
"//src/cdk/observers",
5252
"//src/cdk/platform",
53-
"//src/cdk/testing",
53+
"//src/cdk/testing/private",
5454
"@npm//@angular/platform-browser",
5555
"@npm//rxjs",
5656
],

src/cdk/a11y/focus-monitor/focus-monitor.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
dispatchKeyboardEvent,
55
dispatchMouseEvent,
66
patchElementFocus,
7-
} from '@angular/cdk/testing';
7+
} from '@angular/cdk/testing/private';
88
import {Component, NgZone} from '@angular/core';
99
import {ComponentFixture, fakeAsync, flush, inject, TestBed, tick} from '@angular/core/testing';
1010
import {By} from '@angular/platform-browser';

src/cdk/a11y/key-manager/list-key-manager.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {DOWN_ARROW, LEFT_ARROW, RIGHT_ARROW, TAB, UP_ARROW} from '@angular/cdk/keycodes';
2-
import {createKeyboardEvent} from '@angular/cdk/testing';
2+
import {createKeyboardEvent} from '@angular/cdk/testing/private';
33
import {QueryList} from '@angular/core';
44
import {fakeAsync, tick} from '@angular/core/testing';
55
import {Subject} from 'rxjs';

src/cdk/drag-drop/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ng_test_library(
3737
"//src/cdk/bidi",
3838
"//src/cdk/platform",
3939
"//src/cdk/scrolling",
40-
"//src/cdk/testing",
40+
"//src/cdk/testing/private",
4141
"@npm//@angular/common",
4242
"@npm//rxjs",
4343
],

src/cdk/drag-drop/directives/drag.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
dispatchMouseEvent,
77
dispatchTouchEvent,
88
dispatchFakeEvent,
9-
} from '@angular/cdk/testing';
9+
} from '@angular/cdk/testing/private';
1010
import {
1111
AfterViewInit,
1212
ChangeDetectionStrategy,

src/cdk/drag-drop/drag-drop-registry.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
createTouchEvent,
77
dispatchTouchEvent,
88
dispatchFakeEvent,
9-
} from '@angular/cdk/testing';
9+
} from '@angular/cdk/testing/private';
1010
import {DragDropRegistry} from './drag-drop-registry';
1111
import {DragDropModule} from './drag-drop-module';
1212
import {CdkDrag} from './directives/drag';

src/cdk/keycodes/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ts_library(
2424
),
2525
deps = [
2626
":keycodes",
27-
"//src/cdk/testing",
27+
"//src/cdk/testing/private",
2828
"@npm//@types/jasmine",
2929
],
3030
)

src/cdk/keycodes/modifiers.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {createKeyboardEvent} from '@angular/cdk/testing';
1+
import {createKeyboardEvent} from '@angular/cdk/testing/private';
22
import {hasModifierKey} from './modifiers';
33

44
describe('keyboard modifiers', () => {

src/cdk/overlay/BUILD.bazel

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ ng_test_library(
5555
"//src/cdk/keycodes",
5656
"//src/cdk/platform",
5757
"//src/cdk/portal",
58-
"//src/cdk/private/testing",
5958
"//src/cdk/scrolling",
60-
"//src/cdk/testing",
59+
"//src/cdk/testing/private",
6160
"@npm//@angular/common",
6261
"@npm//@angular/platform-browser",
6362
"@npm//rxjs",
@@ -74,15 +73,15 @@ ng_e2e_test_library(
7473
name = "e2e_test_sources",
7574
srcs = glob(["**/*.e2e.spec.ts"]),
7675
deps = [
77-
"//src/cdk/private/testing/e2e",
76+
"//src/cdk/testing/private/e2e",
7877
],
7978
)
8079

8180
e2e_test_suite(
8281
name = "e2e_tests",
8382
deps = [
8483
":e2e_test_sources",
85-
"//src/cdk/private/testing/e2e",
84+
"//src/cdk/testing/private/e2e",
8685
],
8786
)
8887

src/cdk/overlay/keyboard/overlay-keyboard-dispatcher.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {TestBed, inject} from '@angular/core/testing';
2-
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
2+
import {dispatchKeyboardEvent} from '@angular/cdk/testing/private';
33
import {ESCAPE} from '@angular/cdk/keycodes';
44
import {Component, NgModule} from '@angular/core';
55
import {OverlayModule, OverlayContainer, Overlay} from '../index';

src/cdk/overlay/overlay-directives.spec.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ import {Component, ViewChild} from '@angular/core';
22
import {By} from '@angular/platform-browser';
33
import {ComponentFixture, TestBed, async, inject, fakeAsync, tick} from '@angular/core/testing';
44
import {Directionality} from '@angular/cdk/bidi';
5-
import {dispatchKeyboardEvent, createKeyboardEvent, dispatchEvent} from '@angular/cdk/testing';
5+
import {
6+
dispatchKeyboardEvent,
7+
createKeyboardEvent,
8+
dispatchEvent,
9+
} from '@angular/cdk/testing/private';
610
import {ESCAPE, A} from '@angular/cdk/keycodes';
711
import {CdkConnectedOverlay, OverlayModule, CdkOverlayOrigin} from './index';
812
import {OverlayContainer} from './overlay-container';

src/cdk/overlay/overlay.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import {
1010
NgZone,
1111
} from '@angular/core';
1212
import {Direction, Directionality} from '@angular/cdk/bidi';
13-
import {MockNgZone} from '@angular/cdk/private/testing';
14-
import {dispatchFakeEvent} from '@angular/cdk/testing';
13+
import {MockNgZone, dispatchFakeEvent} from '@angular/cdk/testing/private';
1514
import {
1615
ComponentPortal,
1716
PortalModule,

src/cdk/overlay/position/connected-position-strategy.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
22
import {CdkScrollable, ScrollingModule} from '@angular/cdk/scrolling';
3-
import {MockNgZone} from '@angular/cdk/private/testing';
3+
import {MockNgZone} from '@angular/cdk/testing/private';
44
import {Component, ElementRef, NgModule, NgZone} from '@angular/core';
55
import {inject, TestBed} from '@angular/core/testing';
66
import {Subscription} from 'rxjs';

src/cdk/overlay/position/flexible-connected-position-strategy.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
22
import {CdkScrollable, ScrollingModule, ViewportRuler} from '@angular/cdk/scrolling';
3-
import {MockNgZone} from '@angular/cdk/private/testing';
3+
import {MockNgZone} from '@angular/cdk/testing/private';
44
import {Component, ElementRef, NgModule, NgZone} from '@angular/core';
55
import {inject, TestBed} from '@angular/core/testing';
66
import {Subscription} from 'rxjs';

src/cdk/overlay/position/global-position-strategy.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {NgModule, NgZone, Component} from '@angular/core';
22
import {TestBed, inject} from '@angular/core/testing';
3-
import {MockNgZone} from '@angular/cdk/private/testing';
3+
import {MockNgZone} from '@angular/cdk/testing/private';
44
import {PortalModule, ComponentPortal} from '@angular/cdk/portal';
55
import {OverlayModule, Overlay, OverlayConfig, OverlayRef, OverlayContainer} from '../index';
66

src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {browser, Key, element, by} from 'protractor';
2-
import {getScrollPosition} from '@angular/cdk/private/testing/e2e';
2+
import {getScrollPosition} from '@angular/cdk/testing/private/e2e';
33

44

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

src/cdk/private/testing/BUILD.bazel

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

src/cdk/scrolling/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ ng_test_library(
4343
":scrolling",
4444
"//src/cdk/bidi",
4545
"//src/cdk/collections",
46-
"//src/cdk/testing",
46+
"//src/cdk/testing/private",
4747
"@npm//rxjs",
4848
],
4949
)

src/cdk/scrolling/scroll-dispatcher.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {inject, TestBed, async, fakeAsync, ComponentFixture, tick} from '@angular/core/testing';
22
import {NgModule, Component, ViewChild, ElementRef} from '@angular/core';
33
import {CdkScrollable, ScrollDispatcher, ScrollingModule} from './public-api';
4-
import {dispatchFakeEvent} from '@angular/cdk/testing';
4+
import {dispatchFakeEvent} from '@angular/cdk/testing/private';
55

66
describe('ScrollDispatcher', () => {
77

src/cdk/scrolling/viewport-ruler.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {TestBed, inject, fakeAsync, tick} from '@angular/core/testing';
22
import {ScrollingModule} from './public-api';
33
import {ViewportRuler} from './viewport-ruler';
4-
import {dispatchFakeEvent} from '@angular/cdk/testing';
4+
import {dispatchFakeEvent} from '@angular/cdk/testing/private';
55
import {NgZone} from '@angular/core';
66

77
// For all tests, we assume the browser window is 1024x786 (outerWidth x outerHeight).

src/cdk/scrolling/virtual-scroll-viewport.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
ScrollDispatcher,
66
ScrollingModule
77
} from '@angular/cdk/scrolling';
8-
import {dispatchFakeEvent} from '@angular/cdk/testing';
8+
import {dispatchFakeEvent} from '@angular/cdk/testing/private';
99
import {
1010
Component,
1111
Input,

src/cdk/testing/fake-events/index.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
// These are private APIs that are used both by the public APIs inside of this package, as well as
10+
// in the unit tests of other packages, hence why we need to re-export them through here.
11+
export * from './dispatch-events';
12+
export * from './event-objects';
13+
export * from './element-focus';
14+
export * from './type-in-element';

src/cdk/testing/type-in-element.ts renamed to src/cdk/testing/fake-events/type-in-element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import {ModifierKeys} from './event-objects';
1515
* @docs-private
1616
*/
1717
export function isTextInput(element: Element): element is HTMLInputElement | HTMLTextAreaElement {
18-
return element.nodeName.toLowerCase() === 'input' ||
19-
element.nodeName.toLowerCase() === 'textarea' ;
18+
const nodeName = element.nodeName.toLowerCase();
19+
return nodeName === 'input' || nodeName === 'textarea' ;
2020
}
2121

2222
/**

src/cdk/testing/private/BUILD.bazel

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
load("//tools:defaults.bzl", "ts_library")
4+
5+
ts_library(
6+
name = "private",
7+
srcs = glob(
8+
["**/*.ts"],
9+
exclude = ["**/*.spec.ts"],
10+
),
11+
module_name = "@angular/cdk/testing/private",
12+
deps = [
13+
"//src/cdk/testing",
14+
"@npm//@angular/core",
15+
"@npm//@types/jasmine",
16+
],
17+
)

src/cdk/private/testing/e2e/BUILD.bazel renamed to src/cdk/testing/private/e2e/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ exports_files(["tsconfig-e2e.json"])
77
ng_e2e_test_library(
88
name = "e2e",
99
srcs = glob(["**/*.ts"]),
10-
module_name = "@angular/cdk/private/testing/e2e",
10+
module_name = "@angular/cdk/testing/private/e2e",
1111
)
File renamed without changes.

src/cdk/private/testing/public-api.ts renamed to src/cdk/testing/private/public-api.ts

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

9+
export * from '../fake-events'; // Re-exported for convenince.
910
export * from './expect-async-error';
1011
export * from './wrapped-error-message';
1112
export * from './mock-ng-zone';

src/cdk/testing/protractor/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ts_library(
1111
module_name = "@angular/cdk/testing/protractor",
1212
deps = [
1313
"//src/cdk/testing",
14+
"//src/cdk/testing/private",
1415
"@npm//protractor",
1516
],
1617
)

src/cdk/testing/protractor/protractor-element.ts

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

9-
import {ModifierKeys} from '@angular/cdk/testing';
109
import {browser, ElementFinder, Key} from 'protractor';
1110
import {ElementDimensions} from '../element-dimensions';
1211
import {TestElement, TestKey} from '../test-element';
12+
import {ModifierKeys} from '../fake-events';
1313

1414
/** Maps the `TestKey` constants to Protractor's `Key` constants. */
1515
const keyMap = {

src/cdk/testing/public-api.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@
77
*/
88

99
export * from './component-harness';
10-
export * from './dispatch-events';
11-
export * from './element-focus';
12-
export * from './event-objects';
1310
export * from './harness-environment';
1411
export * from './test-element';
15-
export * from './type-in-element';

src/cdk/testing/test-element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {ElementDimensions} from './element-dimensions';
10-
import {ModifierKeys} from './event-objects';
10+
import {ModifierKeys} from './fake-events';
1111

1212
/** An enum of non-text keys that can be used with the `sendKeys` method. */
1313
// NOTE: This is a separate enum from `@angular/cdk/keycodes` because we don't necessarily want to

src/cdk/testing/testbed/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ts_library(
1212
deps = [
1313
"//src/cdk/keycodes",
1414
"//src/cdk/testing",
15+
"//src/cdk/testing/private",
1516
"@npm//@angular/core",
1617
"@npm//rxjs",
1718
],

0 commit comments

Comments
 (0)