fix(@schematics/angular): generate application with projectRoot is pr…

…ovided
angular · Aug 17, 2018 · 62d0728 · 62d0728
1 parent 53684fe
commit 62d0728
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/docs/documentation/generate/application.md b/docs/documentation/generate/application.md
@@ -96,3 +96,12 @@ Create an Angular application.
     Do not add dependencies to package.json.
   </p>
 </details>
+<details>
+  <summary>project-root</summary>
+  <p>
+    <code>--project-root</code>
+  </p>
+  <p>
+    Specify root folder for new application and e2e tests
+  </p>
+</details>
diff --git a/docs/documentation/stories/multiple-projects.md b/docs/documentation/stories/multiple-projects.md
@@ -7,7 +7,7 @@ To create another app you can use the following command:
 ng generate application my-other-app
 ```
 
-The new application will be generated inside `projects/my-other-app`.
+The new application will be generated inside `projects/my-other-app`. If you wish to override root folder specify `--project-root applicationPath`
 
 Now we can `serve`, `build` etc. both the apps by passing the project name with the commands:
 

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
@@ -270,10 +270,8 @@ export default function (options: ApplicationOptions): Rule {
       name: `${options.name}-e2e`,
       relatedAppName: options.name,
       rootSelector: appRootSelector,
+      projectRoot: `${newProjectRoot}/e2e`,
     };
-    if (options.projectRoot !== undefined) {
-      e2eOptions.projectRoot = 'e2e';
-    }
 
     return chain([
       addAppToWorkspaceFile(options, workspace),