From 894747c34cf9bbef2b891d9cdfdd0b699a6a95fb Mon Sep 17 00:00:00 2001 From: Julie Ralph Date: Thu, 23 Jun 2016 16:14:31 -0700 Subject: [PATCH] fix(platform-browser/testing-e2e): clean up unused exports from e2e testing helpers (#9387) --- .../ts/can_activate/can_activate_spec.ts | 2 +- .../ts/can_deactivate/can_deactivate_spec.ts | 2 +- .../ts/on_deactivate/on_deactivate_spec.ts | 2 +- .../router_deprecated/ts/reuse/reuse_spec.ts | 2 +- .../@angular/platform-browser/testing/e2e_util.ts | 13 ++++--------- .../platform-browser/testing_e2e.d.ts | 6 ------ 6 files changed, 8 insertions(+), 19 deletions(-) diff --git a/modules/@angular/examples/router_deprecated/ts/can_activate/can_activate_spec.ts b/modules/@angular/examples/router_deprecated/ts/can_activate/can_activate_spec.ts index db4bccbd94..ad3c7be760 100644 --- a/modules/@angular/examples/router_deprecated/ts/can_activate/can_activate_spec.ts +++ b/modules/@angular/examples/router_deprecated/ts/can_activate/can_activate_spec.ts @@ -7,7 +7,7 @@ */ import {expect} from '@angular/core/testing'; -import {browser, verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; function waitForElement(selector: string) { var EC = (protractor).ExpectedConditions; diff --git a/modules/@angular/examples/router_deprecated/ts/can_deactivate/can_deactivate_spec.ts b/modules/@angular/examples/router_deprecated/ts/can_deactivate/can_deactivate_spec.ts index a7eb265ad7..2256f36506 100644 --- a/modules/@angular/examples/router_deprecated/ts/can_deactivate/can_deactivate_spec.ts +++ b/modules/@angular/examples/router_deprecated/ts/can_deactivate/can_deactivate_spec.ts @@ -7,7 +7,7 @@ */ import {expect} from '@angular/core/testing'; -import {browser, verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; function waitForElement(selector: string) { var EC = (protractor).ExpectedConditions; diff --git a/modules/@angular/examples/router_deprecated/ts/on_deactivate/on_deactivate_spec.ts b/modules/@angular/examples/router_deprecated/ts/on_deactivate/on_deactivate_spec.ts index 1c3ee32df6..a15d51424a 100644 --- a/modules/@angular/examples/router_deprecated/ts/on_deactivate/on_deactivate_spec.ts +++ b/modules/@angular/examples/router_deprecated/ts/on_deactivate/on_deactivate_spec.ts @@ -7,7 +7,7 @@ */ import {expect} from '@angular/core/testing'; -import {browser, verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; function waitForElement(selector: string) { var EC = (protractor).ExpectedConditions; diff --git a/modules/@angular/examples/router_deprecated/ts/reuse/reuse_spec.ts b/modules/@angular/examples/router_deprecated/ts/reuse/reuse_spec.ts index 6a4800bd4a..902111cd16 100644 --- a/modules/@angular/examples/router_deprecated/ts/reuse/reuse_spec.ts +++ b/modules/@angular/examples/router_deprecated/ts/reuse/reuse_spec.ts @@ -7,7 +7,7 @@ */ import {expect} from '@angular/core/testing'; -import {browser, verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; function waitForElement(selector: string) { var EC = (protractor).ExpectedConditions; diff --git a/modules/@angular/platform-browser/testing/e2e_util.ts b/modules/@angular/platform-browser/testing/e2e_util.ts index 6b7ea304ac..0f73396a05 100644 --- a/modules/@angular/platform-browser/testing/e2e_util.ts +++ b/modules/@angular/platform-browser/testing/e2e_util.ts @@ -8,21 +8,16 @@ import * as webdriver from 'selenium-webdriver'; -declare var global: any /** TODO #9100 */; -declare var expect: Function; -export var browser: protractor.IBrowser = global['browser']; -export var $: cssSelectorHelper = global['$']; -export function clickAll(buttonSelectors: any /** TODO #9100 */) { - buttonSelectors.forEach(function(selector: any /** TODO #9100 */) { $(selector).click(); }); -} +declare var browser: any; +declare var expect: any; export function verifyNoBrowserErrors() { // TODO(tbosch): Bug in ChromeDriver: Need to execute at least one command // so that the browser logs can be read out! browser.executeScript('1+1'); - browser.manage().logs().get('browser').then(function(browserLog) { - var filteredLog = browserLog.filter(function(logEntry) { + browser.manage().logs().get('browser').then(function(browserLog: any) { + var filteredLog = browserLog.filter(function(logEntry: any) { if (logEntry.level.value >= webdriver.logging.Level.INFO.value) { console.log('>> ' + logEntry.message); } diff --git a/tools/public_api_guard/platform-browser/testing_e2e.d.ts b/tools/public_api_guard/platform-browser/testing_e2e.d.ts index f80979f382..0139c20403 100644 --- a/tools/public_api_guard/platform-browser/testing_e2e.d.ts +++ b/tools/public_api_guard/platform-browser/testing_e2e.d.ts @@ -1,7 +1 @@ -export declare var $: cssSelectorHelper; - -export declare var browser: protractor.IBrowser; - -export declare function clickAll(buttonSelectors: any): void; - export declare function verifyNoBrowserErrors(): void;