fix: jest test not running on new otter webapp

packages/@o3r/core/schematics/component/container/index.ts

@@ -14,7 +14,7 @@ import {
   getInputComponentName,
   getWorkspaceConfig
 } from '@o3r/schematics';
-import { addImportToModule } from '@schematics/angular/utility/ast-utils';
+import { addImportToModule, insertImport } from '@schematics/angular/utility/ast-utils';
 import { applyToUpdateRecorder, InsertChange } from '@schematics/angular/utility/change';
 import * as path from 'node:path';
 import * as ts from 'typescript';
@@ -208,7 +208,9 @@ function ngGenerateComponentContainerFn(options: NgGenerateComponentContainerSch
           ts.isImportDeclaration(statement)
         );
 
-        const changes = [new InsertChange(o3rSpecPath, lastImport?.getEnd() || 0, `
+        const changes = [
+          insertImport(specSourceFile, o3rSpecPath, 'Component', '@angular/core'),
+          new InsertChange(o3rSpecPath, lastImport?.getEnd() || 0, `
 @Component({
   template: '',
   selector: '${properties.presenterComponentSelector}',

packages/@o3r/core/schematics/ng-add/utils/linter/index.ts

@@ -13,11 +13,11 @@ export const shouldOtterLinterBeInstalled = async (context: SchematicContext): P
   try {
     require.resolve(`${linterPackageName}/package.json`);
     if (context.interactive) {
-      useOtterLinter = await askConfirmation(`You already have eslint installed. Would you like to add otter config rules for eslint ?
+      useOtterLinter = await askConfirmation(`You already have eslint installed. Would you like to add otter config rules for eslint?
 Otherwise, you can add them later via this command: ng add @o3r/eslint-config-otter`, true);
     }
   } catch {
-    context.logger.info(`eslint package not installed. Skipping otter linter phase !
+    context.logger.info(`eslint package not installed. Skipping otter linter phase!
 You can add otter linter config rules later to the project via this command: ng add @o3r/eslint-config-otter`);
   }
 

packages/@o3r/testing/schematics/index.it.spec.ts

@@ -28,7 +28,15 @@ describe('new otter application with testing', () => {
   afterAll(async () => {
     try { await rm(workspacePath, { recursive: true }); } catch { /* ignore error */ }
   });
-  test('should add testing to existing application', async () => {
+  test('should add testing to existing application', () => {
+    packageManagerExec({script: 'ng', args: ['add', `@o3r/testing@${o3rVersion}`, '--skip-confirmation', '--project-name', projectName]}, execAppOptions);
+
+    expect(() => packageManagerInstall(execAppOptions)).not.toThrow();
+    expect(() => packageManagerRunOnProject(projectName, isInWorkspace, {script: 'build'}, execAppOptions)).not.toThrow();
+    expect(() => packageManagerRunOnProject(projectName, isInWorkspace, {script: 'test'}, execAppOptions)).not.toThrow();
+  });
+
+  test('should add testing to existing application and fixture to component', async () => {
     const relativeProjectPath = path.relative(workspacePath, projectPath);
     packageManagerExec({script: 'ng', args: ['add', `@o3r/testing@${o3rVersion}`, '--skip-confirmation', '--project-name', projectName]}, execAppOptions);
 
@@ -48,5 +56,6 @@ describe('new otter application with testing', () => {
 
     expect(() => packageManagerInstall(execAppOptions)).not.toThrow();
     expect(() => packageManagerRunOnProject(projectName, isInWorkspace, {script: 'build'}, execAppOptions)).not.toThrow();
+    expect(() => packageManagerRunOnProject(projectName, isInWorkspace, {script: 'test'}, execAppOptions)).not.toThrow();
   });
 });

packages/@o3r/testing/schematics/ng-add/fixture/index.ts

@@ -8,10 +8,9 @@ import * as ts from 'typescript';
  * Add fixture configuration
  * @param options @see RuleFactory.options
  * @param options.projectName
- * @param registerUnitTestFixturePaths should add path mapping for unit test fixtures
  * @param options.testingFramework
  */
-export function updateFixtureConfig(options: { projectName?: string | null | undefined; testingFramework?: string | null | undefined }, registerUnitTestFixturePaths: boolean): Rule {
+export function updateFixtureConfig(options: { projectName?: string | null | undefined; testingFramework?: string | null | undefined }): Rule {
 
   const oldPaths = ['@otter/testing/core', '@otter/testing/core/*'];
   /**
@@ -91,12 +90,6 @@ export function updateFixtureConfig(options: { projectName?: string | null | und
       return acc;
     }, {});
 
-    if (registerUnitTestFixturePaths) {
-      configWithPath.content.compilerOptions.baseUrl ||= '.';
-      configWithPath.content.compilerOptions.paths['@o3r/testing/core'] = ['node_modules/@o3r/testing/core/angular'];
-      configWithPath.content.compilerOptions.paths['@o3r/testing/core/*'] = ['node_modules/@o3r/testing/core/angular/*'];
-    }
-
     tree.overwrite(configWithPath.tsconfig, JSON.stringify(configWithPath.content, null, 2));
 
     return tree;

packages/@o3r/testing/schematics/ng-add/index.ts

@@ -26,7 +26,10 @@ const devDependenciesToInstall = [
   'pixelmatch',
   'pngjs',
   'jest',
-  'jest-preset-angular'
+  'jest-environment-jsdom',
+  'jest-preset-angular',
+  'ts-jest',
+  '@types/jest'
 ];
 
 /**
@@ -90,7 +93,7 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
         await askConfirmation('Do you want to setup Playwright test framework for E2E?', true);
 
       const rules = [
-        updateFixtureConfig(options, installJest),
+        updateFixtureConfig(options),
         removePackages(['@otter/testing']),
         addVsCodeRecommendations(['Orta.vscode-jest']),
         installPlaywright ? updatePlaywright(options, dependencies) : noop,
@@ -135,8 +138,7 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
 
           const jestConfigFilesForWorkspace = () => mergeWith(apply(url('./templates/workspace'), [
             template({
-              ...options,
-              rootRelativePath
+              ...options
             }),
             move(tree.root.path),
             renameTemplateFiles()

packages/@o3r/testing/schematics/ng-add/templates/workspace/jest.config.ut.js.template

@@ -1,8 +1,8 @@
-const { relative } = require('node:path');
+const { join, relative } = require('node:path');
 const { pathsToModuleNameMapper } = require('ts-jest');
-// In the following statement, replace `<%= rootRelativePath %>/tsconfig.base` with the path to your `tsconfig` file
+// In the following statement, replace `./tsconfig.json` with the path to your `tsconfig` file
 // which contains the path mapping (ie the `compilerOptions.paths` option):
-const { compilerOptions } = require('<%= rootRelativePath %>/tsconfig.base');
+const { compilerOptions } = require('./tsconfig.json');
 
 globalThis.ngJest = {
   skipNgcc: true
@@ -14,11 +14,13 @@ globalThis.ngJest = {
  * @returns {import('ts-jest/dist/types').JestConfigWithTsJest}
  */
 module.exports.getJestProjectConfig = (rootDir, isAngularSetup) => {
-  const relativePath = relative(rootDir, '.');
-  const moduleNameMapper = Object.entries(pathsToModuleNameMapper(compilerOptions.paths)).reduce((acc, [moduleName, path]) => {
+  const relativePath = relative(rootDir, __dirname);
+  const moduleNameMapper = Object.entries(pathsToModuleNameMapper(compilerOptions.paths || {})).reduce((acc, [moduleName, path]) => {
     acc[moduleName] = `<rootDir>/${relativePath}/${path}`;
     return acc;
   }, {});
+  moduleNameMapper['^@o3r/testing/core$'] = [require.resolve('@o3r/testing/core/angular')];
+  moduleNameMapper['^@o3r/testing/core/(.*)'] = [join(require.resolve('@o3r/testing/core/angular'), '$1')];
   return {
     preset: 'ts-jest',
     setupFilesAfterEnv: ['<rootDir>/testing/setup-jest.ts'],