Skip to content

refactor: remove event faking apis from public api #17382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cdk-experimental/dialog/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ng_test_library(
"//src/cdk/bidi",
"//src/cdk/keycodes",
"//src/cdk/overlay",
"//src/cdk/testing",
"//src/cdk/testing/private",
"@npm//@angular/common",
"@npm//@angular/platform-browser",
],
Expand Down
6 changes: 5 additions & 1 deletion src/cdk-experimental/dialog/dialog.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ import {Directionality} from '@angular/cdk/bidi';
import {CdkDialogContainer} from './dialog-container';
import {OverlayContainer} from '@angular/cdk/overlay';
import {A, ESCAPE} from '@angular/cdk/keycodes';
import {dispatchKeyboardEvent, createKeyboardEvent, dispatchEvent} from '@angular/cdk/testing';
import {
dispatchKeyboardEvent,
createKeyboardEvent,
dispatchEvent,
} from '@angular/cdk/testing/private';
import {DIALOG_DATA, Dialog, DialogModule, DialogRef} from './index';

describe('Dialog', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/cdk-experimental/popover-edit/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ng_test_library(
"//src/cdk/keycodes",
"//src/cdk/overlay",
"//src/cdk/table",
"//src/cdk/testing",
"//src/cdk/testing/private",
"@npm//@angular/common",
"@npm//@angular/forms",
"@npm//rxjs",
Expand Down
2 changes: 1 addition & 1 deletion src/cdk-experimental/popover-edit/popover-edit.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {DataSource} from '@angular/cdk/collections';
import {LEFT_ARROW, UP_ARROW, RIGHT_ARROW, DOWN_ARROW, TAB} from '@angular/cdk/keycodes';
import {CdkTableModule} from '@angular/cdk/table';
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
import {dispatchKeyboardEvent} from '@angular/cdk/testing/private';
import {CommonModule} from '@angular/common';
import {Component, Directive, ElementRef, Type, ViewChild} from '@angular/core';
import {ComponentFixture, fakeAsync, flush, TestBed, tick, inject} from '@angular/core/testing';
Expand Down
4 changes: 2 additions & 2 deletions src/cdk-experimental/scrolling/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ ng_e2e_test_library(
name = "e2e_test_sources",
srcs = glob(["**/*.e2e.spec.ts"]),
deps = [
"//src/cdk/private/testing/e2e",
"//src/cdk/testing/private/e2e",
],
)

e2e_test_suite(
name = "e2e_tests",
deps = [
":e2e_test_sources",
"//src/cdk/private/testing/e2e",
"//src/cdk/testing/private/e2e",
],
)
2 changes: 1 addition & 1 deletion src/cdk-experimental/tsconfig-tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"target": "es5",
"types": ["jasmine"],
"paths": {
"@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"],
"@angular/cdk/*": ["../../dist/packages/cdk/*"],
"@angular/cdk-experimental/*": ["./*"]
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/a11y/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ng_test_library(
"//src/cdk/keycodes",
"//src/cdk/observers",
"//src/cdk/platform",
"//src/cdk/testing",
"//src/cdk/testing/private",
"@npm//@angular/platform-browser",
"@npm//rxjs",
],
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/a11y/focus-monitor/focus-monitor.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
dispatchKeyboardEvent,
dispatchMouseEvent,
patchElementFocus,
} from '@angular/cdk/testing';
} from '@angular/cdk/testing/private';
import {Component, NgZone} from '@angular/core';
import {ComponentFixture, fakeAsync, flush, inject, TestBed, tick} from '@angular/core/testing';
import {By} from '@angular/platform-browser';
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/a11y/key-manager/list-key-manager.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {DOWN_ARROW, LEFT_ARROW, RIGHT_ARROW, TAB, UP_ARROW} from '@angular/cdk/keycodes';
import {createKeyboardEvent} from '@angular/cdk/testing';
import {createKeyboardEvent} from '@angular/cdk/testing/private';
import {QueryList} from '@angular/core';
import {fakeAsync, tick} from '@angular/core/testing';
import {Subject} from 'rxjs';
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/drag-drop/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ng_test_library(
"//src/cdk/bidi",
"//src/cdk/platform",
"//src/cdk/scrolling",
"//src/cdk/testing",
"//src/cdk/testing/private",
"@npm//@angular/common",
"@npm//rxjs",
],
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/drag-drop/directives/drag.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
dispatchMouseEvent,
dispatchTouchEvent,
dispatchFakeEvent,
} from '@angular/cdk/testing';
} from '@angular/cdk/testing/private';
import {
AfterViewInit,
ChangeDetectionStrategy,
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/drag-drop/drag-drop-registry.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
createTouchEvent,
dispatchTouchEvent,
dispatchFakeEvent,
} from '@angular/cdk/testing';
} from '@angular/cdk/testing/private';
import {DragDropRegistry} from './drag-drop-registry';
import {DragDropModule} from './drag-drop-module';
import {CdkDrag} from './directives/drag';
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/keycodes/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ts_library(
),
deps = [
":keycodes",
"//src/cdk/testing",
"//src/cdk/testing/private",
"@npm//@types/jasmine",
],
)
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/keycodes/modifiers.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {createKeyboardEvent} from '@angular/cdk/testing';
import {createKeyboardEvent} from '@angular/cdk/testing/private';
import {hasModifierKey} from './modifiers';

describe('keyboard modifiers', () => {
Expand Down
7 changes: 3 additions & 4 deletions src/cdk/overlay/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@ ng_test_library(
"//src/cdk/keycodes",
"//src/cdk/platform",
"//src/cdk/portal",
"//src/cdk/private/testing",
"//src/cdk/scrolling",
"//src/cdk/testing",
"//src/cdk/testing/private",
"@npm//@angular/common",
"@npm//@angular/platform-browser",
"@npm//rxjs",
Expand All @@ -74,15 +73,15 @@ ng_e2e_test_library(
name = "e2e_test_sources",
srcs = glob(["**/*.e2e.spec.ts"]),
deps = [
"//src/cdk/private/testing/e2e",
"//src/cdk/testing/private/e2e",
],
)

e2e_test_suite(
name = "e2e_tests",
deps = [
":e2e_test_sources",
"//src/cdk/private/testing/e2e",
"//src/cdk/testing/private/e2e",
],
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {TestBed, inject} from '@angular/core/testing';
import {dispatchKeyboardEvent} from '@angular/cdk/testing';
import {dispatchKeyboardEvent} from '@angular/cdk/testing/private';
import {ESCAPE} from '@angular/cdk/keycodes';
import {Component, NgModule} from '@angular/core';
import {OverlayModule, OverlayContainer, Overlay} from '../index';
Expand Down
6 changes: 5 additions & 1 deletion src/cdk/overlay/overlay-directives.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ import {Component, ViewChild} from '@angular/core';
import {By} from '@angular/platform-browser';
import {ComponentFixture, TestBed, async, inject, fakeAsync, tick} from '@angular/core/testing';
import {Directionality} from '@angular/cdk/bidi';
import {dispatchKeyboardEvent, createKeyboardEvent, dispatchEvent} from '@angular/cdk/testing';
import {
dispatchKeyboardEvent,
createKeyboardEvent,
dispatchEvent,
} from '@angular/cdk/testing/private';
import {ESCAPE, A} from '@angular/cdk/keycodes';
import {CdkConnectedOverlay, OverlayModule, CdkOverlayOrigin} from './index';
import {OverlayContainer} from './overlay-container';
Expand Down
3 changes: 1 addition & 2 deletions src/cdk/overlay/overlay.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import {
NgZone,
} from '@angular/core';
import {Direction, Directionality} from '@angular/cdk/bidi';
import {MockNgZone} from '@angular/cdk/private/testing';
import {dispatchFakeEvent} from '@angular/cdk/testing';
import {MockNgZone, dispatchFakeEvent} from '@angular/cdk/testing/private';
import {
ComponentPortal,
PortalModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
import {CdkScrollable, ScrollingModule} from '@angular/cdk/scrolling';
import {MockNgZone} from '@angular/cdk/private/testing';
import {MockNgZone} from '@angular/cdk/testing/private';
import {Component, ElementRef, NgModule, NgZone} from '@angular/core';
import {inject, TestBed} from '@angular/core/testing';
import {Subscription} from 'rxjs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
import {CdkScrollable, ScrollingModule, ViewportRuler} from '@angular/cdk/scrolling';
import {MockNgZone} from '@angular/cdk/private/testing';
import {MockNgZone} from '@angular/cdk/testing/private';
import {Component, ElementRef, NgModule, NgZone} from '@angular/core';
import {inject, TestBed} from '@angular/core/testing';
import {Subscription} from 'rxjs';
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/overlay/position/global-position-strategy.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {NgModule, NgZone, Component} from '@angular/core';
import {TestBed, inject} from '@angular/core/testing';
import {MockNgZone} from '@angular/cdk/private/testing';
import {MockNgZone} from '@angular/cdk/testing/private';
import {PortalModule, ComponentPortal} from '@angular/cdk/portal';
import {OverlayModule, Overlay, OverlayConfig, OverlayRef, OverlayContainer} from '../index';

Expand Down
2 changes: 1 addition & 1 deletion src/cdk/overlay/scroll/block-scroll-strategy.e2e.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {browser, Key, element, by} from 'protractor';
import {getScrollPosition} from '@angular/cdk/private/testing/e2e';
import {getScrollPosition} from '@angular/cdk/testing/private/e2e';


describe('scroll blocking', () => {
Expand Down
12 changes: 0 additions & 12 deletions src/cdk/private/testing/BUILD.bazel

This file was deleted.

2 changes: 1 addition & 1 deletion src/cdk/scrolling/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ng_test_library(
":scrolling",
"//src/cdk/bidi",
"//src/cdk/collections",
"//src/cdk/testing",
"//src/cdk/testing/private",
"@npm//rxjs",
],
)
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/scrolling/scroll-dispatcher.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {inject, TestBed, async, fakeAsync, ComponentFixture, tick} from '@angular/core/testing';
import {NgModule, Component, ViewChild, ElementRef} from '@angular/core';
import {CdkScrollable, ScrollDispatcher, ScrollingModule} from './public-api';
import {dispatchFakeEvent} from '@angular/cdk/testing';
import {dispatchFakeEvent} from '@angular/cdk/testing/private';

describe('ScrollDispatcher', () => {

Expand Down
2 changes: 1 addition & 1 deletion src/cdk/scrolling/viewport-ruler.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {TestBed, inject, fakeAsync, tick} from '@angular/core/testing';
import {ScrollingModule} from './public-api';
import {ViewportRuler} from './viewport-ruler';
import {dispatchFakeEvent} from '@angular/cdk/testing';
import {dispatchFakeEvent} from '@angular/cdk/testing/private';
import {NgZone} from '@angular/core';

// For all tests, we assume the browser window is 1024x786 (outerWidth x outerHeight).
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/scrolling/virtual-scroll-viewport.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
ScrollDispatcher,
ScrollingModule
} from '@angular/cdk/scrolling';
import {dispatchFakeEvent} from '@angular/cdk/testing';
import {dispatchFakeEvent} from '@angular/cdk/testing/private';
import {
Component,
Input,
Expand Down
14 changes: 14 additions & 0 deletions src/cdk/testing/fake-events/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/**
* @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
*/

// These are private APIs that are used both by the public APIs inside of this package, as well as
// in the unit tests of other packages, hence why we need to re-export them through here.
export * from './dispatch-events';
export * from './event-objects';
export * from './element-focus';
export * from './type-in-element';
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {ModifierKeys} from './event-objects';
* @docs-private
*/
export function isTextInput(element: Element): element is HTMLInputElement | HTMLTextAreaElement {
return element.nodeName.toLowerCase() === 'input' ||
element.nodeName.toLowerCase() === 'textarea' ;
const nodeName = element.nodeName.toLowerCase();
return nodeName === 'input' || nodeName === 'textarea' ;
}

/**
Expand Down
17 changes: 17 additions & 0 deletions src/cdk/testing/private/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package(default_visibility = ["//visibility:public"])

load("//tools:defaults.bzl", "ts_library")

ts_library(
name = "private",
srcs = glob(
["**/*.ts"],
exclude = ["**/*.spec.ts"],
),
module_name = "@angular/cdk/testing/private",
deps = [
"//src/cdk/testing",
"@npm//@angular/core",
"@npm//@types/jasmine",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ exports_files(["tsconfig-e2e.json"])
ng_e2e_test_library(
name = "e2e",
srcs = glob(["**/*.ts"]),
module_name = "@angular/cdk/private/testing/e2e",
module_name = "@angular/cdk/testing/private/e2e",
)
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/

export * from '../fake-events'; // Re-exported for convenince.
export * from './expect-async-error';
export * from './wrapped-error-message';
export * from './mock-ng-zone';
Expand Down
1 change: 1 addition & 0 deletions src/cdk/testing/protractor/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ts_library(
module_name = "@angular/cdk/testing/protractor",
deps = [
"//src/cdk/testing",
"//src/cdk/testing/private",
"@npm//protractor",
],
)
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/testing/protractor/protractor-element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
* found in the LICENSE file at https://angular.io/license
*/

import {ModifierKeys} from '@angular/cdk/testing';
import {browser, ElementFinder, Key} from 'protractor';
import {ElementDimensions} from '../element-dimensions';
import {TestElement, TestKey} from '../test-element';
import {ModifierKeys} from '../fake-events';

/** Maps the `TestKey` constants to Protractor's `Key` constants. */
const keyMap = {
Expand Down
4 changes: 0 additions & 4 deletions src/cdk/testing/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@
*/

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';
2 changes: 1 addition & 1 deletion src/cdk/testing/test-element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

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

/** An enum of non-text keys that can be used with the `sendKeys` method. */
// NOTE: This is a separate enum from `@angular/cdk/keycodes` because we don't necessarily want to
Expand Down
1 change: 1 addition & 0 deletions src/cdk/testing/testbed/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ts_library(
deps = [
"//src/cdk/keycodes",
"//src/cdk/testing",
"//src/cdk/testing/private",
"@npm//@angular/core",
"@npm//rxjs",
],
Expand Down
Loading