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

sumitarora · hansl · commit fdea2df02719 · 2017-03-31T16:57:16.000-07:00
diff --git a/docs/documentation/new.md b/docs/documentation/new.md
@@ -108,6 +108,16 @@ Default applications are created in a directory of the same name, with an initia
   </p>
 </details>
 
+<details>
+  <summary>skip-e2e</summary>
+  <p>
+    `--skip-e2e` (alias: `-se`) _default value: false_
+  </p>
+  <p>
+    Skip creating e2e spec files.
+  </p>
+</details>
+
 <details>
   <summary>source-dir</summary>
   <p>
diff --git a/packages/@angular/cli/blueprints/ng/files/package.json b/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",
+    "karma-coverage-istanbul-reporter": "^0.2.0",<% if(e2e) { %>
     "protractor": "~5.1.0",
-    "ts-node": "~2.0.0",
+    "ts-node": "~2.0.0",<% } %>
     "tslint": "~4.5.0",
     "typescript": "~2.2.0"
   }
diff --git a/packages/@angular/cli/blueprints/ng/index.ts b/packages/@angular/cli/blueprints/ng/index.ts
@@ -35,6 +35,7 @@ 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('/');
@@ -54,7 +55,8 @@ export default Blueprint.extend({
       routing: options.routing,
       inlineStyle: options.inlineStyle,
       inlineTemplate: options.inlineTemplate,
-      tests: this.tests
+      tests: this.tests,
+      e2e: this.e2e,
     };
   },
 
@@ -78,6 +80,13 @@ 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') {
diff --git a/packages/@angular/cli/commands/new.ts b/packages/@angular/cli/commands/new.ts
@@ -62,6 +62,13 @@ 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,
diff --git a/packages/@angular/cli/tasks/init.ts b/packages/@angular/cli/tasks/init.ts
@@ -78,7 +78,8 @@ export default Task.extend({
       inlineTemplate: commandOptions.inlineTemplate,
       ignoredUpdateFiles: ['favicon.ico'],
       skipGit: commandOptions.skipGit,
-      skipTests: commandOptions.skipTests
+      skipTests: commandOptions.skipTests,
+      skipE2e: commandOptions.skipE2e
     };
 
     validateProjectName(packageName);
