refactor(@schematics/angular): Do not include Protractor test in new project

Do not include Protractor for new projects since we do not have a concrete
plan for Protractor yet.

(cherry picked from commit 49ba5e2)

Author: kyliau

packages/angular/cli/commands/e2e-impl.ts

@@ -14,8 +14,20 @@ import { Schema as E2eCommandSchema } from './e2e';
 export class E2eCommand extends ArchitectCommand<E2eCommandSchema> {
   public readonly target = 'e2e';
   public readonly multiTarget = true;
+  public readonly missingTargetError = `
+Cannot find "e2e" target for the specified project.
 
-  public async run(options: E2eCommandSchema & Arguments) {
-    return this.runArchitectTarget(options);
+You should add a package that implements end-to-end testing capabilities.
+
+For example:
+  WebdriverIO: ng add @wdio/schematics
+
+More options will be added to the list as they become available.
+`;
+
+  async initialize(options: E2eCommandSchema & Arguments) {
+    if (!options.help) {
+      return super.initialize(options);
+    }
   }
 }

packages/schematics/angular/application/index.ts

@@ -29,7 +29,6 @@ import {
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { Schema as ComponentOptions } from '../component/schema';
-import { Schema as E2eOptions } from '../e2e/schema';
 import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
 import { latestVersions } from '../utility/latest-versions';
 import { applyLintFix } from '../utility/lint-fix';
@@ -282,11 +281,6 @@ export default function (options: ApplicationOptions): Rule {
       : join(normalize(newProjectRoot), strings.dasherize(options.name));
     const sourceDir = `${appDir}/src/app`;
 
-    const e2eOptions: E2eOptions = {
-      relatedAppName: options.name,
-      rootSelector: appRootSelector,
-    };
-
     return chain([
       addAppToWorkspaceFile(options, appDir),
       mergeWith(
@@ -338,7 +332,6 @@ export default function (options: ApplicationOptions): Rule {
           }),
           move(sourceDir),
         ]), MergeStrategy.Overwrite),
-      options.minimal ? noop() : schematic('e2e', e2eOptions),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(options),
       options.lintFix ? applyLintFix(appDir) : noop(),
     ]);

packages/schematics/angular/e2e/index.ts

@@ -17,6 +17,7 @@ import {
   move,
   url,
 } from '@angular-devkit/schematics';
+import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
 import { JSONFile } from '../utility/json-file';
 import { relativePathToWorkspaceRoot } from '../utility/paths';
 import { getWorkspace, updateWorkspace } from '../utility/workspace';
@@ -73,6 +74,11 @@ export default function (options: E2eOptions): Rule {
           }),
           move(root),
         ])),
+      host => addPackageJsonDependency(host, {
+        type: NodeDependencyType.Dev,
+        name: 'protractor',
+        version: '~7.0.0',
+      }),
       addScriptsToPackageJson(),
     ]);
   };

packages/schematics/angular/ng-new/index_spec.ts

@@ -37,10 +37,6 @@ describe('Ng New Schematic', () => {
       '/bar/tsconfig.app.json',
       '/bar/src/main.ts',
       '/bar/src/app/app.module.ts',
-      '/bar/e2e/src/app.po.ts',
-      '/bar/e2e/src/app.e2e-spec.ts',
-      '/bar/e2e/tsconfig.json',
-      '/bar/e2e/protractor.conf.js',
     ]));
   });
 

packages/schematics/angular/workspace/files/README.md.template

@@ -20,7 +20,7 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
 
 ## Running end-to-end tests
 
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+Run `ng e2e` to execute the end-to-end tests via a platform of your choice.
 
 ## Further help
 

packages/schematics/angular/workspace/files/package.json.template

@@ -35,7 +35,6 @@
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
-    "protractor": "~7.0.0",
     "ts-node": "~9.1.1",<% } %>
     "typescript": "<%= latestVersions.TypeScript %>"
   }

tests/legacy-cli/e2e/utils/project.ts

@@ -53,6 +53,8 @@ export async function prepareProjectForE2e(name) {
     'false',
   );
 
+  await ng('generate', '@schematics/angular:e2e', '--related-app-name', name);
+
   await useCIChrome(
     'e2e',
   );