skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

test(schematics): move away from deprecated test API (#16150)

Browse Source 
In 8.0 the `runSchematic` method is marked as deprecated. These changes switch all the usages to `runSchematicAsync`.
This commit is contained in:
Kristiyan Kostadinov
2019-05-31 22:58:25 +02:00
committed by Andrew Seguin
parent 2b07377b35
commit b261afab5d
8 changed files with 224 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cdk/schematics/ng-add/index.spec.ts
+2 -2
View File
@@ -11,8 +11,8 @@ describe('CDK ng-add', () => {
appTree = await createTestApp(runner);
});
it('should update the package.json', () => {
const tree = runner.runSchematic('ng-add', {}, appTree);
it('should update the package.json', async () => {
const tree = await runner.runSchematicAsync('ng-add', {}, appTree).toPromise();
const packageJson = JSON.parse(getFileContent(tree, '/package.json'));
const dependencies = packageJson.dependencies;
src/cdk/schematics/ng-generate/drag-drop/index.spec.ts
+26 -23
View File
@@ -1,7 +1,6 @@
import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
import {getProjectFromWorkspace} from '@angular/cdk/schematics';
import {getWorkspace} from '@schematics/angular/utility/config';
import {getProject} from '@schematics/angular/utility/project';
import {createTestApp, getFileContent} from '../../testing';
import {Schema} from './schema';
@@ -21,7 +20,8 @@ describe('CDK drag-drop schematic', () => {
});
it('should create drag-drop files and add them to module', async () => {
const tree = runner.runSchematic('drag-drop', baseOptions, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync('drag-drop', baseOptions, app).toPromise();
const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
const files = tree.files;
@@ -35,7 +35,8 @@ describe('CDK drag-drop schematic', () => {
});
it('should add drag-drop module', async () => {
const tree = runner.runSchematic('drag-drop', baseOptions, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync('drag-drop', baseOptions, app).toPromise();
const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
expect(moduleContent).toContain('DragDropModule');
@@ -43,8 +44,8 @@ describe('CDK drag-drop schematic', () => {
describe('style option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'drag-drop', {style: 'scss', ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'drag-drop', {style: 'scss', ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss');
});
@@ -61,14 +62,14 @@ describe('CDK drag-drop schematic', () => {
project.schematics!['@schematics/angular:component'] = {styleext: 'scss'};
tree.overwrite('angular.json', JSON.stringify(workspace));
tree = runner.runSchematic('drag-drop', baseOptions, tree);
tree = await runner.runSchematicAsync('drag-drop', baseOptions, tree).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss');
});
it('should not generate invalid stylesheets', async () => {
const tree = runner.runSchematic(
'drag-drop', {style: 'styl', ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'drag-drop', {style: 'styl', ...baseOptions}, await createTestApp(runner)).toPromise();
// 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
@@ -80,8 +81,8 @@ describe('CDK drag-drop schematic', () => {
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'drag-drop', baseOptions, await createTestApp(runner, {style: 'less'}));
const tree = await runner.runSchematicAsync(
'drag-drop', baseOptions, await createTestApp(runner, {style: 'less'})).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less');
});
@@ -89,15 +90,16 @@ describe('CDK drag-drop schematic', () => {
describe('inlineStyle option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'drag-drop', {inlineStyle: true, ...baseOptions}, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync(
'drag-drop', {inlineStyle: true, ...baseOptions}, app).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'drag-drop', baseOptions, await createTestApp(runner, {inlineStyle: true}));
const tree = await runner.runSchematicAsync(
'drag-drop', baseOptions, await createTestApp(runner, {inlineStyle: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
});
@@ -105,15 +107,16 @@ describe('CDK drag-drop schematic', () => {
describe('inlineTemplate option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'drag-drop', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync(
'drag-drop', {inlineTemplate: true, ...baseOptions}, app).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'drag-drop', baseOptions, await createTestApp(runner, {inlineTemplate: true}));
const app = await createTestApp(runner, {inlineTemplate: true});
const tree = await runner.runSchematicAsync('drag-drop', baseOptions, app).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
});
@@ -121,8 +124,8 @@ describe('CDK drag-drop schematic', () => {
describe('skipTests option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'drag-drop', {skipTests: true, ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'drag-drop', {skipTests: true, ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts');
});
@@ -139,14 +142,14 @@ describe('CDK drag-drop schematic', () => {
project.schematics!['@schematics/angular:component'] = {spec: false};
tree.overwrite('angular.json', JSON.stringify(workspace));
tree = runner.runSchematic('drag-drop', baseOptions, tree);
tree = await runner.runSchematicAsync('drag-drop', baseOptions, tree).toPromise();
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', async () => {
const tree = runner.runSchematic(
'drag-drop', baseOptions, await createTestApp(runner, {skipTests: true}));
const tree = await runner.runSchematicAsync(
'drag-drop', baseOptions, await createTestApp(runner, {skipTests: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts');
});
src/material/schematics/ng-add/index.spec.ts
+46 -35
View File
@@ -34,13 +34,13 @@ describe('ng-add schematic', () => {
tree.overwrite('/package.json', JSON.stringify(packageContent, null, 2));
}
it('should update package.json', () => {
it('should update package.json', async () => {
// By default, the Angular workspace schematic sets up "@angular/animations". In order
// to verify that we would set up the dependency properly if someone doesn't have the
// animations installed already, we remove the animations dependency explicitly.
removePackageJsonDependency(appTree, '@angular/animations');
const tree = runner.runSchematic('ng-add', {}, appTree);
const tree = await runner.runSchematicAsync('ng-add', {}, appTree).toPromise();
const packageJson = JSON.parse(getFileContent(tree, '/package.json'));
const dependencies = packageJson.dependencies;
const angularCoreVersion = dependencies['@angular/core'];
@@ -59,16 +59,16 @@ describe('ng-add schematic', () => {
expect(runner.tasks.some(task => task.name === 'run-schematic')).toBe(true);
});
it('should add hammerjs import to project main file', () => {
const tree = runner.runSchematic('ng-add-setup-project', {}, appTree);
it('should add hammerjs import to project main file', async () => {
const tree = await runner.runSchematicAsync('ng-add-setup-project', {}, appTree).toPromise();
const fileContent = getFileContent(tree, '/projects/material/src/main.ts');
expect(fileContent).toContain(`import 'hammerjs';`,
'Expected the project main file to contain a HammerJS import.');
});
it('should add default theme', () => {
const tree = runner.runSchematic('ng-add-setup-project', {}, appTree);
it('should add default theme', async () => {
const tree = await runner.runSchematicAsync('ng-add-setup-project', {}, appTree).toPromise();
const workspace = getWorkspace(tree);
const project = getProjectFromWorkspace(workspace);
@@ -81,7 +81,8 @@ describe('ng-add schematic', () => {
// TODO(devversion): do not re-create test app here.
appTree = await createTestApp(runner, {style: 'scss'});
const tree = runner.runSchematic('ng-add-setup-project', {theme: 'custom'}, appTree);
const tree = await runner.runSchematicAsync('ng-add-setup-project',
{theme: 'custom'}, appTree).toPromise();
const workspace = getWorkspace(tree);
const project = getProjectFromWorkspace(workspace);
@@ -98,7 +99,8 @@ describe('ng-add schematic', () => {
// TODO(devversion): do not re-create test app here.
appTree = await createTestApp(runner, {style: 'css'});
const tree = runner.runSchematic('ng-add-setup-project', {theme: 'custom'}, appTree);
const tree = await runner.runSchematicAsync('ng-add-setup-project',
{theme: 'custom'}, appTree).toPromise();
const workspace = getWorkspace(tree);
const project = getProjectFromWorkspace(workspace);
const expectedStylesPath = normalize(`/${project.root}/src/custom-theme.scss`);
@@ -107,8 +109,8 @@ describe('ng-add schematic', () => {
expectProjectStyleFile(project, 'projects/material/src/custom-theme.scss');
});
it('should add font links', () => {
const tree = runner.runSchematic('ng-add-setup-project', {}, appTree);
it('should add font links', async () => {
const tree = await runner.runSchematicAsync('ng-add-setup-project', {}, appTree).toPromise();
const workspace = getWorkspace(tree);
const project = getProjectFromWorkspace(workspace);
@@ -125,8 +127,8 @@ describe('ng-add schematic', () => {
' <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500"');
});
it('should add material app styles', () => {
const tree = runner.runSchematic('ng-add-setup-project', {}, appTree);
it('should add material app styles', async () => {
const tree = await runner.runSchematicAsync('ng-add-setup-project', {}, appTree).toPromise();
const workspace = getWorkspace(tree);
const project = getProjectFromWorkspace(workspace);
@@ -140,16 +142,16 @@ describe('ng-add schematic', () => {
describe('gestures disabled', () => {
it('should not add hammerjs to package.json', () => {
const tree = runner.runSchematic('ng-add', {gestures: false}, appTree);
it('should not add hammerjs to package.json', async () => {
const tree = await runner.runSchematicAsync('ng-add', {gestures: false}, appTree).toPromise();
const packageJson = JSON.parse(getFileContent(tree, '/package.json'));
expect(packageJson.dependencies['hammerjs'])
.toBeUndefined(`Expected 'hammerjs' to be not added to the package.json`);
});
it('should not add hammerjs import to project main file', () => {
const tree = runner.runSchematic('ng-add', {gestures: false}, appTree);
it('should not add hammerjs import to project main file', async () => {
const tree = await runner.runSchematicAsync('ng-add', {gestures: false}, appTree).toPromise();
const fileContent = getFileContent(tree, '/projects/material/src/main.ts');
expect(fileContent).not.toContain(`import 'hammerjs';`,
@@ -158,15 +160,15 @@ describe('ng-add schematic', () => {
});
describe('animations enabled', () => {
it('should add the BrowserAnimationsModule to the project module', () => {
const tree = runner.runSchematic('ng-add-setup-project', {}, appTree);
it('should add the BrowserAnimationsModule to the project module', async () => {
const tree = await runner.runSchematicAsync('ng-add-setup-project', {}, appTree).toPromise();
const fileContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
expect(fileContent).toContain('BrowserAnimationsModule',
'Expected the project app module to import the "BrowserAnimationsModule".');
});
it('should not add BrowserAnimationsModule if NoopAnimationsModule is set up', () => {
it('should not add BrowserAnimationsModule if NoopAnimationsModule is set up', async () => {
const workspace = getWorkspace(appTree);
const project = getProjectFromWorkspace(workspace);
@@ -178,7 +180,7 @@ describe('ng-add schematic', () => {
'@angular/platform-browser/animations', project);
spyOn(console, 'warn');
runner.runSchematic('ng-add-setup-project', {}, appTree);
await runner.runSchematicAsync('ng-add-setup-project', {}, appTree).toPromise();
expect(console.warn).toHaveBeenCalledWith(
jasmine.stringMatching(/Could not set up "BrowserAnimationsModule"/));
@@ -186,8 +188,9 @@ describe('ng-add schematic', () => {
});
describe('animations disabled', () => {
it('should add the NoopAnimationsModule to the project module', () => {
const tree = runner.runSchematic('ng-add-setup-project', {animations: false}, appTree);
it('should add the NoopAnimationsModule to the project module', async () => {
const tree = await runner.runSchematicAsync('ng-add-setup-project',
{animations: false}, appTree).toPromise();
const fileContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
expect(fileContent).toContain('NoopAnimationsModule',
@@ -221,18 +224,25 @@ describe('ng-add schematic', () => {
tree.overwrite('/angular.json', JSON.stringify(workspace, null, 2));
}
it('should throw an error if the "build" target has been changed', () => {
it('should throw an error if the "build" target has been changed', async () => {
overwriteTargetBuilder(appTree, 'build', 'thirdparty-builder');
expect(() => runner.runSchematic('ng-add-setup-project', {}, appTree))
.toThrowError(/not using the default builders.*build/);
let message: string | null = null;
try {
await runner.runSchematicAsync('ng-add-setup-project', {}, appTree).toPromise();
} catch (e) {
message = e.message;
}
expect(message).toMatch(/not using the default builders.*build/);
});
it('should warn if the "test" target has been changed', () => {
it('should warn if the "test" target has been changed', async () => {
overwriteTargetBuilder(appTree, 'test', 'thirdparty-test-builder');
spyOn(console, 'warn');
runner.runSchematic('ng-add-setup-project', {}, appTree);
await runner.runSchematicAsync('ng-add-setup-project', {}, appTree).toPromise();
expect(console.warn).toHaveBeenCalledWith(
jasmine.stringMatching(/not using the default builders.*cannot add the configured theme/));
@@ -260,12 +270,12 @@ describe('ng-add schematic', () => {
tree.overwrite('/angular.json', JSON.stringify(workspace, null, 2));
}
it('should replace existing prebuilt theme files', () => {
it('should replace existing prebuilt theme files', async () => {
const existingThemePath =
'./node_modules/@angular/material/prebuilt-themes/purple-green.css';
writeStyleFileToWorkspace(appTree, existingThemePath);
const tree = runner.runSchematic('ng-add-setup-project', {}, appTree);
const tree = await runner.runSchematicAsync('ng-add-setup-project', {}, appTree).toPromise();
const workspace = getWorkspace(tree);
const project = getProjectFromWorkspace(workspace);
const styles = getProjectTargetOptions(project, 'build').styles;
@@ -276,11 +286,11 @@ describe('ng-add schematic', () => {
'Expected the default prebuilt theme to be added.');
});
it('should not replace existing custom theme files', () => {
it('should not replace existing custom theme files', async () => {
spyOn(console, 'warn');
writeStyleFileToWorkspace(appTree, './projects/material/custom-theme.scss');
const tree = runner.runSchematic('ng-add-setup-project', {}, appTree);
const tree = await runner.runSchematicAsync('ng-add-setup-project', {}, appTree).toPromise();
const workspace = getWorkspace(tree);
const project = getProjectFromWorkspace(workspace);
const styles = getProjectTargetOptions(project, 'build').styles;
@@ -291,10 +301,10 @@ describe('ng-add schematic', () => {
jasmine.stringMatching(/Could not add the selected theme/));
});
it('should not add a theme file multiple times', () => {
it('should not add a theme file multiple times', async () => {
writeStyleFileToWorkspace(appTree, defaultPrebuiltThemePath);
const tree = runner.runSchematic('ng-add-setup-project', {}, appTree);
const tree = await runner.runSchematicAsync('ng-add-setup-project', {}, appTree).toPromise();
const workspace = getWorkspace(tree);
const project = getProjectFromWorkspace(workspace);
const styles = getProjectTargetOptions(project, 'build').styles;
@@ -303,9 +313,10 @@ describe('ng-add schematic', () => {
'Expected the "styles.css" file and default prebuilt theme to be the only styles');
});
it('should not overwrite existing custom theme files', () => {
it('should not overwrite existing custom theme files', async () => {
appTree.create('/projects/material/custom-theme.scss', 'custom-theme');
const tree = runner.runSchematic('ng-add-setup-project', {theme: 'custom'}, appTree);
const tree = await runner.runSchematicAsync('ng-add-setup-project',
{theme: 'custom'}, appTree).toPromise();
expect(tree.readContent('/projects/material/custom-theme.scss')).toBe('custom-theme',
'Expected the old custom theme content to be unchanged.');
src/material/schematics/ng-generate/address-form/index.spec.ts
+32 -21
View File
@@ -15,7 +15,8 @@ describe('Material address-form schematic', () => {
});
it('should create address-form files and add them to module', async () => {
const tree = runner.runSchematic('address-form', baseOptions, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync('address-form', baseOptions, app).toPromise();
const files = tree.files;
expect(files).toContain('/projects/material/src/app/foo/foo.component.css');
@@ -29,7 +30,8 @@ describe('Material address-form schematic', () => {
});
it('should add address-form imports to module', async () => {
const tree = runner.runSchematic('address-form', baseOptions, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync('address-form', baseOptions, app).toPromise();
const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
expect(moduleContent).toContain('MatInputModule');
@@ -41,22 +43,28 @@ describe('Material address-form schematic', () => {
it('should throw if no name has been specified', async () => {
const appTree = await createTestApp(runner);
expect(() => {
runner.runSchematic('address-form', {project: 'material'}, appTree);
}).toThrowError(/required property 'name'/);
let message: string | null = null;
try {
await runner.runSchematicAsync('address-form', {project: 'material'}, appTree).toPromise();
} catch (e) {
message = e.message;
}
expect(message).toMatch(/required property 'name'/);
});
describe('style option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'address-form', {style: 'scss', ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'address-form', {style: 'scss', ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'address-form', baseOptions, await createTestApp(runner, {style: 'less'}));
const tree = await runner.runSchematicAsync(
'address-form', baseOptions, await createTestApp(runner, {style: 'less'})).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less');
});
@@ -64,15 +72,16 @@ describe('Material address-form schematic', () => {
describe('inlineStyle option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'address-form', {inlineStyle: true, ...baseOptions}, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync(
'address-form', {inlineStyle: true, ...baseOptions}, app).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'address-form', baseOptions, await createTestApp(runner, {inlineStyle: true}));
const app = await createTestApp(runner, {inlineStyle: true});
const tree = await runner.runSchematicAsync('address-form', baseOptions, app).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
});
@@ -80,15 +89,16 @@ describe('Material address-form schematic', () => {
describe('inlineTemplate option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'address-form', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync(
'address-form', {inlineTemplate: true, ...baseOptions}, app).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'address-form', baseOptions, await createTestApp(runner, {inlineTemplate: true}));
const app = await createTestApp(runner, {inlineTemplate: true});
const tree = await runner.runSchematicAsync('address-form', baseOptions, app).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
});
@@ -96,15 +106,16 @@ describe('Material address-form schematic', () => {
describe('skipTests option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'address-form', {skipTests: true, ...baseOptions}, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync(
'address-form', {skipTests: true, ...baseOptions}, app).toPromise();
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', async () => {
const tree = runner.runSchematic(
'address-form', baseOptions, await createTestApp(runner, {skipTests: true}));
const tree = await runner.runSchematicAsync(
'address-form', baseOptions, await createTestApp(runner, {skipTests: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts');
});
src/material/schematics/ng-generate/dashboard/index.spec.ts
+31 -21
View File
@@ -15,7 +15,8 @@ describe('material-dashboard-schematic', () => {
});
it('should create dashboard files and add them to module', async () => {
const tree = runner.runSchematic('dashboard', baseOptions, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync('dashboard', baseOptions, app).toPromise();
const files = tree.files;
expect(files).toContain('/projects/material/src/app/foo/foo.component.css');
@@ -29,7 +30,8 @@ describe('material-dashboard-schematic', () => {
});
it('should add dashboard imports to module', async () => {
const tree = runner.runSchematic('dashboard', baseOptions, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync('dashboard', baseOptions, app).toPromise();
const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
expect(moduleContent).toContain('MatGridListModule');
@@ -45,22 +47,28 @@ describe('material-dashboard-schematic', () => {
it('should throw if no name has been specified', async () => {
const appTree = await createTestApp(runner);
expect(() => {
runner.runSchematic('dashboard', {project: 'material'}, appTree);
}).toThrowError(/required property 'name'/);
let message: string | null = null;
try {
await runner.runSchematicAsync('dashboard', {project: 'material'}, appTree).toPromise();
} catch (e) {
message = e.message;
}
expect(message).toMatch(/required property 'name'/);
});
describe('style option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'dashboard', {style: 'scss', ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'dashboard', {style: 'scss', ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'dashboard', baseOptions, await createTestApp(runner, {style: 'less'}));
const tree = await runner.runSchematicAsync(
'dashboard', baseOptions, await createTestApp(runner, {style: 'less'})).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less');
});
@@ -68,15 +76,16 @@ describe('material-dashboard-schematic', () => {
describe('inlineStyle option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'dashboard', {inlineStyle: true, ...baseOptions}, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync(
'dashboard', {inlineStyle: true, ...baseOptions}, app).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'dashboard', baseOptions, await createTestApp(runner, {inlineStyle: true}));
const tree = await runner.runSchematicAsync(
'dashboard', baseOptions, await createTestApp(runner, {inlineStyle: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
});
@@ -84,15 +93,16 @@ describe('material-dashboard-schematic', () => {
describe('inlineTemplate option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'dashboard', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync(
'dashboard', {inlineTemplate: true, ...baseOptions}, app).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'dashboard', baseOptions, await createTestApp(runner, {inlineTemplate: true}));
const app = await createTestApp(runner, {inlineTemplate: true});
const tree = await runner.runSchematicAsync('dashboard', baseOptions, app).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
});
@@ -100,15 +110,15 @@ describe('material-dashboard-schematic', () => {
describe('skipTests option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'dashboard', {skipTests: true, ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'dashboard', {skipTests: true, ...baseOptions}, await createTestApp(runner)).toPromise();
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', async () => {
const tree = runner.runSchematic(
'dashboard', baseOptions, await createTestApp(runner, {skipTests: true}));
const tree = await runner.runSchematicAsync(
'dashboard', baseOptions, await createTestApp(runner, {skipTests: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts');
});
src/material/schematics/ng-generate/nav/index.spec.ts
+29 -21
View File
@@ -15,7 +15,8 @@ describe('material-nav-schematic', () => {
});
it('should create nav files and add them to module', async () => {
const tree = runner.runSchematic('nav', baseOptions, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync('nav', baseOptions, app).toPromise();
const files = tree.files;
expect(files).toContain('/projects/material/src/app/foo/foo.component.css');
@@ -29,7 +30,8 @@ describe('material-nav-schematic', () => {
});
it('should add nav imports to module', async () => {
const tree = runner.runSchematic('nav', baseOptions, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync('nav', baseOptions, app).toPromise();
const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
expect(moduleContent).toContain('LayoutModule');
@@ -47,22 +49,28 @@ describe('material-nav-schematic', () => {
it('should throw if no name has been specified', async () => {
const appTree = await createTestApp(runner);
expect(() => {
runner.runSchematic('nav', {project: 'material'}, appTree);
}).toThrowError(/required property 'name'/);
let message: string | null = null;
try {
await runner.runSchematicAsync('nav', {project: 'material'}, appTree).toPromise();
} catch (e) {
message = e.message;
}
expect(message).toMatch(/required property 'name'/);
});
describe('style option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'nav', {style: 'scss', ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'nav', {style: 'scss', ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'nav', baseOptions, await createTestApp(runner, {style: 'less'}));
const tree = await runner.runSchematicAsync(
'nav', baseOptions, await createTestApp(runner, {style: 'less'})).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less');
});
@@ -70,15 +78,15 @@ describe('material-nav-schematic', () => {
describe('inlineStyle option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'nav', {inlineStyle: true, ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'nav', {inlineStyle: true, ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'nav', baseOptions, await createTestApp(runner, {inlineStyle: true}));
const tree = await runner.runSchematicAsync(
'nav', baseOptions, await createTestApp(runner, {inlineStyle: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
});
@@ -86,15 +94,15 @@ describe('material-nav-schematic', () => {
describe('inlineTemplate option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'nav', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'nav', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'nav', baseOptions, await createTestApp(runner, {inlineTemplate: true}));
const tree = await runner.runSchematicAsync(
'nav', baseOptions, await createTestApp(runner, {inlineTemplate: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
});
@@ -102,15 +110,15 @@ describe('material-nav-schematic', () => {
describe('skipTests option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'nav', {skipTests: true, ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'nav', {skipTests: true, ...baseOptions}, await createTestApp(runner)).toPromise();
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', async () => {
const tree = runner.runSchematic(
'nav', baseOptions, await createTestApp(runner, {skipTests: true}));
const tree = await runner.runSchematicAsync(
'nav', baseOptions, await createTestApp(runner, {skipTests: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts');
});
src/material/schematics/ng-generate/table/index.spec.ts
+29 -21
View File
@@ -15,7 +15,8 @@ describe('material-table-schematic', () => {
});
it('should create table files and add them to module', async () => {
const tree = runner.runSchematic('table', baseOptions, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync('table', baseOptions, app).toPromise();
const files = tree.files;
expect(files).toContain('/projects/material/src/app/foo/foo.component.css');
@@ -41,7 +42,8 @@ describe('material-table-schematic', () => {
});
it('should add table imports to module', async () => {
const tree = runner.runSchematic('table', baseOptions, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync('table', baseOptions, app).toPromise();
const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
expect(moduleContent).toContain('MatTableModule');
@@ -54,22 +56,28 @@ describe('material-table-schematic', () => {
it('should throw if no name has been specified', async () => {
const appTree = await createTestApp(runner);
expect(() => {
runner.runSchematic('table', {project: 'material'}, appTree);
}).toThrowError(/required property 'name'/);
let message: string | null = null;
try {
await runner.runSchematicAsync('table', {project: 'material'}, appTree).toPromise();
} catch (e) {
message = e.message;
}
expect(message).toMatch(/required property 'name'/);
});
describe('style option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'table', {style: 'scss', ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'table', {style: 'scss', ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'table', baseOptions, await createTestApp(runner, {style: 'less'}));
const tree = await runner.runSchematicAsync(
'table', baseOptions, await createTestApp(runner, {style: 'less'})).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less');
});
@@ -77,15 +85,15 @@ describe('material-table-schematic', () => {
describe('inlineStyle option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'table', {inlineStyle: true, ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'table', {inlineStyle: true, ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'table', baseOptions, await createTestApp(runner, {inlineStyle: true}));
const tree = await runner.runSchematicAsync(
'table', baseOptions, await createTestApp(runner, {inlineStyle: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
});
@@ -93,15 +101,15 @@ describe('material-table-schematic', () => {
describe('inlineTemplate option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'table', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'table', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'table', baseOptions, await createTestApp(runner, {inlineTemplate: true}));
const tree = await runner.runSchematicAsync(
'table', baseOptions, await createTestApp(runner, {inlineTemplate: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
});
@@ -109,15 +117,15 @@ describe('material-table-schematic', () => {
describe('skipTests option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'table', {skipTests: true, ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'table', {skipTests: true, ...baseOptions}, await createTestApp(runner)).toPromise();
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', async () => {
const tree = runner.runSchematic(
'table', baseOptions, await createTestApp(runner, {skipTests: true}));
const tree = await runner.runSchematicAsync(
'table', baseOptions, await createTestApp(runner, {skipTests: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts');
});
src/material/schematics/ng-generate/tree/index.spec.ts
+29 -21
View File
@@ -15,7 +15,8 @@ describe('Material tree schematic', () => {
});
it('should create tree component files and add them to module', async () => {
const tree = runner.runSchematic('tree', baseOptions, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync('tree', baseOptions, app).toPromise();
const files = tree.files;
expect(files).toContain('/projects/material/src/app/foo/foo.component.css');
@@ -29,7 +30,8 @@ describe('Material tree schematic', () => {
});
it('should add tree imports to module', async () => {
const tree = runner.runSchematic('tree', baseOptions, await createTestApp(runner));
const app = await createTestApp(runner);
const tree = await runner.runSchematicAsync('tree', baseOptions, app).toPromise();
const moduleContent = getFileContent(tree, '/projects/material/src/app/app.module.ts');
expect(moduleContent).toContain('MatTreeModule');
@@ -39,22 +41,28 @@ describe('Material tree schematic', () => {
it('should throw if no name has been specified', async () => {
const appTree = await createTestApp(runner);
expect(() => {
runner.runSchematic('tree', {project: 'material'}, appTree);
}).toThrowError(/required property 'name'/);
let message: string | null = null;
try {
await runner.runSchematicAsync('tree', {project: 'material'}, appTree).toPromise();
} catch (e) {
message = e.message;
}
expect(message).toMatch(/required property 'name'/);
});
describe('style option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'tree', {style: 'scss', ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'tree', {style: 'scss', ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.scss');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'tree', baseOptions, await createTestApp(runner, {style: 'less'}));
const tree = await runner.runSchematicAsync(
'tree', baseOptions, await createTestApp(runner, {style: 'less'})).toPromise();
expect(tree.files).toContain('/projects/material/src/app/foo/foo.component.less');
});
@@ -62,15 +70,15 @@ describe('Material tree schematic', () => {
describe('inlineStyle option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'tree', {inlineStyle: true, ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'tree', {inlineStyle: true, ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'tree', baseOptions, await createTestApp(runner, {inlineStyle: true}));
const tree = await runner.runSchematicAsync(
'tree', baseOptions, await createTestApp(runner, {inlineStyle: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.css');
});
@@ -78,15 +86,15 @@ describe('Material tree schematic', () => {
describe('inlineTemplate option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'tree', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'tree', {inlineTemplate: true, ...baseOptions}, await createTestApp(runner)).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
});
it('should fall back to the @schematics/angular:component option value', async () => {
const tree = runner.runSchematic(
'tree', baseOptions, await createTestApp(runner, {inlineTemplate: true}));
const tree = await runner.runSchematicAsync(
'tree', baseOptions, await createTestApp(runner, {inlineTemplate: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.html');
});
@@ -94,15 +102,15 @@ describe('Material tree schematic', () => {
describe('skipTests option', () => {
it('should respect the option value', async () => {
const tree = runner.runSchematic(
'tree', {skipTests: true, ...baseOptions}, await createTestApp(runner));
const tree = await runner.runSchematicAsync(
'tree', {skipTests: true, ...baseOptions}, await createTestApp(runner)).toPromise();
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', async () => {
const tree = runner.runSchematic(
'tree', baseOptions, await createTestApp(runner, {skipTests: true}));
const tree = await runner.runSchematicAsync(
'tree', baseOptions, await createTestApp(runner, {skipTests: true})).toPromise();
expect(tree.files).not.toContain('/projects/material/src/app/foo/foo.component.spec.ts');
});