Skip to content

fix(@schematics/angular): implements items type for guard schematic #15412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 23, 2019
Merged

fix(@schematics/angular): implements items type for guard schematic #15412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/schematics/angular/guard/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@
"CanActivate",
"CanActivateChild",
"CanLoad"
]
],
"type": "string"
},
"default": [
"CanActivate"
Expand Down
19 changes: 8 additions & 11 deletions tests/legacy-cli/e2e/tests/generate/guard/guard-basic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
}
16 changes: 16 additions & 0 deletions tests/legacy-cli/e2e/tests/generate/guard/guard-implements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
}