fix schematic tests

Author: GoodDayForSurf

packages/devextreme-schematics/src/add-layout/files/src/app/__name__.component.ts

@@ -1,7 +1,7 @@
 import { Component, HostBinding } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule, RouterOutlet } from '@angular/router';
-import {ScreenService, AppInfoService, AuthService } from './shared/services';
+import { AuthService, ScreenService, AppInfoService } from './shared/services';
 import { DxHttpModule } from 'devextreme-angular/http';
 import { SideNavOuterToolbarComponent, SideNavInnerToolbarComponent } from './layouts';
 import { FooterComponent } from './shared/components';

packages/devextreme-schematics/src/add-layout/index_spec.ts

@@ -101,25 +101,17 @@ describe('layout', () => {
     expect(styles[3]).toBe('src/themes/generated/theme.additional.dark.css');
     expect(styles[4]).toBe('src/themes/generated/theme.additional.css');
 
-    const moduleContent = tree.readContent('/src/app/app.module.ts');
-    expect(moduleContent).toContain('import { DxHttpModule }');
-    expect(moduleContent)
-      .toContain('import { SideNavOuterToolbarComponent, SideNavInnerToolbarComponent, SingleCardComponent }');
-    expect(moduleContent)
-      .toContain(`import { AuthService, ScreenService, AppInfoService } from './shared/services';`);
-    expect(moduleContent).toContain('import { AppRoutingModule }');
-    expect(moduleContent)
-      .toContain('import { FooterComponent, ' +
-      'ResetPasswordFormComponent, ' +
-      'CreateAccountFormComponent, ' +
-      'ChangePasswordFormComponent, ' +
-      'LoginFormComponent }');
-
     const appContent = tree.readContent('/src/app/app.component.ts');
+    expect(appContent).toContain('import { DxHttpModule }');
+    expect(appContent)
+      .toContain('import { SideNavOuterToolbarComponent, SideNavInnerToolbarComponent }');
+    expect(appContent)
+      .toContain(`import { AuthService, ScreenService, AppInfoService } from './shared/services';`);
+    expect(appContent)
+      .toContain('import { FooterComponent }');
     expect(appContent).toContain('templateUrl: \'./app.component.html\',');
     expect(appContent).toContain('styleUrls: [\'./app.component.scss\']');
     expect(appContent).toContain('selector: \'app-root\',');
-    expect(appContent).toContain(`import { AuthService, ScreenService, AppInfoService } from './shared/services';`);
 
     const navigationMenu = tree.readContent(
       '/src/app/shared/components/side-navigation-menu/side-navigation-menu.component.ts');
@@ -244,26 +236,14 @@ describe('layout', () => {
   });
 
   it('should add routing to layout', async () => {
-    let newAppTree = await schematicRunner.runSchematic('workspace', workspaceOptions);
-
-    appOptions.routing = false;
-    newAppTree = await schematicRunner.runSchematic(
-      'application', appOptions, newAppTree);
-
     const runner = new SchematicTestRunner('schematics', collectionPath);
     const tree = await runner.runSchematic('add-layout', options, appTree);
 
     expect(tree.files).toContain('/src/app/app.routes.ts');
-    const moduleContent = tree.readContent('/src/app/app.routes.ts');
-    expect(moduleContent)
-      .toMatch(/imports:\s\[RouterModule\.forRoot\(routes, { useHash: true }\)\],/);
-
-    expect(moduleContent)
-      .toContain(`{
-    path: 'login-form',
-    component: LoginFormComponent,
-    canActivate: [ AuthGuardService ]
-  }`);
+    const routesContent = tree.readContent('/src/app/app.routes.ts');
+
+    expect(routesContent)
+      .toContain(`{\r\n    path: 'login-form',\r\n    component: LoginFormComponent,\r\n    canActivate: [ AuthGuardService ]\r\n  },`);
   });
 
   it('should use selected layout', async () => {

packages/devextreme-schematics/src/add-sample-views/index_spec.ts

@@ -46,7 +46,6 @@ describe('sample views', () => {
     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'/);

packages/devextreme-schematics/src/add-view/index_spec.ts

@@ -60,7 +60,7 @@ describe('view', () => {
     expect(contentTS).toContain(`selector: 'app-${componentName}'`);
     expect(contentTS).toContain(`templateUrl: './${componentName}.component.html'`);
     expect(contentTS).toContain(`styleUrl: './${componentName}.component.css'`);
-    expect(contentTS).toContain('standalone: false');
+    expect(contentTS).toContain('standalone: true');
     expect(contentTS).toContain(`export class ${strings.classify(basename(normalize(componentName)))}Component`);
   });
 
@@ -73,27 +73,8 @@ describe('view', () => {
     tree = await runner.runSchematic('add-view', { ...options, name: 'test2' }, tree);
     const moduleContent = tree.readContent('/src/app/app.routes.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'
-  }
-];`);
+    expect(moduleContent).toContain(`path: 'pages/test2',\n    component: Test2Component,\n    canActivate: [ AuthGuardService ]`);
+    expect(moduleContent).toContain(`path: 'pages/test',\n    component: TestComponent,\n    canActivate: [ AuthGuardService ]`);
   });
 
   it('should add view to other routing module', async () => {