fix(@schematics/angular): implements items type

Fixes the type of the items in the `schema.json` for `implements`, as `enum` is not picked up by the CLI.
Also migrates the existing e2e test to `async/await` and adds another one with `implements` to avoid regressions.

Author: cexbrayat

packages/schematics/angular/guard/index.ts

@@ -22,7 +22,7 @@ import {
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
 import { createDefaultPath } from '../utility/workspace';
-import { Implement as GuardInterface, Schema as GuardOptions } from './schema';
+import { Schema as GuardOptions } from './schema';
 
 
 export default function (options: GuardOptions): Rule {
@@ -38,7 +38,7 @@ export default function (options: GuardOptions): Rule {
     const implementations = options.implements.join(', ');
     let implementationImports = `${implementations}, `;
     // As long as we aren't in IE... ;)
-    if (options.implements.includes(GuardInterface.CanLoad)) {
+    if (options.implements.includes('CanLoad')) {
       implementationImports = `${implementationImports}Route, UrlSegment, `;
     }
 

packages/schematics/angular/guard/schema.json

@@ -55,11 +55,7 @@
       "description": "Specifies which interfaces to implement.",
       "uniqueItems": true,
       "items": {
-        "enum": [
-          "CanActivate",
-          "CanActivateChild",
-          "CanLoad"
-        ]
+        "type": "string"
       },
       "default": [
         "CanActivate"

tests/legacy-cli/e2e/tests/generate/guard/guard-basic.ts

@@ -1,19 +1,16 @@
 import {join} from 'path';
 import {ng} from '../../../utils/process';
-import {expectFileToExist} from '../../../utils/fs';
+import {expectFileToExist, expectFileToMatch} from '../../../utils/fs';
 
 
-export default function() {
+export default async function() {
   // Does not create a sub directory.
   const guardDir = join('src', 'app');
 
-  return ng('generate', 'guard', 'test-guard')
-    .then(() => expectFileToExist(guardDir))
-    .then(() => expectFileToExist(join(guardDir, 'test-guard.guard.ts')))
-    .then(() => expectFileToExist(join(guardDir, 'test-guard.guard.spec.ts')));
-
-
-    // Try to run the unit tests.
-    // TODO: Enable once schematic is updated for rxjs 6
-    // .then(() => ng('test', '--watch=false'));
+  await ng('generate', 'guard', 'test-guard');
+  await expectFileToExist(guardDir);
+  await expectFileToExist(join(guardDir, 'test-guard.guard.ts'));
+  await expectFileToMatch(join(guardDir, 'test-guard.guard.ts'), /implements CanActivate/);
+  await expectFileToExist(join(guardDir, 'test-guard.guard.spec.ts'));
+  await ng('test', '--watch=false');
 }

tests/legacy-cli/e2e/tests/generate/guard/guard-implements.ts

@@ -0,0 +1,16 @@
+import {join} from 'path';
+import {ng} from '../../../utils/process';
+import {expectFileToExist,expectFileToMatch} from '../../../utils/fs';
+
+
+export default async function() {
+  // Does not create a sub directory.
+  const guardDir = join('src', 'app');
+
+  await ng('generate', 'guard', 'load', '--implements=CanLoad');
+  await expectFileToExist(guardDir);
+  await expectFileToExist(join(guardDir, 'load.guard.ts'));
+  await expectFileToMatch(join(guardDir, 'load.guard.ts'), /implements CanLoad/);
+  await expectFileToExist(join(guardDir, 'load.guard.spec.ts'));
+  await ng('test', '--watch=false');
+}