diff --git a/modules/testing/builder/projects/hello-world-app/angular.json b/modules/testing/builder/projects/hello-world-app/angular.json index 799af4a7f63e..95607701be8f 100644 --- a/modules/testing/builder/projects/hello-world-app/angular.json +++ b/modules/testing/builder/projects/hello-world-app/angular.json @@ -178,7 +178,7 @@ "projectType": "application", "targets": { "e2e": { - "builder": "@angular-devkit/build-angular:protractor", + "builder": "@angular-devkit/build-angular:private-protractor", "options": { "protractorConfig": "protractor.conf.js", "devServerTarget": "app:serve", diff --git a/packages/angular/cli/lib/config/workspace-schema.json b/packages/angular/cli/lib/config/workspace-schema.json index 650ae3ae18f2..dce8ecfec6fa 100644 --- a/packages/angular/cli/lib/config/workspace-schema.json +++ b/packages/angular/cli/lib/config/workspace-schema.json @@ -368,7 +368,6 @@ "@angular-devkit/build-angular:prerender", "@angular-devkit/build-angular:jest", "@angular-devkit/build-angular:web-test-runner", - "@angular-devkit/build-angular:protractor", "@angular-devkit/build-angular:server", "@angular-devkit/build-angular:ssr-dev-server" ] @@ -656,28 +655,6 @@ } } }, - { - "type": "object", - "additionalProperties": false, - "properties": { - "builder": { - "const": "@angular-devkit/build-angular:protractor" - }, - "defaultConfiguration": { - "type": "string", - "description": "A default named configuration to use when a target configuration is not provided." - }, - "options": { - "$ref": "../../../../angular_devkit/build_angular/src/builders/protractor/schema.json" - }, - "configurations": { - "type": "object", - "additionalProperties": { - "$ref": "../../../../angular_devkit/build_angular/src/builders/protractor/schema.json" - } - } - } - }, { "type": "object", "additionalProperties": false, diff --git a/packages/angular_devkit/build_angular/builders.json b/packages/angular_devkit/build_angular/builders.json index 5f76fa25d471..9141cdf94f2f 100644 --- a/packages/angular_devkit/build_angular/builders.json +++ b/packages/angular_devkit/build_angular/builders.json @@ -42,10 +42,10 @@ "schema": "./src/builders/web-test-runner/schema.json", "description": "Run unit tests with Web Test Runner." }, - "protractor": { + "private-protractor": { "implementation": "./src/builders/protractor", "schema": "./src/builders/protractor/schema.json", - "description": "Run protractor over a dev server." + "description": "PRIVATE API - Do not use." }, "server": { "implementation": "./src/builders/server", diff --git a/packages/angular_devkit/core/src/workspace/json/test/angular.json b/packages/angular_devkit/core/src/workspace/json/test/angular.json index f71726e4aba1..94800e0dfa56 100644 --- a/packages/angular_devkit/core/src/workspace/json/test/angular.json +++ b/packages/angular_devkit/core/src/workspace/json/test/angular.json @@ -111,7 +111,7 @@ "prefix": "", "architect": { "e2e": { - "builder": "@angular-devkit/build-angular:protractor", + "builder": "@angular-devkit/build-angular:private-protractor", "options": { "protractorConfig": "e2e/protractor.conf.js", "devServerTarget": "my-app:serve" diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject2.json b/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject2.json index 7c2dd6785183..5ae73ae1eff6 100644 --- a/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject2.json +++ b/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject2.json @@ -111,7 +111,7 @@ "prefix": "", "architect": { "e2e": { - "builder": "@angular-devkit/build-angular:protractor", + "builder": "@angular-devkit/build-angular:private-protractor", "options": { "protractorConfig": "e2e/protractor.conf.js", "devServerTarget": "my-app:serve" diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject3.json b/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject3.json index f025b8ffc0bd..6198c97007a0 100644 --- a/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject3.json +++ b/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject3.json @@ -111,7 +111,7 @@ "prefix": "", "architect": { "e2e": { - "builder": "@angular-devkit/build-angular:protractor", + "builder": "@angular-devkit/build-angular:private-protractor", "options": { "protractorConfig": "e2e/protractor.conf.js", "devServerTarget": "my-app:serve" diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectAddTarget.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectAddTarget.json index 96cc5437c042..1fdf8eeec7ed 100644 --- a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectAddTarget.json +++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectAddTarget.json @@ -114,7 +114,7 @@ "prefix": "", "architect": { "e2e": { - "builder": "@angular-devkit/build-angular:protractor", + "builder": "@angular-devkit/build-angular:private-protractor", "options": { "protractorConfig": "e2e/protractor.conf.js", "devServerTarget": "my-app:serve" diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectDeleteTarget.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectDeleteTarget.json index 810ed7dc1f4e..81804c2f04b5 100644 --- a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectDeleteTarget.json +++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectDeleteTarget.json @@ -105,7 +105,7 @@ "prefix": "", "architect": { "e2e": { - "builder": "@angular-devkit/build-angular:protractor", + "builder": "@angular-devkit/build-angular:private-protractor", "options": { "protractorConfig": "e2e/protractor.conf.js", "devServerTarget": "my-app:serve" diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectModifyProperties.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectModifyProperties.json index a1628aafec9e..1debd9ed6e6b 100644 --- a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectModifyProperties.json +++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectModifyProperties.json @@ -111,7 +111,7 @@ "prefix": "", "architect": { "e2e": { - "builder": "@angular-devkit/build-angular:protractor", + "builder": "@angular-devkit/build-angular:private-protractor", "options": { "protractorConfig": "e2e/protractor.conf.js", "devServerTarget": "my-app:serve" diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectSetProperties.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectSetProperties.json index 21bf85ba9544..9e2bfb88483c 100644 --- a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectSetProperties.json +++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectSetProperties.json @@ -112,7 +112,7 @@ "prefix": "", "architect": { "e2e": { - "builder": "@angular-devkit/build-angular:protractor", + "builder": "@angular-devkit/build-angular:private-protractor", "options": { "protractorConfig": "e2e/protractor.conf.js", "devServerTarget": "my-app:serve" diff --git a/packages/schematics/angular/collection.json b/packages/schematics/angular/collection.json index f4def2da5a43..5f691819544f 100755 --- a/packages/schematics/angular/collection.json +++ b/packages/schematics/angular/collection.json @@ -23,10 +23,10 @@ "schema": "./application/schema.json", "description": "Create an Angular application." }, - "e2e": { + "private-e2e": { "factory": "./e2e", "schema": "./e2e/schema.json", - "description": "Create an Angular e2e application.", + "description": "PRIVATE API - Do not use.", "hidden": true }, "class": { diff --git a/packages/schematics/angular/e2e/index_spec.ts b/packages/schematics/angular/e2e/index_spec.ts index 8b01761346b2..e04e4ca177b5 100644 --- a/packages/schematics/angular/e2e/index_spec.ts +++ b/packages/schematics/angular/e2e/index_spec.ts @@ -49,7 +49,7 @@ describe('Application Schematic', () => { }); it('should create all files of e2e in an application', async () => { - const tree = await schematicRunner.runSchematic('e2e', defaultOptions, applicationTree); + const tree = await schematicRunner.runSchematic('private-e2e', defaultOptions, applicationTree); const files = tree.files; expect(files).toEqual( @@ -64,7 +64,11 @@ describe('Application Schematic', () => { describe('workspace config', () => { it('should add e2e targets for the app', async () => { - const tree = await schematicRunner.runSchematic('e2e', defaultOptions, applicationTree); + const tree = await schematicRunner.runSchematic( + 'private-e2e', + defaultOptions, + applicationTree, + ); const workspace = JSON.parse(tree.readContent('/angular.json')); const targets = workspace.projects.foo.architect; @@ -72,7 +76,11 @@ describe('Application Schematic', () => { }); it('should set the e2e options', async () => { - const tree = await schematicRunner.runSchematic('e2e', defaultOptions, applicationTree); + const tree = await schematicRunner.runSchematic( + 'private-e2e', + defaultOptions, + applicationTree, + ); const workspace = JSON.parse(tree.readContent('/angular.json')); const { options, configurations } = workspace.projects.foo.architect.e2e; @@ -82,7 +90,7 @@ describe('Application Schematic', () => { }); it('should add an e2e script in package.json', async () => { - const tree = await schematicRunner.runSchematic('e2e', defaultOptions, applicationTree); + const tree = await schematicRunner.runSchematic('private-e2e', defaultOptions, applicationTree); const pkg = JSON.parse(tree.readContent('/package.json')); expect(pkg.scripts['e2e']).toBe('ng e2e'); diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts index 49330e29e2bd..41c41345f736 100644 --- a/packages/schematics/angular/utility/workspace-models.ts +++ b/packages/schematics/angular/utility/workspace-models.ts @@ -30,7 +30,7 @@ export enum Builders { NgPackagr = '@angular-devkit/build-angular:ng-packagr', DevServer = '@angular-devkit/build-angular:dev-server', ExtractI18n = '@angular-devkit/build-angular:extract-i18n', - Protractor = '@angular-devkit/build-angular:protractor', + Protractor = '@angular-devkit/build-angular:private-protractor', BuildApplication = '@angular/build:application', } diff --git a/tests/legacy-cli/e2e/tests/build/jit-ngmodule.ts b/tests/legacy-cli/e2e/tests/build/jit-ngmodule.ts index 2c13255bb17f..a66311f0e27f 100644 --- a/tests/legacy-cli/e2e/tests/build/jit-ngmodule.ts +++ b/tests/legacy-cli/e2e/tests/build/jit-ngmodule.ts @@ -4,7 +4,7 @@ import { updateJsonFile, useCIChrome, useCIDefaults } from '../../utils/project' export default async function () { await ng('generate', 'app', 'test-project-two', '--no-standalone', '--skip-install'); - await ng('generate', 'e2e', '--related-app-name=test-project-two'); + await ng('generate', 'private-e2e', '--related-app-name=test-project-two'); // Setup testing to use CI Chrome. await useCIChrome('test-project-two', './projects/test-project-two/e2e'); diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/express-engine-ngmodule.ts b/tests/legacy-cli/e2e/tests/build/server-rendering/express-engine-ngmodule.ts index 67b003fab334..6cb4d9e15ed2 100644 --- a/tests/legacy-cli/e2e/tests/build/server-rendering/express-engine-ngmodule.ts +++ b/tests/legacy-cli/e2e/tests/build/server-rendering/express-engine-ngmodule.ts @@ -16,7 +16,7 @@ export default async function () { await rimraf('node_modules/@angular/ssr'); await ng('generate', 'app', 'test-project-two', '--no-standalone', '--skip-install'); - await ng('generate', 'e2e', '--related-app-name=test-project-two'); + await ng('generate', 'private-e2e', '--related-app-name=test-project-two'); // Setup testing to use CI Chrome. await useCIChrome('test-project-two', 'projects/test-project-two/e2e/'); diff --git a/tests/legacy-cli/e2e/tests/update/update.ts b/tests/legacy-cli/e2e/tests/update/update.ts index b6f3bdda5754..2e4317023a81 100644 --- a/tests/legacy-cli/e2e/tests/update/update.ts +++ b/tests/legacy-cli/e2e/tests/update/update.ts @@ -72,7 +72,7 @@ export default async function () { await ng('update', '@angular/cli', ...extraUpdateArgs); // Generate E2E setup - await ng('generate', 'e2e', '--related-app-name=fifteen-project'); + await ng('generate', 'private-e2e', '--related-app-name=fifteen-project'); // Setup testing to use CI Chrome. await useCIChrome('fifteen-project', './'); diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts index 24316ed954c5..99a2958ceb4f 100644 --- a/tests/legacy-cli/e2e/utils/project.ts +++ b/tests/legacy-cli/e2e/utils/project.ts @@ -51,7 +51,7 @@ export async function prepareProjectForE2e(name: string) { console.log(`Project ${name} created... Installing packages.`); await installWorkspacePackages(); - await ng('generate', 'e2e', '--related-app-name', name); + await ng('generate', 'private-e2e', '--related-app-name', name); await useCIChrome(name, 'e2e'); await useCIChrome(name, '');