fix schematic tests

Author: mmalerba

src/cdk/schematics/ng-add/index.spec.ts

@@ -6,9 +6,9 @@ describe('CDK ng-add', () => {
   let runner: SchematicTestRunner;
   let appTree: Tree;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     runner = new SchematicTestRunner('schematics', require.resolve('../collection.json'));
-    appTree = createTestApp(runner);
+    appTree = await createTestApp(runner);
   });
 
   it('should update the package.json', () => {

src/cdk/schematics/ng-generate/drag-drop/index.spec.ts

@@ -20,8 +20,8 @@ describe('CDK drag-drop schematic', () => {
     runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json'));
   });
 
-  it('should create drag-drop files and add them to module', () => {
-    const tree = runner.runSchematic('drag-drop', baseOptions, createTestApp(runner));
+  it('should create drag-drop files and add them to module', async () => {
+    const tree = runner.runSchematic('drag-drop', baseOptions, await createTestApp(runner));
     const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
     const files = tree.files;
 
@@ -34,23 +34,23 @@ describe('CDK drag-drop schematic', () => {
     expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooComponent\r?\n/m);
   });
 
-  it('should add drag-drop module', () => {
-    const tree = runner.runSchematic('drag-drop', baseOptions, createTestApp(runner));
+  it('should add drag-drop module', async () => {
+    const tree = runner.runSchematic('drag-drop', baseOptions, await createTestApp(runner));
     const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
 
     expect(moduleContent).toContain('DragDropModule');
   });
 
   describe('style option', () => {
-    it('should respect the option value', () => {
+    it('should respect the option value', async () => {
       const tree = runner.runSchematic(
-          'drag-drop', {style: 'scss', ...baseOptions}, createTestApp(runner));
+          'drag-drop', {style: 'scss', ...baseOptions}, await createTestApp(runner));
 
       expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss');
     });
 
-    it('should respect the deprecated "styleext" option value', () => {
-      let tree = createTestApp(runner);
+    it('should respect the deprecated "styleext" option value', async () => {
+      let tree = await createTestApp(runner);
       const workspace = getWorkspace(tree);
       const project = getProjectFromWorkspace(workspace);
 
@@ -66,9 +66,9 @@ describe('CDK drag-drop schematic', () => {
       expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss');
     });
 
-    it('should not generate invalid stylesheets', () => {
+    it('should not generate invalid stylesheets', async () => {
       const tree = runner.runSchematic(
-          'drag-drop', {style: 'styl', ...baseOptions}, createTestApp(runner));
+          'drag-drop', {style: 'styl', ...baseOptions}, await createTestApp(runner));
 
       // In this case we expect the schematic to generate a plain "css" file because
       // the component schematics are using CSS style templates which are not compatible
@@ -79,56 +79,56 @@ describe('CDK drag-drop schematic', () => {
         'Expected the schematic to not generate a "stylus" file');
     });
 
-    it('should fall back to the @schematics/angular:component option value', () => {
+    it('should fall back to the @schematics/angular:component option value', async () => {
       const tree = runner.runSchematic(
-          'drag-drop', baseOptions, createTestApp(runner, {style: 'less'}));
+          'drag-drop', baseOptions, await createTestApp(runner, {style: 'less'}));
 
       expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less');
     });
   });
 
   describe('inlineStyle option', () => {
-    it('should respect the option value', () => {
+    it('should respect the option value', async () => {
       const tree = runner.runSchematic(
-          'drag-drop', {inlineStyle: true, ...baseOptions}, createTestApp(runner));
+          'drag-drop', {inlineStyle: true, ...baseOptions}, await createTestApp(runner));
 
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
     });
 
-    it('should fall back to the @schematics/angular:component option value', () => {
+    it('should fall back to the @schematics/angular:component option value', async () => {
       const tree = runner.runSchematic(
-          'drag-drop', baseOptions, createTestApp(runner, {inlineStyle: true}));
+          'drag-drop', baseOptions, await createTestApp(runner, {inlineStyle: true}));
 
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
     });
   });
 
   describe('inlineTemplate option', () => {
-    it('should respect the option value', () => {
+    it('should respect the option value', async () => {
       const tree = runner.runSchematic(
-          'drag-drop', {inlineTemplate: true, ...baseOptions}, createTestApp(runner));
+          'drag-drop', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner));
 
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
     });
 
-    it('should fall back to the @schematics/angular:component option value', () => {
+    it('should fall back to the @schematics/angular:component option value', async () => {
       const tree = runner.runSchematic(
-          'drag-drop', baseOptions, createTestApp(runner, {inlineTemplate: true}));
+          'drag-drop', baseOptions, await createTestApp(runner, {inlineTemplate: true}));
 
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
     });
   });
 
   describe('skipTests option', () => {
-    it('should respect the option value', () => {
+    it('should respect the option value', async () => {
       const tree = runner.runSchematic(
-          'drag-drop', {skipTests: true, ...baseOptions}, createTestApp(runner));
+          'drag-drop', {skipTests: true, ...baseOptions}, await createTestApp(runner));
 
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts');
     });
 
-    it('should respect the deprecated global "spec" option value', () => {
-      let tree = createTestApp(runner);
+    it('should respect the deprecated global "spec" option value', async () => {
+      let tree = await createTestApp(runner);
       const workspace = getWorkspace(tree);
       const project = getProjectFromWorkspace(workspace);
 
@@ -144,9 +144,9 @@ describe('CDK drag-drop schematic', () => {
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts');
     });
 
-    it('should fall back to the @schematics/angular:component option value', () => {
+    it('should fall back to the @schematics/angular:component option value', async () => {
       const tree = runner.runSchematic(
-          'drag-drop', baseOptions, createTestApp(runner, {skipTests: true}));
+          'drag-drop', baseOptions, await createTestApp(runner, {skipTests: true}));
 
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts');
     });

src/cdk/schematics/ng-update/test-cases/misc/method-call-checks.spec.ts

@@ -4,8 +4,8 @@ import {createTestCaseSetup} from '../../../testing';
 describe('v6 method call checks', () => {
 
   it('should properly report invalid method calls', async () => {
-    const {runFixers, removeTempDir} = createTestCaseSetup('migration-v6', migrationCollection,
-      [require.resolve('./method-call-checks_input.ts')]);
+    const {runFixers, removeTempDir} = await createTestCaseSetup('migration-v6',
+        migrationCollection, [require.resolve('./method-call-checks_input.ts')]);
 
     const {logOutput} = await runFixers();
 

src/cdk/schematics/testing/test-app.ts

@@ -9,13 +9,14 @@
 import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
 
 /** Create a base app used for testing. */
-export function createTestApp(runner: SchematicTestRunner, appOptions = {}): UnitTestTree {
+export async function createTestApp(runner: SchematicTestRunner, appOptions = {}):
+    Promise<UnitTestTree> {
   const workspaceTree = runner.runExternalSchematic('@schematics/angular', 'workspace', {
     name: 'workspace',
     version: '6.0.0',
     newProjectRoot: 'projects',
   });
 
-  return runner.runExternalSchematic('@schematics/angular', 'application',
-      {name: 'material', ...appOptions}, workspaceTree);
+  return runner.runExternalSchematicAsync('@schematics/angular', 'application',
+      {name: 'material', ...appOptions}, workspaceTree).toPromise();
 }

src/cdk/schematics/testing/test-case-setup.ts

@@ -30,9 +30,9 @@ export function readFileContent(filePath: string): string {
  * Creates a test app schematic tree that will be copied over to a real filesystem location.
  * This is necessary because TSLint is not able to read from the virtual filesystem tree.
  */
-export function createFileSystemTestApp(runner: SchematicTestRunner) {
+export async function createFileSystemTestApp(runner: SchematicTestRunner) {
   const tempFileSystemHost = new TempScopedNodeJsSyncHost();
-  const appTree: UnitTestTree = createTestApp(runner, {name: 'cdk-testing'});
+  const appTree: UnitTestTree = await createTestApp(runner, {name: 'cdk-testing'});
   const tempPath = getSystemPath(tempFileSystemHost.root);
 
   // Since the TSLint fix task expects all files to be present on the real file system, we
@@ -44,7 +44,7 @@ export function createFileSystemTestApp(runner: SchematicTestRunner) {
   return {appTree, tempPath, removeTempDir: () => removeSync(tempPath)};
 }
 
-export function createTestCaseSetup(migrationName: string, collectionPath: string,
+export async function createTestCaseSetup(migrationName: string, collectionPath: string,
                                    inputFiles: string[]) {
 
   const runner = new SchematicTestRunner('schematics', collectionPath);
@@ -53,7 +53,7 @@ export function createTestCaseSetup(migrationName: string, collectionPath: strin
   let logOutput = '';
   runner.logger.subscribe(entry => logOutput += entry.message);
 
-  const {appTree, tempPath, removeTempDir} = createFileSystemTestApp(runner);
+  const {appTree, tempPath, removeTempDir} = await createFileSystemTestApp(runner);
 
   // Write each test-case input to the file-system. This is necessary because otherwise
   // TSLint won't be able to pick up the test cases.
@@ -66,7 +66,7 @@ export function createTestCaseSetup(migrationName: string, collectionPath: strin
   });
 
   const runFixers = async function() {
-    runner.runSchematic(migrationName, {}, appTree);
+    await runner.runSchematicAsync(migrationName, {}, appTree).toPromise();
 
     // Switch to the new temporary directory because otherwise TSLint cannot read the files.
     process.chdir(tempPath);
@@ -149,7 +149,7 @@ export function defineJasmineTestCases(versionName: string, collectionFile: stri
 
   beforeAll(async () => {
     const {tempPath, runFixers, removeTempDir} =
-      createTestCaseSetup(`migration-${versionName}`, collectionFile, inputFiles);
+      await createTestCaseSetup(`migration-${versionName}`, collectionFile, inputFiles);
 
     await runFixers();
 

src/material/schematics/ng-add/index.spec.ts

@@ -16,9 +16,9 @@ describe('ng-add schematic', () => {
   let runner: SchematicTestRunner;
   let appTree: Tree;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     runner = new SchematicTestRunner('schematics', require.resolve('../collection.json'));
-    appTree = createTestApp(runner);
+    appTree = await createTestApp(runner);
   });
 
   /** Expects the given file to be in the styles of the specified workspace project. */
@@ -77,9 +77,9 @@ describe('ng-add schematic', () => {
         './node_modules/@angular/material/prebuilt-themes/indigo-pink.css');
   });
 
-  it('should support adding a custom theme', () => {
+  it('should support adding a custom theme', async () => {
     // TODO(devversion): do not re-create test app here.
-    appTree = createTestApp(runner, {style: 'scss'});
+    appTree = await createTestApp(runner, {style: 'scss'});
 
     const tree = runner.runSchematic('ng-add-setup-project', {theme: 'custom'}, appTree);
 
@@ -94,9 +94,9 @@ describe('ng-add schematic', () => {
     expect(themeContent).toContain(`$app-primary: mat-palette(`);
   });
 
-  it('should create a custom theme file if no SCSS file could be found', () => {
+  it('should create a custom theme file if no SCSS file could be found', async () => {
     // TODO(devversion): do not re-create test app here.
-    appTree = createTestApp(runner, {style: 'css'});
+    appTree = await createTestApp(runner, {style: 'css'});
 
     const tree = runner.runSchematic('ng-add-setup-project', {theme: 'custom'}, appTree);
     const workspace = getWorkspace(tree);

src/material/schematics/ng-generate/address-form/index.spec.ts

@@ -14,8 +14,8 @@ describe('Material address-form schematic', () => {
     runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json'));
   });
 
-  it('should create address-form files and add them to module', () => {
-    const tree = runner.runSchematic('address-form', baseOptions, createTestApp(runner));
+  it('should create address-form files and add them to module', async () => {
+    const tree = runner.runSchematic('address-form', baseOptions, await createTestApp(runner));
     const files = tree.files;
 
     expect(files).toContain('/projects/material/src/app/foo/foo.component.css');
@@ -28,8 +28,8 @@ describe('Material address-form schematic', () => {
     expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooComponent\r?\n/m);
   });
 
-  it('should add address-form imports to module', () => {
-    const tree = runner.runSchematic('address-form', baseOptions, createTestApp(runner));
+  it('should add address-form imports to module', async () => {
+    const tree = runner.runSchematic('address-form', baseOptions, await createTestApp(runner));
     const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
 
     expect(moduleContent).toContain('MatInputModule');
@@ -39,71 +39,72 @@ describe('Material address-form schematic', () => {
     expect(moduleContent).toContain('ReactiveFormsModule');
   });
 
-  it('should throw if no name has been specified', () => {
+  it('should throw if no name has been specified', async () => {
+    const appTree = await createTestApp(runner);
     expect(() => {
-      runner.runSchematic('address-form', {project: 'material'}, createTestApp(runner));
+      runner.runSchematic('address-form', {project: 'material'}, appTree);
     }).toThrowError(/required property 'name'/);
   });
 
   describe('style option', () => {
-    it('should respect the option value', () => {
+    it('should respect the option value', async () => {
       const tree = runner.runSchematic(
-          'address-form', {style: 'scss', ...baseOptions}, createTestApp(runner));
+          'address-form', {style: 'scss', ...baseOptions}, await createTestApp(runner));
 
       expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss');
     });
 
-    it('should fall back to the @schematics/angular:component option value', () => {
+    it('should fall back to the @schematics/angular:component option value', async () => {
       const tree = runner.runSchematic(
-          'address-form', baseOptions, createTestApp(runner, {style: 'less'}));
+          'address-form', baseOptions, await createTestApp(runner, {style: 'less'}));
 
       expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less');
     });
   });
 
   describe('inlineStyle option', () => {
-    it('should respect the option value', () => {
+    it('should respect the option value', async () => {
       const tree = runner.runSchematic(
-          'address-form', {inlineStyle: true, ...baseOptions}, createTestApp(runner));
+          'address-form', {inlineStyle: true, ...baseOptions}, await createTestApp(runner));
 
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
     });
 
-    it('should fall back to the @schematics/angular:component option value', () => {
+    it('should fall back to the @schematics/angular:component option value', async () => {
       const tree = runner.runSchematic(
-          'address-form', baseOptions, createTestApp(runner, {inlineStyle: true}));
+          'address-form', baseOptions, await createTestApp(runner, {inlineStyle: true}));
 
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
     });
   });
 
   describe('inlineTemplate option', () => {
-    it('should respect the option value', () => {
+    it('should respect the option value', async () => {
       const tree = runner.runSchematic(
-          'address-form', {inlineTemplate: true, ...baseOptions}, createTestApp(runner));
+          'address-form', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner));
 
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
     });
 
-    it('should fall back to the @schematics/angular:component option value', () => {
+    it('should fall back to the @schematics/angular:component option value', async () => {
       const tree = runner.runSchematic(
-          'address-form', baseOptions, createTestApp(runner, {inlineTemplate: true}));
+          'address-form', baseOptions, await createTestApp(runner, {inlineTemplate: true}));
 
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
     });
   });
 
   describe('skipTests option', () => {
-    it('should respect the option value', () => {
+    it('should respect the option value', async () => {
       const tree = runner.runSchematic(
-          'address-form', {skipTests: true, ...baseOptions}, createTestApp(runner));
+          'address-form', {skipTests: true, ...baseOptions}, await createTestApp(runner));
 
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts');
     });
 
-    it('should fall back to the @schematics/angular:component option value', () => {
+    it('should fall back to the @schematics/angular:component option value', async () => {
       const tree = runner.runSchematic(
-          'address-form', baseOptions, createTestApp(runner, {skipTests: true}));
+          'address-form', baseOptions, await createTestApp(runner, {skipTests: true}));
 
       expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts');
     });