Revert "feat(@angular/cli): adding skip e2e test option"

This reverts commit fdea2df.

Author: hansl

docs/documentation/new.md

@@ -11,7 +11,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>directory</summary>
   <p>
-    <code>--directory</code> (aliases: <code>-dir</code>) <em>default value: dir</em>
+    `--directory` (alias: `-dir`) _default value: dir_
   </p>
   <p>
     The directory name to create the app in.
@@ -21,7 +21,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>dry-run</summary>
   <p>
-    <code>--dry-run</code> (aliases: <code>-d</code>) <em>default value: false</em>
+    `--dry-run` (alias: `-d`) _default value: false_
   </p>
   <p>
     Run through without making any changes.
@@ -31,7 +31,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>inline-style</summary>
   <p>
-    <code>--inline-style</code> (aliases: <code>-is</code>) <em>default value: false</em>
+    `--inline-style` (alias: `-is`) _default value: false_
   </p>
   <p>
     Should have an inline style.
@@ -41,7 +41,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>inline-template</summary>
   <p>
-    <code>--inline-template</code> (aliases: <code>-it</code>) <em>default value: false</em>
+    `--inline-template` (alias: `-it`) _default value: false_
   </p>
   <p>
     Should have an inline template.
@@ -51,7 +51,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>prefix</summary>
   <p>
-    <code>--prefix</code> (aliases: <code>-p</code>) <em>default value: app</em>
+    `--prefix` (alias: `-p`) _default value: app_
   </p>
   <p>
     The prefix to use for all component selectors.
@@ -61,7 +61,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>routing</summary>
   <p>
-    <code>--routing</code> <em>default value: false</em>
+    `--routing` _default value: false_
   </p>
   <p>
     Generate a routing module.
@@ -71,7 +71,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>skip-commit</summary>
   <p>
-    <code>--skip-commit</code> (aliases: <code>-sc</code>) <em>default value: false</em>
+    `--skip-commit` (alias: `-sc`) _default value: false_
   </p>
   <p>
     Skip committing the first commit to git.
@@ -81,7 +81,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>skip-git</summary>
   <p>
-    <code>--skip-git</code> (aliases: <code>-sg</code>) <em>default value: false</em>
+    `--skip-git` (alias: `-sg`) _default value: false_
   </p>
   <p>
     Skip initializing a git repository.
@@ -91,7 +91,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>skip-install</summary>
   <p>
-    <code>--skip-install</code> (aliases: <code>-si</code>) <em>default value: false</em>
+    `--skip-install` (alias: `-si`) _default value: false_
   </p>
   <p>
     Skip installing packages.
@@ -106,13 +106,6 @@ Default applications are created in a directory of the same name, with an initia
   <p>
     Skip creating spec files.
   </p>
-</details>
-
-<details>
-  <summary>skip-e2e</summary>
-  <p>
-    <code>--skip-e2e</code> (alias: <code>-se</code>) <em>default value: false</em>
-  </p>
   <p>
     Skip including e2e functionality.
   </p>
@@ -121,7 +114,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>source-dir</summary>
   <p>
-    <code>--source-dir</code> (aliases: <code>-sd</code>) <em>default value: src</em>
+    `--source-dir` (alias: `-sd`) _default value: src_
   </p>
   <p>
     The name of the source directory.
@@ -131,7 +124,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>style</summary>
   <p>
-    <code>--style</code> <em>default value: css</em>
+    `--style` _default value: css_
   </p>
   <p>
     The style file default extension.
@@ -141,7 +134,7 @@ Default applications are created in a directory of the same name, with an initia
 <details>
   <summary>verbose</summary>
   <p>
-    <code>--verbose</code> (aliases: <code>-v</code>) <em>default value: false</em>
+    `--verbose` (alias: `-v`) _default value: false_
   </p>
   <p>
     Adds more details to output logging.

packages/@angular/cli/blueprints/ng/files/package.json

@@ -37,9 +37,9 @@
     "karma-cli": "~1.0.1",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-coverage-istanbul-reporter": "^0.2.0",<% if(e2e) { %>
+    "karma-coverage-istanbul-reporter": "^0.2.0",
     "protractor": "~5.1.0",
-    "ts-node": "~2.0.0",<% } %>
+    "ts-node": "~2.0.0",
     "tslint": "~4.5.0",
     "typescript": "~2.2.0"
   }

packages/@angular/cli/blueprints/ng/index.ts

@@ -35,7 +35,6 @@ export default Blueprint.extend({
     // set this.tests to opposite of skipTest options,
     // meaning if tests are being skipped then the default.spec.BLUEPRINT will be false
     this.tests = options.skipTests ? false : true;
-    this.e2e = options.skipE2e ? false : true;
 
     // Split/join with / not path.sep as reference to typings require forward slashes.
     const relativeRootPath = options.sourceDir.split('/').map(() => '..').join('/');
@@ -55,8 +54,7 @@ export default Blueprint.extend({
       routing: options.routing,
       inlineStyle: options.inlineStyle,
       inlineTemplate: options.inlineTemplate,
-      tests: this.tests,
-      e2e: this.e2e,
+      tests: this.tests
     };
   },
 
@@ -80,13 +78,6 @@ export default Blueprint.extend({
       fileList = fileList.filter(p => p.indexOf('app.component.spec.ts') < 0);
     }
 
-    if (this.options && this.options.skipE2e) {
-      fileList = fileList
-        .filter(p => p.indexOf('protractor.conf.js') < 0)
-        .filter(p => p.indexOf('app.po.ts') < 0)
-        .filter(p => p.indexOf('app.e2e-spec.ts') < 0);
-    }
-
     const cliConfig = CliConfig.fromProject();
     const ngConfig = cliConfig && cliConfig.config;
     if (!ngConfig || ngConfig.packageManager != 'yarn') {

packages/@angular/cli/commands/new.ts

@@ -62,13 +62,6 @@ const NewCommand = Command.extend({
       aliases: ['st'],
       description: 'Skip creating spec files.'
     },
-    {
-      name: 'skip-e2e',
-      type: Boolean,
-      default: false,
-      aliases: ['s2'],
-      description: 'Skip creating e2e files.'
-    },
     {
       name: 'skip-commit',
       type: Boolean,

packages/@angular/cli/tasks/init.ts

@@ -78,8 +78,7 @@ export default Task.extend({
       inlineTemplate: commandOptions.inlineTemplate,
       ignoredUpdateFiles: ['favicon.ico'],
       skipGit: commandOptions.skipGit,
-      skipTests: commandOptions.skipTests,
-      skipE2e: commandOptions.skipE2e
+      skipTests: commandOptions.skipTests
     };
 
     validateProjectName(packageName);