From 4a965052f9a10c083e0e0ea613467213fe48202d Mon Sep 17 00:00:00 2001 From: Julie Ralph Date: Wed, 13 Jul 2016 10:10:02 -0700 Subject: [PATCH] fix(platform-browser): remove testing_e2e target (#10029) The testing_e2e util does not belong in platform-browser and was never intended to be a public API. Move it out of that whole tree. BREAKING CHANGE: The following API was never intended to be public and is removed: ```js import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; ``` Consider using Protractor's console plugin: https://github.com/angular/protractor-console-plugin --- gulpfile.js | 1 - .../ts/can_activate/can_activate_spec.ts | 2 +- .../ts/can_deactivate/can_deactivate_spec.ts | 2 +- .../ts/on_deactivate/on_deactivate_spec.ts | 2 +- .../examples/router_deprecated/ts/reuse/reuse_spec.ts | 2 +- modules/@angular/platform-browser/testing_e2e.ts | 9 --------- modules/@angular/platform-browser/tsconfig-es2015.json | 1 - modules/@angular/platform-browser/tsconfig-es5.json | 1 - .../platform-browser/testing => e2e_util}/e2e_util.ts | 0 .../platform-browser/testing => e2e_util}/perf_util.ts | 0 modules/playground/e2e_test/async/async_spec.ts | 2 +- .../e2e_test/hash_routing/hash_location_spec.ts | 2 +- .../playground/e2e_test/hello_world/hello_world_spec.ts | 2 +- modules/playground/e2e_test/http/http_spec.ts | 2 +- modules/playground/e2e_test/jsonp/jsonp_spec.ts | 2 +- .../playground/e2e_test/key_events/key_events_spec.ts | 2 +- .../model_driven_forms/model_driven_forms_spec.ts | 2 +- .../e2e_test/order_management/order_management_spec.ts | 2 +- .../e2e_test/person_management/person_management_spec.ts | 2 +- .../playground/e2e_test/relative_assets/assets_spec.ts | 2 +- modules/playground/e2e_test/routing/routing_spec.ts | 2 +- .../routing_deprecated/routing_deprecated_spec.ts | 2 +- modules/playground/e2e_test/sourcemap/sourcemap_spec.ts | 2 +- modules/playground/e2e_test/svg/svg_spec.ts | 2 +- .../template_driven_forms/template_driven_forms_spec.ts | 2 +- modules/playground/e2e_test/upgrade/upgrade_spec.ts | 2 +- .../playground/e2e_test/web_workers/input/input_spec.ts | 2 +- .../web_workers/kitchen_sink/kitchen_sink_spec.ts | 2 +- .../web_workers/message_broker/message_broker_spec.ts | 2 +- .../e2e_test/web_workers/router/router_spec.ts | 2 +- .../playground/e2e_test/web_workers/todo/todo_spec.ts | 2 +- .../playground/e2e_test/zippy_component/zippy_spec.ts | 2 +- tools/public_api_guard/platform-browser/testing_e2e.d.ts | 2 -- 33 files changed, 26 insertions(+), 40 deletions(-) delete mode 100644 modules/@angular/platform-browser/testing_e2e.ts rename modules/{@angular/platform-browser/testing => e2e_util}/e2e_util.ts (100%) rename modules/{@angular/platform-browser/testing => e2e_util}/perf_util.ts (100%) delete mode 100644 tools/public_api_guard/platform-browser/testing_e2e.d.ts diff --git a/gulpfile.js b/gulpfile.js index 1bef6f9ca7..39ff771d92 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -39,7 +39,6 @@ const entrypoints = [ 'dist/packages-dist/upgrade/index.d.ts', 'dist/packages-dist/platform-browser/index.d.ts', 'dist/packages-dist/platform-browser/testing.d.ts', - 'dist/packages-dist/platform-browser/testing_e2e.d.ts', 'dist/packages-dist/platform-browser-dynamic/index.d.ts', 'dist/packages-dist/platform-browser-dynamic/testing.d.ts', 'dist/packages-dist/platform-server/index.d.ts', 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 264047cde1..dd30a7522f 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 @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; 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 111dfd1db3..35f6bf6ec8 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 @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; 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 25120a77c6..d64b26d6ca 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 @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; 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 ebae736e9d..942b11a56a 100644 --- a/modules/@angular/examples/router_deprecated/ts/reuse/reuse_spec.ts +++ b/modules/@angular/examples/router_deprecated/ts/reuse/reuse_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; function waitForElement(selector: string) { var EC = (protractor).ExpectedConditions; diff --git a/modules/@angular/platform-browser/testing_e2e.ts b/modules/@angular/platform-browser/testing_e2e.ts deleted file mode 100644 index f706c20866..0000000000 --- a/modules/@angular/platform-browser/testing_e2e.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -export * from './testing/e2e_util'; diff --git a/modules/@angular/platform-browser/tsconfig-es2015.json b/modules/@angular/platform-browser/tsconfig-es2015.json index 8986bc7f8b..78570bee61 100644 --- a/modules/@angular/platform-browser/tsconfig-es2015.json +++ b/modules/@angular/platform-browser/tsconfig-es2015.json @@ -25,7 +25,6 @@ "files": [ "index.ts", "testing.ts", - "testing_e2e.ts", "../../../node_modules/@types/hammerjs/index.d.ts", "../../../node_modules/@types/jasmine/index.d.ts", "../../../node_modules/@types/protractor/index.d.ts", diff --git a/modules/@angular/platform-browser/tsconfig-es5.json b/modules/@angular/platform-browser/tsconfig-es5.json index a851ef41dc..f4f2cf6ca7 100644 --- a/modules/@angular/platform-browser/tsconfig-es5.json +++ b/modules/@angular/platform-browser/tsconfig-es5.json @@ -26,7 +26,6 @@ "files": [ "index.ts", "testing.ts", - "testing_e2e.ts", "../../../node_modules/@types/hammerjs/index.d.ts", "../../../node_modules/@types/jasmine/index.d.ts", "../../../node_modules/@types/protractor/index.d.ts", diff --git a/modules/@angular/platform-browser/testing/e2e_util.ts b/modules/e2e_util/e2e_util.ts similarity index 100% rename from modules/@angular/platform-browser/testing/e2e_util.ts rename to modules/e2e_util/e2e_util.ts diff --git a/modules/@angular/platform-browser/testing/perf_util.ts b/modules/e2e_util/perf_util.ts similarity index 100% rename from modules/@angular/platform-browser/testing/perf_util.ts rename to modules/e2e_util/perf_util.ts diff --git a/modules/playground/e2e_test/async/async_spec.ts b/modules/playground/e2e_test/async/async_spec.ts index 03022540ab..0735e1826a 100644 --- a/modules/playground/e2e_test/async/async_spec.ts +++ b/modules/playground/e2e_test/async/async_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('async', () => { var URL = 'all/playground/src/async/index.html'; diff --git a/modules/playground/e2e_test/hash_routing/hash_location_spec.ts b/modules/playground/e2e_test/hash_routing/hash_location_spec.ts index 27a1152783..1ebb37a089 100644 --- a/modules/playground/e2e_test/hash_routing/hash_location_spec.ts +++ b/modules/playground/e2e_test/hash_routing/hash_location_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; function waitForElement(selector: any /** TODO #9100 */) { var EC = (protractor).ExpectedConditions; diff --git a/modules/playground/e2e_test/hello_world/hello_world_spec.ts b/modules/playground/e2e_test/hello_world/hello_world_spec.ts index 14767062cf..17be8cd65e 100644 --- a/modules/playground/e2e_test/hello_world/hello_world_spec.ts +++ b/modules/playground/e2e_test/hello_world/hello_world_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('hello world', function() { diff --git a/modules/playground/e2e_test/http/http_spec.ts b/modules/playground/e2e_test/http/http_spec.ts index 8fe7c595be..60b0c5bf26 100644 --- a/modules/playground/e2e_test/http/http_spec.ts +++ b/modules/playground/e2e_test/http/http_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('http', function() { diff --git a/modules/playground/e2e_test/jsonp/jsonp_spec.ts b/modules/playground/e2e_test/jsonp/jsonp_spec.ts index d626fa26b3..757708f453 100644 --- a/modules/playground/e2e_test/jsonp/jsonp_spec.ts +++ b/modules/playground/e2e_test/jsonp/jsonp_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('jsonp', function() { diff --git a/modules/playground/e2e_test/key_events/key_events_spec.ts b/modules/playground/e2e_test/key_events/key_events_spec.ts index 3a84048a56..8e18dfdae2 100644 --- a/modules/playground/e2e_test/key_events/key_events_spec.ts +++ b/modules/playground/e2e_test/key_events/key_events_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing/e2e_util'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('key_events', function() { diff --git a/modules/playground/e2e_test/model_driven_forms/model_driven_forms_spec.ts b/modules/playground/e2e_test/model_driven_forms/model_driven_forms_spec.ts index 7b2291f007..efbb75e694 100644 --- a/modules/playground/e2e_test/model_driven_forms/model_driven_forms_spec.ts +++ b/modules/playground/e2e_test/model_driven_forms/model_driven_forms_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('Model-Driven Forms', function() { diff --git a/modules/playground/e2e_test/order_management/order_management_spec.ts b/modules/playground/e2e_test/order_management/order_management_spec.ts index 53f3bcc45a..84f916ed96 100644 --- a/modules/playground/e2e_test/order_management/order_management_spec.ts +++ b/modules/playground/e2e_test/order_management/order_management_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('Order Management CRUD', function() { var URL = 'all/playground/src/order_management/index.html'; diff --git a/modules/playground/e2e_test/person_management/person_management_spec.ts b/modules/playground/e2e_test/person_management/person_management_spec.ts index bb855cb683..609a07ac8c 100644 --- a/modules/playground/e2e_test/person_management/person_management_spec.ts +++ b/modules/playground/e2e_test/person_management/person_management_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('Person Management CRUD', function() { var URL = 'all/playground/src/person_management/index.html'; diff --git a/modules/playground/e2e_test/relative_assets/assets_spec.ts b/modules/playground/e2e_test/relative_assets/assets_spec.ts index 45d86e8848..71f8f52f22 100644 --- a/modules/playground/e2e_test/relative_assets/assets_spec.ts +++ b/modules/playground/e2e_test/relative_assets/assets_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; function waitForElement(selector: any /** TODO #9100 */) { var EC = (protractor).ExpectedConditions; diff --git a/modules/playground/e2e_test/routing/routing_spec.ts b/modules/playground/e2e_test/routing/routing_spec.ts index 67762d5d6e..790137d013 100644 --- a/modules/playground/e2e_test/routing/routing_spec.ts +++ b/modules/playground/e2e_test/routing/routing_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; function waitForElement(selector: any /** TODO #9100 */) { var EC = (protractor).ExpectedConditions; diff --git a/modules/playground/e2e_test/routing_deprecated/routing_deprecated_spec.ts b/modules/playground/e2e_test/routing_deprecated/routing_deprecated_spec.ts index b61f42c68c..5dbb9932fe 100644 --- a/modules/playground/e2e_test/routing_deprecated/routing_deprecated_spec.ts +++ b/modules/playground/e2e_test/routing_deprecated/routing_deprecated_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; function waitForElement(selector: any /** TODO #9100 */) { var EC = (protractor).ExpectedConditions; diff --git a/modules/playground/e2e_test/sourcemap/sourcemap_spec.ts b/modules/playground/e2e_test/sourcemap/sourcemap_spec.ts index ad183ac934..fbc188b6a1 100644 --- a/modules/playground/e2e_test/sourcemap/sourcemap_spec.ts +++ b/modules/playground/e2e_test/sourcemap/sourcemap_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as testUtil from '@angular/platform-browser/testing_e2e'; +import * as testUtil from 'e2e_util/e2e_util'; var fs = require('fs'); var sourceMap = require('source-map'); diff --git a/modules/playground/e2e_test/svg/svg_spec.ts b/modules/playground/e2e_test/svg/svg_spec.ts index 5c6dbe62ec..88f559f00c 100644 --- a/modules/playground/e2e_test/svg/svg_spec.ts +++ b/modules/playground/e2e_test/svg/svg_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('SVG', function() { diff --git a/modules/playground/e2e_test/template_driven_forms/template_driven_forms_spec.ts b/modules/playground/e2e_test/template_driven_forms/template_driven_forms_spec.ts index e8b0540580..f2113b9509 100644 --- a/modules/playground/e2e_test/template_driven_forms/template_driven_forms_spec.ts +++ b/modules/playground/e2e_test/template_driven_forms/template_driven_forms_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('Template-Driven Forms', function() { diff --git a/modules/playground/e2e_test/upgrade/upgrade_spec.ts b/modules/playground/e2e_test/upgrade/upgrade_spec.ts index e8b17ca76e..dae943987e 100644 --- a/modules/playground/e2e_test/upgrade/upgrade_spec.ts +++ b/modules/playground/e2e_test/upgrade/upgrade_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from "@angular/platform-browser/testing_e2e"; +import {verifyNoBrowserErrors} from "e2e_util/e2e_util"; // TODO(i): reenable once we fix issue with exposing testability to protractor when using ngUpgrade // https://github.com/angular/angular/issues/9407 diff --git a/modules/playground/e2e_test/web_workers/input/input_spec.ts b/modules/playground/e2e_test/web_workers/input/input_spec.ts index 5e135e6208..d910449dfd 100644 --- a/modules/playground/e2e_test/web_workers/input/input_spec.ts +++ b/modules/playground/e2e_test/web_workers/input/input_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('WebWorkers Input', function() { afterEach(() => { diff --git a/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts b/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts index 6b20fba09e..6c9e034aff 100644 --- a/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts +++ b/modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('WebWorkers Kitchen Sink', function() { afterEach(() => { diff --git a/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts b/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts index 2fe7b41080..74dec660c0 100644 --- a/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts +++ b/modules/playground/e2e_test/web_workers/message_broker/message_broker_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; var URL = 'all/playground/src/web_workers/message_broker/index.html'; diff --git a/modules/playground/e2e_test/web_workers/router/router_spec.ts b/modules/playground/e2e_test/web_workers/router/router_spec.ts index 6d95d6b72a..8503674334 100644 --- a/modules/playground/e2e_test/web_workers/router/router_spec.ts +++ b/modules/playground/e2e_test/web_workers/router/router_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe("WebWorker Router", () => { beforeEach(() => { diff --git a/modules/playground/e2e_test/web_workers/todo/todo_spec.ts b/modules/playground/e2e_test/web_workers/todo/todo_spec.ts index 3f34e18921..4fa6fdcfd9 100644 --- a/modules/playground/e2e_test/web_workers/todo/todo_spec.ts +++ b/modules/playground/e2e_test/web_workers/todo/todo_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('WebWorkers Todo', function() { afterEach(() => { diff --git a/modules/playground/e2e_test/zippy_component/zippy_spec.ts b/modules/playground/e2e_test/zippy_component/zippy_spec.ts index c325f9c80d..6bfa6df235 100644 --- a/modules/playground/e2e_test/zippy_component/zippy_spec.ts +++ b/modules/playground/e2e_test/zippy_component/zippy_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {verifyNoBrowserErrors} from '@angular/platform-browser/testing_e2e'; +import {verifyNoBrowserErrors} from 'e2e_util/e2e_util'; describe('Zippy Component', function() { diff --git a/tools/public_api_guard/platform-browser/testing_e2e.d.ts b/tools/public_api_guard/platform-browser/testing_e2e.d.ts deleted file mode 100644 index c554640a52..0000000000 --- a/tools/public_api_guard/platform-browser/testing_e2e.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -/** @experimental */ -export declare function verifyNoBrowserErrors(): void;