feat(it-tests): test schematics with yarn 1

AmadeusITGroup · Jan 22, 2024 · 7a0e5ad · 7a0e5ad
1 parent 0536b3c
commit 7a0e5ad
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/it-tests.yml b/.github/workflows/it-tests.yml
@@ -51,7 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        packageManager: [yarn, npm]
+        packageManager: [yarn, npm, yarn1]
         exclude:
           - os: windows-latest
             packageManager: yarn

diff --git a/packages/@o3r/core/schematics/index.it.spec.ts b/packages/@o3r/core/schematics/index.it.spec.ts
@@ -203,7 +203,7 @@ describe('new otter application', () => {
         execAppOptions
       );
 
-      expect(() => packageManagerRun('build', execAppOptions)).not.toThrow();
+      expect(() => packageManagerRun('build', { ...execAppOptions, cwd: appFolderPath })).not.toThrow();
 
       // should pass the e2e tests
       packageManagerExec(`ng g @o3r/testing:playwright-scenario --name=test-scenario ${projectName}`, execAppOptions);

diff --git a/packages/@o3r/test-helpers/src/prepare-test-env.ts b/packages/@o3r/test-helpers/src/prepare-test-env.ts
@@ -6,7 +6,7 @@ import { minVersion } from 'semver';
 import { createTestEnvironmentAngular } from './test-environments/create-test-environment-angular';
 import { createTestEnvironmentAngularWithO3rCore } from './test-environments/create-test-environment-angular-with-o3r-core';
 import { createTestEnvironmentBlank } from './test-environments/create-test-environment-blank';
-import {createWithLock, packageManagerInstall, setPackagerManagerConfig} from './utilities';
+import {createWithLock, isYarn1, packageManagerInstall, setPackagerManagerConfig, YARN_1_LATEST_VERSION} from './utilities';
 
 /**
  * 'blank' only create yarn/npm config
@@ -44,7 +44,7 @@ export async function prepareTestEnv(folderName: string, type: PrepareTestEnvTyp
 
   const o3rCorePackageJson: PackageJson & { generatorDependencies?: Record<string, string> } =
     JSON.parse(readFileSync(path.join(rootFolderPath, 'packages', '@o3r', 'core', 'package.json')).toString());
-  const yarnVersion: string = yarnVersionParam || getYarnVersionFromRoot(rootFolderPath);
+  const yarnVersion: string = yarnVersionParam || (isYarn1() && YARN_1_LATEST_VERSION) || getYarnVersionFromRoot(rootFolderPath);
   const angularVersion = minVersion(o3rCorePackageJson.devDependencies?.['@angular-devkit/schematics'] || 'latest')?.version;
   const materialVersion = minVersion(o3rCorePackageJson.generatorDependencies?.['@angular/material'] || angularVersion || 'latest')?.version;
   const generateMonorepo = type === 'angular-monorepo' || type === 'angular-monorepo-with-o3r-core';

diff --git a/packages/@o3r/test-helpers/src/utilities/package-manager.ts b/packages/@o3r/test-helpers/src/utilities/package-manager.ts
@@ -42,6 +42,15 @@ export function getPackageManager() {
     'yarn';
 }
 
+export const YARN_1_LATEST_VERSION = '1.22.19';
+
+/**
+ *
+ */
+export function isYarn1() {
+  return process.env.ENFORCED_PACKAGE_MANAGER === 'yarn1';
+}
+
 /**
  * Need to add additional dashes when running command like exec on npm
  * Convert `npm exec test --param` to `npm exec test -- --param`