Skip to content

Commit dacd4d5

Browse files
authored
build: resolve circular dependencies in e2e code (#21812)
Moves an interface in order to resolve a circular dependency.
1 parent d216552 commit dacd4d5

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

goldens/ts-circular-deps.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,5 @@
2727
[
2828
"src/cdk/scrolling/virtual-scroll-strategy.ts",
2929
"src/cdk/scrolling/virtual-scroll-viewport.ts"
30-
],
31-
[
32-
"src/cdk/testing/private/e2e/actions.ts",
33-
"src/cdk/testing/private/e2e/query.ts"
3430
]
3531
]

src/cdk/testing/private/e2e/actions.ts

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

99
import {browser} from 'protractor';
10-
import {getElement, FinderResult} from './query';
10+
import {getElement, FinderResult, Point} from './query';
1111

1212
/**
1313
* Presses a single key or a sequence of keys.
@@ -25,5 +25,3 @@ export async function clickElementAtPoint(element: FinderResult, coords: Point)
2525
const webElement = await getElement(element).getWebElement();
2626
await browser.actions().mouseMove(webElement, coords).click().perform();
2727
}
28-
29-
export interface Point { x: number; y: number; }

src/cdk/testing/private/e2e/asserts.ts

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

99
import {browser} from 'protractor';
10-
import {getElement, FinderResult, waitForElement} from './query';
11-
import {Point} from './actions';
10+
import {getElement, FinderResult, waitForElement, Point} from './query';
1211

1312
/**
1413
* Asserts that an element exists.

src/cdk/testing/private/e2e/query.ts

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

99
import {browser, by, element, ElementFinder} from 'protractor';
10-
import {Point} from './actions';
1110

1211
/**
1312
* Normalizes either turning a selector into an
@@ -42,3 +41,5 @@ export async function getScrollPosition(): Promise<Point> {
4241
}
4342

4443
export type FinderResult = ElementFinder | string;
44+
45+
export interface Point { x: number; y: number; }

0 commit comments

Comments
 (0)