Skip to content

Commit 31a943c

Browse files
committed
Add types to the e2e utils and fix the selector on the dialog tests.
1 parent cc922c9 commit 31a943c

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

e2e/components/dialog/dialog.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,6 @@ describe('dialog', () => {
9191
}
9292

9393
function clickOnBackrop() {
94-
utils.clickElementAtPoint('.md-overlay-backdrop', { x: 0, y: 0 });
94+
utils.clickElementAtPoint('.cdk-overlay-backdrop', { x: 0, y: 0 });
9595
}
9696
});

e2e/utils.e2e.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import {ElementFinder, browser, by, element, ProtractorBy} from 'protractor';
2+
13
/**
24
* A set of utility functions for writing E2E tests.
35
*/
@@ -16,7 +18,7 @@ export class E2EUtils {
1618
*/
1719
expectFocusOn(element: FinderResult, expected = true): void {
1820
expect(browser.driver.switchTo().activeElement().getInnerHtml()).toBe(
19-
this._getElement(element).getInnerHtml(),
21+
(this._getElement(element) as any).getInnerHtml(),
2022
`Expected element${expected ? '' : ' not'} to be focused.`
2123
);
2224
}
@@ -44,7 +46,7 @@ export class E2EUtils {
4446
* Waits for an element to be rendered.
4547
*/
4648
waitForElement(selector: string): webdriver.promise.Promise<any> {
47-
return browser.isElementPresent(by.css(selector));
49+
return browser.isElementPresent(by.css(selector) as ProtractorBy);
4850
}
4951

5052
/**
@@ -68,10 +70,10 @@ export class E2EUtils {
6870
* Normalizes either turning a selector into an
6971
* ElementFinder or returning the finder itself.
7072
*/
71-
private _getElement(el: FinderResult): protractor.ElementFinder {
73+
private _getElement(el: FinderResult): ElementFinder {
7274
return typeof el === 'string' ? element(by.css(el)) : el;
7375
}
7476
}
7577

76-
interface Point { x: number; y: number; }
77-
type FinderResult = protractor.ElementFinder | string;
78+
export interface Point { x: number; y: number; }
79+
export type FinderResult = ElementFinder | string;

0 commit comments

Comments
 (0)