From 9946dface282fcf9146e3c377e75b056b4bb2f9a Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@abv.bg>
Date: Thu, 4 Feb 2021 23:08:00 +0100
Subject: [PATCH] build: resolve circular dependencies in e2e code

Moves an interface in order to resolve a circular dependency.
---
 goldens/ts-circular-deps.json          | 4 ----
 src/cdk/testing/private/e2e/actions.ts | 4 +---
 src/cdk/testing/private/e2e/asserts.ts | 3 +--
 src/cdk/testing/private/e2e/query.ts   | 3 ++-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/goldens/ts-circular-deps.json b/goldens/ts-circular-deps.json
index 569d7a22a504..9eff1107cbcb 100644
--- a/goldens/ts-circular-deps.json
+++ b/goldens/ts-circular-deps.json
@@ -27,9 +27,5 @@
   [
     "src/cdk/scrolling/virtual-scroll-strategy.ts",
     "src/cdk/scrolling/virtual-scroll-viewport.ts"
-  ],
-  [
-    "src/cdk/testing/private/e2e/actions.ts",
-    "src/cdk/testing/private/e2e/query.ts"
   ]
 ]
\ No newline at end of file
diff --git a/src/cdk/testing/private/e2e/actions.ts b/src/cdk/testing/private/e2e/actions.ts
index b8042126d006..583a1c4f1b02 100644
--- a/src/cdk/testing/private/e2e/actions.ts
+++ b/src/cdk/testing/private/e2e/actions.ts
@@ -7,7 +7,7 @@
  */
 
 import {browser} from 'protractor';
-import {getElement, FinderResult} from './query';
+import {getElement, FinderResult, Point} from './query';
 
 /**
  * Presses a single key or a sequence of keys.
@@ -25,5 +25,3 @@ export async function clickElementAtPoint(element: FinderResult, coords: Point)
   const webElement = await getElement(element).getWebElement();
   await browser.actions().mouseMove(webElement, coords).click().perform();
 }
-
-export interface Point { x: number; y: number; }
diff --git a/src/cdk/testing/private/e2e/asserts.ts b/src/cdk/testing/private/e2e/asserts.ts
index a26688dbff7f..6dd3b1d03c4c 100644
--- a/src/cdk/testing/private/e2e/asserts.ts
+++ b/src/cdk/testing/private/e2e/asserts.ts
@@ -7,8 +7,7 @@
  */
 
 import {browser} from 'protractor';
-import {getElement, FinderResult, waitForElement} from './query';
-import {Point} from './actions';
+import {getElement, FinderResult, waitForElement, Point} from './query';
 
 /**
  * Asserts that an element exists.
diff --git a/src/cdk/testing/private/e2e/query.ts b/src/cdk/testing/private/e2e/query.ts
index 2beea839b39d..9a8fe80f109a 100644
--- a/src/cdk/testing/private/e2e/query.ts
+++ b/src/cdk/testing/private/e2e/query.ts
@@ -7,7 +7,6 @@
  */
 
 import {browser, by, element, ElementFinder} from 'protractor';
-import {Point} from './actions';
 
 /**
  * Normalizes either turning a selector into an
@@ -42,3 +41,5 @@ export async function getScrollPosition(): Promise<Point> {
 }
 
 export type FinderResult = ElementFinder | string;
+
+export interface Point { x: number; y: number; }