fix(@schematics/angular): e2e should use the prefix

Now that the CLI repects the prefix specified, the generated e2e test should also use it.
angular · May 14, 2018 · 8a72879 · 8a72879
1 parent 6b04749
commit 8a72879
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
@@ -275,6 +275,7 @@ export default function (options: ApplicationOptions): Rule {
       name: `${options.name}-e2e`,
       relatedAppName: options.name,
       rootSelector: appRootSelector,
+      prefix: options.prefix || 'app',
     };
     if (options.projectRoot !== undefined) {
       e2eOptions.projectRoot = 'e2e';

diff --git a/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts b/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts
@@ -9,6 +9,6 @@ describe('workspace-project App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to app!');
+    expect(page.getParagraphText()).toEqual('Welcome to <%= prefix %>!');
   });
 });
diff --git a/packages/schematics/angular/e2e/schema.d.ts b/packages/schematics/angular/e2e/schema.d.ts
@@ -23,4 +23,8 @@ export interface Schema {
      * The name of the app being tested.
      */
     relatedAppName: string;
+    /**
+     * The prefix to apply.
+     */
+    prefix?: string;
 }
diff --git a/packages/schematics/angular/e2e/schema.json b/packages/schematics/angular/e2e/schema.json
@@ -26,6 +26,13 @@
     "relatedAppName": {
       "description": "The name of the app being tested.",
       "type": "string"
+    },
+    "prefix": {
+      "type": "string",
+      "format": "html-selector",
+      "description": "The prefix to apply to generated selectors.",
+      "default": "app",
+      "alias": "p"
     }
   },
   "required": [