fix(@schematics/angular): respect the flag when we create a guard wit…

…h schematics
angular · Feb 13, 2019 · 355a8e6 · 355a8e6
1 parent 32e3b7c
commit 355a8e6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/packages/schematics/angular/guard/index.ts b/packages/schematics/angular/guard/index.ts
@@ -65,7 +65,7 @@ export default function (options: GuardOptions): Rule {
         ...strings,
         ...options,
       }),
-      move(parsedPath.path),
+      move(parsedPath.path + (options.flat ? '' : '/' + strings.dasherize(options.name))),
     ]);
 
     return chain([

diff --git a/packages/schematics/angular/guard/index_spec.ts b/packages/schematics/angular/guard/index_spec.ts
@@ -56,6 +56,15 @@ describe('Guard Schematic', () => {
     expect(files).toContain('/projects/bar/src/app/foo.guard.ts');
   });
 
+  it('should respect the flat flag', () => {
+    const options = { ...defaultOptions, flat: false };
+
+    const tree = schematicRunner.runSchematic('guard', options, appTree);
+    const files = tree.files;
+    expect(files).toContain('/projects/bar/src/app/foo/foo.guard.spec.ts');
+    expect(files).toContain('/projects/bar/src/app/foo/foo.guard.ts');
+  });
+
   it('should respect the sourceRoot value', () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';