Skip to content

Commit 198c446

Browse files
committed
build: remove infinite import loops
Fixes some more infinite loops due to a package that tries to import itself.
1 parent 96d914d commit 198c446

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed

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 '../event-objects';
1313

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

src/cdk/testing/testbed/unit-test-element.ts

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

99
import * as keyCodes from '@angular/cdk/keycodes';
10-
import {
11-
clearElement,
12-
dispatchMouseEvent,
13-
isTextInput,
14-
ModifierKeys,
15-
triggerBlur,
16-
triggerFocus,
17-
typeInElement
18-
} from '@angular/cdk/testing';
1910
import {TestElement, TestKey} from '../test-element';
2011
import {ElementDimensions} from '../element-dimensions';
12+
import {triggerBlur, triggerFocus} from '../element-focus';
13+
import {isTextInput, clearElement, typeInElement} from '../type-in-element';
14+
import {dispatchMouseEvent} from '../dispatch-events';
15+
import {ModifierKeys} from '../event-objects';
2116

2217
/** Maps `TestKey` constants to the `keyCode` and `key` values used by native browser events. */
2318
const keyMap = {

src/cdk/testing/tests/protractor.e2e.spec.ts

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

77
describe('ProtractorHarnessEnvironment', () => {
88
beforeEach(async () => {

src/cdk/testing/tests/testbed.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {HarnessLoader} from '@angular/cdk/testing';
2-
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
31
import {ComponentFixture, TestBed} from '@angular/core/testing';
42
import {MainComponentHarness} from './harnesses/main-component-harness';
53
import {SubComponentHarness} from './harnesses/sub-component-harness';
64
import {TestComponentsModule} from './test-components-module';
75
import {TestMainComponent} from './test-main-component';
6+
import {HarnessLoader} from '../component-harness';
7+
import {TestbedHarnessEnvironment} from '../testbed/testbed-harness-environment';
88

99
function activeElementText() {
1010
return document.activeElement && (document.activeElement as HTMLElement).innerText || '';

0 commit comments

Comments
 (0)