devextreme-schematics 1.3.0-beta.0 → 1.3.1

package/src/add-sample-views/index_spec.ts

@@ -0,0 +1,74 @@
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { Schema as WorkspaceOptions } from '@schematics/angular/workspace/schema';
+import * as path from 'path';
+
+const collectionPath = path.join(__dirname, '../collection.json');
+
+describe('sample views', () => {
+  const appOptions: any = {
+    name: 'testApp',
+    projectRoot: '',
+    inlineStyle: false,
+    inlineTemplate: false,
+    routing: true,
+    style: 'css',
+    skipTests: false,
+    skipPackageJson: false
+  };
+
+  const workspaceOptions: WorkspaceOptions = {
+    name: 'workspace',
+    version: '6.0.0'
+  };
+
+  const sampleViewsOptions: any = {
+    project: 'testApp'
+  };
+
+  const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
+  const schematicRunner = new SchematicTestRunner('@schematics/angular', angularSchematicsCollection);
+  let appTree: UnitTestTree;
+
+  beforeEach(async () => {
+    appTree =  await schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree).toPromise();
+  });
+
+  it('should add sample views', async () => {
+    const runner = new SchematicTestRunner('schematics', collectionPath);
+    let tree = await runner.runSchematicAsync('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree).toPromise();
+    tree = await runner.runSchematicAsync('add-sample-views', sampleViewsOptions, tree).toPromise();
+
+    const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
+
+    expect(moduleContent).toMatch(/component: HomeComponent/);
+    expect(moduleContent).toMatch(/path: 'home'/);
+
+    expect(moduleContent).toMatch(/import { HomeComponent } from /);
+    expect(moduleContent).toMatch(/declarations:\s\[\n*\s*HomeComponent/);
+
+    const navigationContent = tree.readContent('/src/app/app-navigation.ts');
+    expect(navigationContent).toMatch(/text: 'Home'/);
+    expect(navigationContent).toContain(`export const navigation = [
+  {
+    text: 'Home',
+    path: '/home',
+    icon: 'home'
+  },
+  {
+    text: 'Examples',
+    icon: 'folder',
+    items: [
+      {
+        text: 'Profile',
+        path: '/profile'
+      },
+      {
+        text: 'Tasks',
+        path: '/tasks'
+      }
+    ]
+  }
+];`);
+  });
+});

package/src/add-sample-views/schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsDevextremeAddSamplesViews",
+  "$id": "SchematicsDevextremeAddSamplesViews",
   "title": "Add sample views to a DevExtreme Angular application",
   "type": "object",
   "properties": {

package/src/add-view/index.d.ts

@@ -1,3 +1,3 @@
-import { Rule } from '@angular-devkit/schematics';
-export declare function addViewToRouting(options: any): (host: import("@angular-devkit/schematics/src/tree/interface").Tree) => import("@angular-devkit/schematics/src/tree/interface").Tree;
+import { Rule, Tree } from '@angular-devkit/schematics';
+export declare function addViewToRouting(options: any): (host: Tree) => Promise<import("@angular-devkit/schematics/src/tree/interface").Tree>;
 export default function (options: any): Rule;

package/src/add-view/index.js

@@ -1,5 +1,15 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.addViewToRouting = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const find_module_1 = require("@schematics/angular/utility/find-module");
 const change_1 = require("../utility/change");
@@ -9,18 +19,20 @@ const core_1 = require("@angular-devkit/core");
 const project_1 = require("../utility/project");
 const string_1 = require("../utility/string");
 function getPathToFile(host, projectName, moduleName) {
-    const rootPath = project_1.getApplicationPath(host, projectName);
-    try {
-        return find_module_1.findModuleFromOptions(host, { name: moduleName, path: rootPath, module: moduleName });
-    }
-    catch (error) {
-        return;
-    }
+    return __awaiter(this, void 0, void 0, function* () {
+        const rootPath = yield project_1.getApplicationPath(host, projectName);
+        try {
+            return find_module_1.findModuleFromOptions(host, { name: moduleName, path: rootPath, module: moduleName });
+        }
+        catch (error) {
+            return;
+        }
+    });
 }
 function addViewToNavigation(options) {
-    return (host) => {
+    return (host) => __awaiter(this, void 0, void 0, function* () {
         const navigationName = 'app-navigation';
-        const navigationFilePath = getPathToFile(host, options.project, navigationName);
+        const navigationFilePath = yield getPathToFile(host, options.project, navigationName);
         if (!navigationFilePath) {
             return;
         }
@@ -35,7 +47,7 @@ function addViewToNavigation(options) {
   }`;
         change_1.insertItemToArray(host, navigationFilePath, source, navigationItem, { location: 'end' });
         return host;
-    };
+    });
 }
 function addRedirectRoute(host, routingModulePath, page) {
     const source = source_1.getSourceFile(host, routingModulePath);
@@ -46,14 +58,13 @@ function addRedirectRoute(host, routingModulePath, page) {
     const routes = routing_1.findRoutesInSource(source);
     const redirectRoute = `  {
     path: '**',
-    redirectTo: '${core_1.strings.dasherize(page)}',
-    canActivate: [ AuthGuardService ]
+    redirectTo: '${core_1.strings.dasherize(page)}'
   }`;
     change_1.insertItemToArray(host, routingModulePath, routes, redirectRoute, { location: 'end' });
 }
 function addViewToRouting(options) {
-    return (host) => {
-        const routingModulePath = getPathToFile(host, options.project, options.module);
+    return (host) => __awaiter(this, void 0, void 0, function* () {
+        const routingModulePath = yield getPathToFile(host, options.project, options.module);
         if (!routingModulePath) {
             throw new schematics_1.SchematicsException('Specified module does not exist.');
         }
@@ -68,7 +79,7 @@ function addViewToRouting(options) {
             change_1.insertItemToArray(host, routingModulePath, routes, route);
         }
         return host;
-    };
+    });
 }
 exports.addViewToRouting = addViewToRouting;
 function getPathForView(name) {
@@ -84,11 +95,11 @@ function getModuleName(addRoute, moduleName) {
     return moduleName;
 }
 function addContentToView(options) {
-    return (host) => {
+    return (host) => __awaiter(this, void 0, void 0, function* () {
         const name = core_1.strings.dasherize(core_1.basename(core_1.normalize(options.name)));
         const path = `${core_1.dirname(options.name)}/${name}`;
         const title = string_1.humanize(name);
-        const componentPath = `/${project_1.getApplicationPath(host, options.project)}${path}/${name}.component.html`;
+        const componentPath = `/${yield project_1.getApplicationPath(host, options.project)}${path}/${name}.component.html`;
         if (host.exists(componentPath)) {
             host.overwrite(componentPath, `<h2 class="content-block">${title}</h2>
 <div class="content-block">
@@ -97,19 +108,19 @@ function addContentToView(options) {
 `);
         }
         return host;
-    };
+    });
 }
 function default_1(options) {
-    return (host) => {
+    return (host) => __awaiter(this, void 0, void 0, function* () {
         const addRoute = options.addRoute;
-        const project = project_1.getProjectName(host, options);
+        const project = yield project_1.getProjectName(host, options);
         const module = getModuleName(addRoute, options.module);
         const name = getPathForView(options.name);
         const rules = [schematics_1.externalSchematic('@schematics/angular', 'component', {
                 name,
                 project,
                 module,
-                spec: options.spec,
+                skipTests: options.skipTests,
                 inlineStyle: options.inlineStyle,
                 prefix: options.prefix
             }),
@@ -120,7 +131,7 @@ function default_1(options) {
             rules.push(addViewToNavigation({ name, icon: options.icon, project }));
         }
         return schematics_1.chain(rules);
-    };
+    });
 }
 exports.default = default_1;
 //# sourceMappingURL=index.js.map

package/src/add-view/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}

package/src/add-view/index.ts

@@ -0,0 +1,166 @@
+import {
+  Rule,
+  chain,
+  Tree,
+  SchematicsException,
+  externalSchematic
+} from '@angular-devkit/schematics';
+
+import {
+  findModuleFromOptions
+} from '@schematics/angular/utility/find-module';
+
+import {
+  insertItemToArray
+} from '../utility/change';
+
+import {
+  hasComponentInRoutes,
+  getRoute,
+  findRoutesInSource
+} from '../utility/routing';
+
+import { getSourceFile } from '../utility/source';
+
+import { strings, basename, normalize, dirname } from '@angular-devkit/core';
+
+import {
+  getProjectName,
+  getApplicationPath
+} from '../utility/project';
+import { humanize } from '../utility/string';
+
+async function getPathToFile(host: Tree, projectName: string, moduleName: string) {
+  const rootPath = await getApplicationPath(host, projectName);
+
+  try {
+    return findModuleFromOptions(host, { name: moduleName, path: rootPath, module: moduleName });
+  } catch (error) {
+    return;
+  }
+}
+
+function addViewToNavigation(options: any) {
+  return async (host: Tree) => {
+    const navigationName = 'app-navigation';
+    const navigationFilePath = await getPathToFile(host, options.project, navigationName);
+
+    if (!navigationFilePath) {
+      return;
+    }
+
+    const source = getSourceFile(host, navigationFilePath)!;
+    const pagePath = strings.dasherize(options.name);
+    const name = strings.dasherize(basename(normalize(options.name)));
+    const title = humanize(name);
+    const navigationItem = `  {
+    text: '${title}',
+    path: '/${pagePath}',
+    icon: '${options.icon}'
+  }`;
+
+    insertItemToArray(host, navigationFilePath, source, navigationItem, { location: 'end' });
+
+    return host;
+  };
+}
+
+function addRedirectRoute(host: Tree, routingModulePath: string, page: string) {
+  const source = getSourceFile(host, routingModulePath)!;
+  const content = source.getText();
+  if (content.match(/path:\s*'\*\*'/g)) {
+    return;
+  }
+
+  const routes = findRoutesInSource(source)!;
+  const redirectRoute = `  {
+    path: '**',
+    redirectTo: '${strings.dasherize(page)}'
+  }`;
+
+  insertItemToArray(host, routingModulePath, routes, redirectRoute, { location: 'end' });
+}
+
+export function addViewToRouting(options: any) {
+  return async (host: Tree) => {
+    const routingModulePath = await getPathToFile(host, options.project, options.module);
+
+    if (!routingModulePath) {
+      throw new SchematicsException('Specified module does not exist.');
+    }
+
+    addRedirectRoute(host, routingModulePath, options.name);
+
+    const source = getSourceFile(host, routingModulePath)!;
+    const routes = findRoutesInSource(source);
+
+    if (!routes) {
+      throw new SchematicsException('No routes found.');
+    }
+
+    if (!hasComponentInRoutes(routes, options.name)) {
+      const route = getRoute(options.name);
+      insertItemToArray(host, routingModulePath, routes, route);
+    }
+    return host;
+  };
+}
+
+function getPathForView(name: string) {
+  if (name.includes('/')) {
+    return name;
+  }
+  return 'pages/' + name;
+}
+
+function getModuleName(addRoute: boolean, moduleName: string) {
+  if (!moduleName && addRoute) {
+    return 'app-routing';
+  }
+  return moduleName;
+}
+
+function addContentToView(options: any) {
+  return async (host: Tree) => {
+    const name = strings.dasherize(basename(normalize(options.name)));
+    const path = `${dirname(options.name)}/${name}`;
+    const title = humanize(name);
+    const componentPath = `/${await getApplicationPath(host, options.project)}${path}/${name}.component.html`;
+    if (host.exists(componentPath)) {
+      host.overwrite(
+        componentPath,
+        `<h2 class="content-block">${title}</h2>
+<div class="content-block">
+    <div class="dx-card responsive-paddings">Put your content here</div>
+</div>
+`);
+    }
+    return host;
+  };
+}
+
+export default function(options: any): Rule {
+  return async (host: Tree) => {
+    const addRoute = options.addRoute;
+    const project = await getProjectName(host, options);
+    const module = getModuleName(addRoute, options.module);
+    const name = getPathForView(options.name);
+
+    const rules = [externalSchematic('@schematics/angular', 'component', {
+        name,
+        project,
+        module,
+        skipTests: options.skipTests,
+        inlineStyle: options.inlineStyle,
+        prefix: options.prefix
+      }),
+      addContentToView({ name, project }) as any
+    ];
+
+    if (addRoute) {
+      rules.push(addViewToRouting({ name, project, module }) as any);
+      rules.push(addViewToNavigation({ name, icon: options.icon, project }) as any);
+    }
+    return chain(rules);
+  };
+}

package/src/add-view/index_spec.js

@@ -1,9 +1,10 @@
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -40,11 +41,11 @@ describe('view', () => {
     const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
     const schematicRunner = new testing_1.SchematicTestRunner('@schematics/angular', angularSchematicsCollection);
     let appTree;
-    beforeEach(() => __awaiter(this, void 0, void 0, function* () {
+    beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
         appTree = yield schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
         appTree = yield schematicRunner.runSchematicAsync('application', appOptions, appTree).toPromise();
     }));
-    it('should create new view', () => __awaiter(this, void 0, void 0, function* () {
+    it('should create new view', () => __awaiter(void 0, void 0, void 0, function* () {
         const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
         let tree = yield runner.runSchematicAsync('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree).toPromise();
         tree = yield runner.runSchematicAsync('add-view', componentOptions, appTree).toPromise();
@@ -53,12 +54,12 @@ describe('view', () => {
         const content = tree.readContent('/src/app/pages/test/test.component.html');
         expect(content).toMatch(/<h2 class="content-block">Test<\/h2>/);
     }));
-    it('should add view to default routing module', () => __awaiter(this, void 0, void 0, function* () {
-        const options = Object.assign({}, componentOptions, { addRoute: true });
+    it('should add view to default routing module', () => __awaiter(void 0, void 0, void 0, function* () {
+        const options = Object.assign(Object.assign({}, componentOptions), { addRoute: true });
         const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
         let tree = yield runner.runSchematicAsync('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree).toPromise();
         tree = yield runner.runSchematicAsync('add-view', options, tree).toPromise();
-        tree = yield runner.runSchematicAsync('add-view', Object.assign({}, options, { name: 'test2' }), tree).toPromise();
+        tree = yield runner.runSchematicAsync('add-view', Object.assign(Object.assign({}, options), { name: 'test2' }), tree).toPromise();
         const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
         expect(moduleContent).toContain(`const routes: Routes = [
   {
@@ -78,13 +79,12 @@ describe('view', () => {
   },
   {
     path: '**',
-    redirectTo: 'pages/test',
-    canActivate: [ AuthGuardService ]
+    redirectTo: 'pages/test'
   }
 ];`);
     }));
-    it('should add view to other routing module', () => __awaiter(this, void 0, void 0, function* () {
-        const options = Object.assign({}, componentOptions, { addRoute: true, module: 'test/test-routing' });
+    it('should add view to other routing module', () => __awaiter(void 0, void 0, void 0, function* () {
+        const options = Object.assign(Object.assign({}, componentOptions), { addRoute: true, module: 'test/test-routing' });
         const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
         let tree = yield runner.runExternalSchematicAsync('@schematics/angular', 'module', {
             name: 'test',
@@ -102,7 +102,7 @@ describe('view', () => {
         expect(moduleContent).toMatch(/path: 'pages\/test'/);
         expect(moduleContent).toContain('canActivate: [ AuthGuardService ]');
     }));
-    it('should add view to navigation', () => __awaiter(this, void 0, void 0, function* () {
+    it('should add view to navigation', () => __awaiter(void 0, void 0, void 0, function* () {
         const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
         let tree = yield runner.runSchematicAsync('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree).toPromise();
         tree = yield runner.runSchematicAsync('add-view', componentOptions, tree).toPromise();
@@ -129,7 +129,7 @@ describe('view', () => {
         const pageContent = tree.readContent('/src/app/pages/some-test/some-test.component.html');
         expect(pageContent).toMatch(/<h2 class="content-block">Some Test<\/h2>/);
     }));
-    it('should create new view with path', () => __awaiter(this, void 0, void 0, function* () {
+    it('should create new view with path', () => __awaiter(void 0, void 0, void 0, function* () {
         const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
         componentOptions.name = 'folder/test';
         let tree = yield runner.runSchematicAsync('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree).toPromise();

package/src/add-view/index_spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":"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"}

package/src/add-view/index_spec.ts

@@ -0,0 +1,155 @@
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { Schema as WorkspaceOptions } from '@schematics/angular/workspace/schema';
+import * as path from 'path';
+
+const collectionPath = path.join(__dirname, '../collection.json');
+
+describe('view', () => {
+  const appOptions: any = {
+    name: 'testApp',
+    projectRoot: '',
+    inlineStyle: false,
+    inlineTemplate: false,
+    routing: true,
+    style: 'css',
+    skipTests: false,
+    skipPackageJson: false
+  };
+
+  const workspaceOptions: WorkspaceOptions = {
+    name: 'workspace',
+    version: '6.0.0'
+  };
+
+  const componentOptions: any = {
+    name: 'test',
+    inlineStyle: false,
+    inlineTemplate: false,
+    changeDetection: 'Default',
+    styleext: 'css',
+    skipImport: true,
+    module: undefined,
+    export: false,
+    project: 'testApp'
+  };
+
+  const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
+  const schematicRunner = new SchematicTestRunner('@schematics/angular', angularSchematicsCollection);
+  let appTree: UnitTestTree;
+
+  beforeEach(async () => {
+    appTree = await schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree).toPromise();
+  });
+
+  it('should create new view', async () => {
+    const runner = new SchematicTestRunner('schematics', collectionPath);
+    let tree = await runner.runSchematicAsync('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree).toPromise();
+    tree = await runner.runSchematicAsync('add-view', componentOptions, appTree).toPromise();
+
+    expect(tree.files).toContain('/src/app/pages/test/test.component.ts');
+    expect(tree.files).toContain('/src/app/pages/test/test.component.html');
+
+    const content = tree.readContent('/src/app/pages/test/test.component.html');
+
+    expect(content).toMatch(/<h2 class="content-block">Test<\/h2>/);
+  });
+
+  it('should add view to default routing module', async () => {
+    const options = { ...componentOptions, addRoute: true };
+
+    const runner = new SchematicTestRunner('schematics', collectionPath);
+    let tree = await runner.runSchematicAsync('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree).toPromise();
+    tree = await runner.runSchematicAsync('add-view', options, tree).toPromise();
+    tree = await runner.runSchematicAsync('add-view', { ...options, name: 'test2' }, tree).toPromise();
+    const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
+
+    expect(moduleContent).toContain(`const routes: Routes = [
+  {
+    path: 'pages/test2',
+    component: Test2Component,
+    canActivate: [ AuthGuardService ]
+  },
+  {
+    path: 'pages/test',
+    component: TestComponent,
+    canActivate: [ AuthGuardService ]
+  },
+  {
+    path: 'login-form',
+    component: LoginFormComponent,
+    canActivate: [ AuthGuardService ]
+  },
+  {
+    path: '**',
+    redirectTo: 'pages/test'
+  }
+];`);
+  });
+
+  it('should add view to other routing module', async () => {
+    const options = { ...componentOptions, addRoute: true, module: 'test/test-routing' };
+
+    const runner = new SchematicTestRunner('schematics', collectionPath);
+    let tree = await runner.runExternalSchematicAsync('@schematics/angular', 'module', {
+      name: 'test',
+      routing: true,
+      project: 'testApp'
+    }, appTree).toPromise();
+
+    tree = await runner.runSchematicAsync('add-layout', {
+      layout: 'side-nav-outer-toolbar',
+      project: 'testApp',
+      name: 'test'
+    }, tree).toPromise();
+    tree = await runner.runSchematicAsync('add-view', options, tree).toPromise();
+
+    const moduleContent = tree.readContent('/src/app/test/test-routing.module.ts');
+
+    expect(moduleContent).toMatch(/component: TestComponent/);
+    expect(moduleContent).toMatch(/path: 'pages\/test'/);
+    expect(moduleContent).toContain('canActivate: [ AuthGuardService ]');
+  });
+
+  it('should add view to navigation', async () => {
+    const runner = new SchematicTestRunner('schematics', collectionPath);
+    let tree = await runner.runSchematicAsync('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree).toPromise();
+    tree = await runner.runSchematicAsync('add-view', componentOptions, tree).toPromise();
+
+    componentOptions.name = 'some test';
+    componentOptions.icon = 'home';
+    tree = await runner.runSchematicAsync('add-view', componentOptions, tree).toPromise();
+
+    const moduleContent = tree.readContent('/src/app/app-navigation.ts');
+
+    expect(moduleContent).toMatch(/text: 'Some Test'/);
+    expect(moduleContent).toMatch(/icon: 'home'/);
+    expect(moduleContent).toMatch(/text: 'Test'/);
+    expect(moduleContent).toMatch(/icon: 'folder'/);
+
+    expect(moduleContent).toContain(`navigation = [
+  {
+    text: 'Test',
+    path: '/pages/test',
+    icon: 'folder'
+  },
+  {
+    text: 'Some Test',
+    path: '/pages/some-test',
+    icon: 'home'
+  }
+];`);
+    const pageContent = tree.readContent('/src/app/pages/some-test/some-test.component.html');
+    expect(pageContent).toMatch(/<h2 class="content-block">Some Test<\/h2>/);
+  });
+
+  it('should create new view with path', async () => {
+    const runner = new SchematicTestRunner('schematics', collectionPath);
+    componentOptions.name = 'folder/test';
+    let tree = await runner.runSchematicAsync('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree).toPromise();
+    tree = await runner.runSchematicAsync('add-view', componentOptions, appTree).toPromise();
+
+    expect(tree.files).toContain('/src/app/folder/test/test.component.ts');
+    expect(tree.files).toContain('/src/app/folder/test/test.component.html');
+  });
+});