style: remove redundant console.log

This commit is contained in:
Alan 2019-06-25 09:32:28 +02:00 committed by vikerman
parent 01930d685d
commit 2c1b78f35d

View File

@ -31,7 +31,6 @@ describe('Component Schematic', () => {
project: 'bar',
};
const workspaceOptions: WorkspaceOptions = {
name: 'workspace',
newProjectRoot: 'projects',
@ -50,21 +49,23 @@ describe('Component Schematic', () => {
let appTree: UnitTestTree;
beforeEach(async () => {
appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
appTree = await schematicRunner
.runSchematicAsync('application', appOptions, appTree)
.toPromise();
});
it('should create a component', async () => {
const options = { ...defaultOptions };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const files = tree.files;
expect(files).toEqual(jasmine.arrayContaining([
'/projects/bar/src/app/foo/foo.component.css',
'/projects/bar/src/app/foo/foo.component.html',
'/projects/bar/src/app/foo/foo.component.spec.ts',
'/projects/bar/src/app/foo/foo.component.ts',
]));
expect(files).toEqual(
jasmine.arrayContaining([
'/projects/bar/src/app/foo/foo.component.css',
'/projects/bar/src/app/foo/foo.component.html',
'/projects/bar/src/app/foo/foo.component.spec.ts',
'/projects/bar/src/app/foo/foo.component.ts',
]),
);
const moduleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
expect(moduleContent).toMatch(/import.*Foo.*from '.\/foo\/foo.component'/);
expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooComponent\r?\n/m);
@ -73,8 +74,7 @@ describe('Component Schematic', () => {
it('should set change detection to OnPush', async () => {
const options = { ...defaultOptions, changeDetection: 'OnPush' };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const tsContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
expect(tsContent).toMatch(/changeDetection: ChangeDetectionStrategy.OnPush/);
});
@ -82,8 +82,7 @@ describe('Component Schematic', () => {
it('should not set view encapsulation', async () => {
const options = { ...defaultOptions };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const tsContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
expect(tsContent).not.toMatch(/encapsulation: ViewEncapsulation/);
});
@ -91,8 +90,7 @@ describe('Component Schematic', () => {
it('should set view encapsulation to Emulated', async () => {
const options = { ...defaultOptions, viewEncapsulation: 'Emulated' };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const tsContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
expect(tsContent).toMatch(/encapsulation: ViewEncapsulation.Emulated/);
});
@ -100,8 +98,7 @@ describe('Component Schematic', () => {
it('should set view encapsulation to None', async () => {
const options = { ...defaultOptions, viewEncapsulation: 'None' };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const tsContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
expect(tsContent).toMatch(/encapsulation: ViewEncapsulation.None/);
});
@ -109,21 +106,24 @@ describe('Component Schematic', () => {
it('should create a flat component', async () => {
const options = { ...defaultOptions, flat: true };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const files = tree.files;
expect(files).toEqual(jasmine.arrayContaining([
'/projects/bar/src/app/foo.component.css',
'/projects/bar/src/app/foo.component.html',
'/projects/bar/src/app/foo.component.spec.ts',
'/projects/bar/src/app/foo.component.ts',
]));
expect(files).toEqual(
jasmine.arrayContaining([
'/projects/bar/src/app/foo.component.css',
'/projects/bar/src/app/foo.component.html',
'/projects/bar/src/app/foo.component.spec.ts',
'/projects/bar/src/app/foo.component.ts',
]),
);
});
it('should find the closest module', async () => {
const options = { ...defaultOptions };
const fooModule = '/projects/bar/src/app/foo/foo.module.ts';
appTree.create(fooModule, `
appTree.create(
fooModule,
`
import { NgModule } from '@angular/core';
@NgModule({
@ -131,10 +131,10 @@ describe('Component Schematic', () => {
declarations: []
})
export class FooModule { }
`);
`,
);
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const fooModuleContent = tree.readContent(fooModule);
expect(fooModuleContent).toMatch(/import { FooComponent } from '.\/foo.component'/);
});
@ -142,8 +142,7 @@ describe('Component Schematic', () => {
it('should export the component', async () => {
const options = { ...defaultOptions, export: true };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const appModuleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
expect(appModuleContent).toMatch(/exports: \[FooComponent\]/);
});
@ -151,8 +150,7 @@ describe('Component Schematic', () => {
it('should set the entry component', async () => {
const options = { ...defaultOptions, entryComponent: true };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const appModuleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
expect(appModuleContent).toMatch(/entryComponents: \[FooComponent\]/);
});
@ -160,8 +158,7 @@ describe('Component Schematic', () => {
it('should import into a specified module', async () => {
const options = { ...defaultOptions, module: 'app.module.ts' };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const appModule = tree.readContent('/projects/bar/src/app/app.module.ts');
expect(appModule).toMatch(/import { FooComponent } from '.\/foo\/foo.component'/);
@ -182,50 +179,37 @@ describe('Component Schematic', () => {
const pathOption = 'projects/bar/src/app/SOME/UPPER/DIR';
const options = { ...defaultOptions, path: pathOption };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
let files = tree.files;
let root = `/${pathOption}/foo/foo.component`;
expect(files).toEqual(jasmine.arrayContaining([
`${root}.css`,
`${root}.html`,
`${root}.spec.ts`,
`${root}.ts`,
]));
expect(files).toEqual(
jasmine.arrayContaining([`${root}.css`, `${root}.html`, `${root}.spec.ts`, `${root}.ts`]),
);
const options2 = { ...options, name: 'BAR' };
const tree2 = await schematicRunner.runSchematicAsync('component', options2, tree)
.toPromise();
const tree2 = await schematicRunner.runSchematicAsync('component', options2, tree).toPromise();
files = tree2.files;
root = `/${pathOption}/bar/bar.component`;
expect(files).toEqual(jasmine.arrayContaining([
`${root}.css`,
`${root}.html`,
`${root}.spec.ts`,
`${root}.ts`,
]));
expect(files).toEqual(
jasmine.arrayContaining([`${root}.css`, `${root}.html`, `${root}.spec.ts`, `${root}.ts`]),
);
});
it('should create a component in a sub-directory', async () => {
const options = { ...defaultOptions, path: 'projects/bar/src/app/a/b/c' };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const files = tree.files;
const root = `/${options.path}/foo/foo.component`;
expect(files).toEqual(jasmine.arrayContaining([
`${root}.css`,
`${root}.html`,
`${root}.spec.ts`,
`${root}.ts`,
]));
expect(files).toEqual(
jasmine.arrayContaining([`${root}.css`, `${root}.html`, `${root}.spec.ts`, `${root}.ts`]),
);
});
it('should use the prefix', async () => {
const options = { ...defaultOptions, prefix: 'pre' };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
expect(content).toMatch(/selector: 'pre-foo'/);
});
@ -233,8 +217,7 @@ describe('Component Schematic', () => {
it('should use the default project prefix if none is passed', async () => {
const options = { ...defaultOptions, prefix: undefined };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
expect(content).toMatch(/selector: 'app-foo'/);
});
@ -242,16 +225,14 @@ describe('Component Schematic', () => {
it('should use the supplied prefix if it is ""', async () => {
const options = { ...defaultOptions, prefix: '' };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
expect(content).toMatch(/selector: 'foo'/);
});
it('should respect the inlineTemplate option', async () => {
const options = { ...defaultOptions, inlineTemplate: true };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
expect(content).toMatch(/template: /);
expect(content).not.toMatch(/templateUrl: /);
@ -260,8 +241,7 @@ describe('Component Schematic', () => {
it('should respect the inlineStyle option', async () => {
const options = { ...defaultOptions, inlineStyle: true };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
expect(content).toMatch(/styles: \[/);
expect(content).not.toMatch(/styleUrls: /);
@ -270,8 +250,7 @@ describe('Component Schematic', () => {
it('should respect the style option', async () => {
const options = { ...defaultOptions, style: Style.Sass };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
expect(content).toMatch(/styleUrls: \['.\/foo.component.sass/);
expect(tree.files).toContain('/projects/bar/src/app/foo/foo.component.sass');
@ -283,8 +262,7 @@ describe('Component Schematic', () => {
const routingModulePath = `/projects/bar/src/app/${routingFileName}`;
const newTree = createAppModule(appTree, routingModulePath);
const options = { ...defaultOptions, module: routingFileName };
const tree = await schematicRunner.runSchematicAsync('component', options, newTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, newTree).toPromise();
const content = tree.readContent(routingModulePath);
expect(content).toMatch(/import { FooComponent } from '.\/foo\/foo.component/);
});
@ -292,46 +270,41 @@ describe('Component Schematic', () => {
it('should handle a path in the name option', async () => {
const options = { ...defaultOptions, name: 'dir/test-component' };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const content = tree.readContent('/projects/bar/src/app/app.module.ts');
expect(content).toMatch(
// tslint:disable-next-line:max-line-length
/import { TestComponentComponent } from '\.\/dir\/test-component\/test-component.component'/);
/import { TestComponentComponent } from '\.\/dir\/test-component\/test-component.component'/,
);
});
it('should handle a path in the name and module options', async () => {
appTree = await schematicRunner.runSchematicAsync(
'module',
{ name: 'admin/module', project: 'bar' },
appTree,
).toPromise();
appTree = await schematicRunner
.runSchematicAsync('module', { name: 'admin/module', project: 'bar' }, appTree)
.toPromise();
const options = { ...defaultOptions, name: 'other/test-component', module: 'admin/module' };
appTree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
appTree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const content = appTree.readContent('/projects/bar/src/app/admin/module/module.module.ts');
expect(content).toMatch(
// tslint:disable-next-line:max-line-length
/import { TestComponentComponent } from '..\/..\/other\/test-component\/test-component.component'/);
/import { TestComponentComponent } from '..\/..\/other\/test-component\/test-component.component'/,
);
});
it('should create the right selector with a path in the name', async () => {
const options = { ...defaultOptions, name: 'sub/test' };
appTree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
appTree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const content = appTree.readContent('/projects/bar/src/app/sub/test/test.component.ts');
expect(content).toMatch(/selector: 'app-test'/);
});
it('should respect the skipSelector option', async () => {
const options = { ...defaultOptions, name: 'sub/test', skipSelector: true };
appTree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
appTree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const content = appTree.readContent('/projects/bar/src/app/sub/test/test.component.ts');
expect(content).not.toMatch(/selector: 'app-test'/);
console.log(content);
});
it('should respect the sourceRoot value', async () => {
@ -346,7 +319,8 @@ describe('Component Schematic', () => {
// move the module
appTree.rename('/projects/bar/src/app/app.module.ts', '/projects/bar/custom/app/app.module.ts');
appTree = await schematicRunner.runSchematicAsync('component', defaultOptions, appTree)
appTree = await schematicRunner
.runSchematicAsync('component', defaultOptions, appTree)
.toPromise();
expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.component.ts');
});
@ -354,34 +328,29 @@ describe('Component Schematic', () => {
// testing deprecating options don't cause conflicts
it('should respect the deprecated styleext (scss) option', async () => {
const options = { ...defaultOptions, style: undefined, styleext: 'scss' };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const files = tree.files;
expect(files).toContain('/projects/bar/src/app/foo/foo.component.scss');
});
it('should respect the deprecated styleext (css) option', async () => {
const options = { ...defaultOptions, style: undefined, styleext: 'css' };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const files = tree.files;
expect(files).toContain('/projects/bar/src/app/foo/foo.component.css');
});
it('should respect the deprecated spec option when false', async () => {
const options = { ...defaultOptions, skipTests: undefined, spec: false };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const files = tree.files;
expect(files).not.toContain('/projects/bar/src/app/foo/foo.component.spec.ts');
});
it('should respect the deprecated spec option when true', async () => {
const options = { ...defaultOptions, skipTests: false, spec: true };
const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
.toPromise();
const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
const files = tree.files;
expect(files).toContain('/projects/bar/src/app/foo/foo.component.spec.ts');
});
});