test: escape hatch for test CI's implied no-check-cache

yarnpkg · Sep 18, 2022 · 1008f91 · 1008f91
1 parent 1e55898
commit 1008f91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/acceptance-tests/pkg-tests-core/sources/utils/tests.ts b/packages/acceptance-tests/pkg-tests-core/sources/utils/tests.ts
@@ -682,8 +682,14 @@ export const generatePkgDriver = ({
 
           // We want users to be aware of the security implications of zero-install, but we don't want it to affect yarn own testing.
           if (args[0] === `install`) {
+            // escape hatch for test use only
+            const escapeHatchIndex = args.indexOf(`--check-cache-test`);
+            const hasEscapeHatch = args.indexOf(`--check-cache-test`) !== -1;
+            if (hasEscapeHatch)
+              args.splice(escapeHatchIndex, 1);
+
             const hasCheckCacheOption = args.includes(`--check-cache`) || args.includes(`--no-check-cache`);
-            if (!hasCheckCacheOption) {
+            if (!hasCheckCacheOption && !hasEscapeHatch) {
               args.push(`--no-check-cache`);
             }
           }

diff --git a/packages/acceptance-tests/pkg-tests-specs/sources/commands/install.test.js b/packages/acceptance-tests/pkg-tests-specs/sources/commands/install.test.js
@@ -579,7 +579,7 @@ describe(`Commands`, () => {
         // mock zero-install environment
         await xfs.mkdirPromise(ppath.join(path, `.yarn`));
         await xfs.mkdirPromise(ppath.join(path, `.yarn/cache`));
-        await expect(run(`install`, {env: {CI: true}})).rejects.toMatchObject({
+        await expect(run(`install`, `--check-cache-test`, {env: {CI: true}})).rejects.toMatchObject({
           code: 1,
           stdout: expect.stringMatching(`you need to explicitly define --check-cache or --no-check-cache option`),
         });