fix(ng-add): Add hammerjs in test.ts #7515

Author: IvayloG

projects/igniteui-angular/schematics/ng-add/index.spec.ts

@@ -25,7 +25,14 @@ describe('ng-add schematics', () => {
               polyfills: `${sourceRoot}/polyfills.ts`,
               scripts: []
             }
-          }
+          },
+          test: {
+            options: {
+              main: `${sourceRoot}/test.ts`,
+              polyfills: `${sourceRoot}/polyfills.ts`,
+              scripts: []
+            }
+          },
         }
       }
     }
@@ -46,6 +53,7 @@ describe('ng-add schematics', () => {
     tree.create('/angular.json', JSON.stringify(ngJsonConfig));
     tree.create('/package.json', JSON.stringify(pkgJsonConfig));
     tree.create(`${sourceRoot}/main.ts`, '// test comment');
+    tree.create(`${sourceRoot}/test.ts`, '// test comment');
   });
 
   it('should create the needed files correctly', () => {
@@ -101,7 +109,7 @@ describe('ng-add schematics', () => {
     expect(mainTs).toContain('import \'hammerjs\';');
   });
 
-  it('should not add hammer.js if it exists in angular.json', () => {
+  it('should not add hammer.js if it exists in angular.json build options', () => {
     const workspace = getWorkspace(tree) as any;
     const currentProjectName = workspace.defaultProject;
     workspace.projects[currentProjectName].architect.build.options.scripts.push('./node_modules/hammerjs/hammer.min.js');
@@ -112,6 +120,23 @@ describe('ng-add schematics', () => {
     expect(newContent.split('import \'hammerjs\';\n// test comment').length).toEqual(1);
   });
 
+  it('should add hammer.js to the test.ts file', () => {
+    runner.runSchematic('ng-add', { normalizeCss: false }, tree);
+    const testTs = tree.read(`${sourceRoot}/test.ts`).toString();
+    expect(testTs).toContain('import \'hammerjs\';');
+  });
+
+  it('should not add hammer.js if it exists in angular.json test options', () => {
+    const workspace = getWorkspace(tree) as any;
+    const currentProjectName = workspace.defaultProject;
+    workspace.projects[currentProjectName].architect.test.options.scripts.push('./node_modules/hammerjs/hammer.min.js');
+    tree.overwrite('angular.json', JSON.stringify(workspace));
+    runner.runSchematic('ng-add', { normalizeCss: false }, tree);
+
+    const testTs = tree.read(`${sourceRoot}/test.ts`).toString();
+    expect(testTs).toMatch('// test comment');
+  });
+
   it('should not add hammer.js if it exists in main.ts', () => {
     const mainTsPath = `${sourceRoot}/main.ts`;
     const content = tree.read(mainTsPath).toString();

projects/igniteui-angular/schematics/ng-add/index.ts

@@ -20,7 +20,7 @@ function propertyExistsInWorkspace(targetProp: string, workspace: WorkspaceSchem
 function enablePolyfills(tree: Tree, context: SchematicContext): string {
   const workspace = getWorkspace(tree);
   const project = workspace.projects[workspace.defaultProject];
-  const targetFile = getConfigFile(project, 'polyfills');
+  const targetFile = getConfigFile(project, 'polyfills', 'build');
   if (!tree.exists(targetFile)) {
     context.logger.warn(`${targetFile} not found. You may need to update polyfills.ts manually.`);
     return;
@@ -54,7 +54,7 @@ function readInput(options: Options): Rule {
       const workspace = getWorkspace(tree);
       const targetProperty = 'es5BrowserSupport';
       const project = workspace.projects[workspace.defaultProject];
-      const polyfillsFile = getConfigFile(project, 'polyfills');
+      const polyfillsFile = getConfigFile(project, 'polyfills', 'build');
       const propertyExists = propertyExistsInWorkspace(targetProperty, workspace);
       let polyfillsData = tree.read(polyfillsFile).toString();
       if (propertyExists) {

projects/igniteui-angular/schematics/utils/dependency-handler.ts

@@ -59,16 +59,28 @@ function getTargetedProjectOptions(project: WorkspaceProject<ProjectType>, targe
     throw new SchematicsException(`Cannot determine the project's configuration for: ${target}`);
 }
 
-export function getConfigFile(project: WorkspaceProject<ProjectType>, option: string): string {
-    const buildOptions = getTargetedProjectOptions(project, 'build');
-    if (!buildOptions[option]) {
-        throw new SchematicsException(`Could not find the project ${option} file inside of the ` +
-            `workspace config (${project.sourceRoot})`);
-    }
+export function getConfigFile(project: WorkspaceProject<ProjectType>, option: string, configSection: string): string {
+    switch (configSection) {
+        case 'build':
+            const buildOptions = getTargetedProjectOptions(project, 'build');
+            if (!buildOptions[option]) {
+                throw new SchematicsException(`Could not find the project ${option} file inside of the ` +
+                    `workspace config ${project.sourceRoot}`);
+            }
+            return buildOptions[option];
 
-    return buildOptions[option];
+        case 'test':
+            const testOptions = getTargetedProjectOptions(project, 'test');
+            if (!testOptions[option]) {
+                throw new SchematicsException(`Could not find the project ${option} file inside of the ` +
+                    `workspace config ${project.sourceRoot}`);
+            }
+            return testOptions[option];
+        default:
+            throw new SchematicsException(`Could not find matching ${configSection} section` +
+            `inside of the workspace config ${project.sourceRoot} `);
+    }
 }
-
 export function overwriteJsonFile(tree: Tree, targetFile: string, data: any) {
     tree.overwrite(targetFile, JSON.stringify(data, null, 2) + '\n');
 }
@@ -148,15 +160,25 @@ function includeDependencies(pkgJson: any, context: SchematicContext, tree: Tree
                 const workspace = getWorkspace(tree);
                 const project = workspace.projects[workspace.defaultProject];
                 const projectOptions = getTargetedProjectOptions(project, 'build');
-                const mainTsPath = getConfigFile(project, 'main');
+                const projectTestOptions = getTargetedProjectOptions(project, 'test');
+                const mainTsPath = getConfigFile(project, 'main', 'build');
+                const testTsPath = getConfigFile(project, 'main', 'test');
                 const hammerImport = 'import \'hammerjs\';\n';
                 const mainTsContent = tree.read(mainTsPath).toString();
+                const testTsContent = tree.read(testTsPath).toString();
                 // if there are no elements in the architect.build.options.scripts array that contain hammerjs
                 // and main.ts does not contain an import with hammerjs
                 if (!projectOptions.scripts.some(el => el.includes('hammerjs')) && !mainTsContent.includes(hammerImport)) {
                     // import hammerjs in the main.ts file
-                    const contents = hammerImport + mainTsContent;
-                    tree.overwrite(mainTsPath, contents);
+                    const mainContents = hammerImport + mainTsContent;
+                    tree.overwrite(mainTsPath, mainContents);
+                }
+                // make sure test.ts has hammerjs import even for projects already containing it in main.ts
+                // if there are no elements in the architect.test.options.scripts array that contain hammerjs
+                // and test.ts does not contain an import with hammerjs
+                if (!projectTestOptions.scripts.some(el => el.includes('hammerjs')) && !testTsContent.includes(hammerImport)) {
+                    const testContents = hammerImport + testTsContent;
+                    tree.overwrite(testTsPath, testContents);
                 }
                 break;
             default: