Merge remote-tracking branch 'origin/1.0-dev' into ci/node22

CycloneDX · May 15, 2024 · bd2597a · bd2597a
2 parents e7a6d9a + 8fa25d0
commit bd2597a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 21 deletions.
diff --git a/tests/_data/snapshots/plain_local-dependencies.json.bin b/tests/_data/snapshots/plain_local-dependencies.json.bin
diff --git a/tests/_data/snapshots/plain_local-workspaces.json.bin b/tests/_data/snapshots/plain_local-workspaces.json.bin
diff --git a/tests/integration/index.test.js b/tests/integration/index.test.js
@@ -59,7 +59,7 @@ suite('integration', () => {
 
   const thisYarnPlugin = path.join(projectRootPath, 'bundles', '@yarnpkg', 'plugin-cyclonedx.js')
 
-  const longTestTimeout = 30000
+  const longTestTimeout = 60000
 
   /**
    * @param {string} purpose

diff --git a/tests/integration/setup.js b/tests/integration/setup.js
@@ -26,16 +26,17 @@ const testbedsPath = path.join(testRootPath, '_data', 'testbeds');
 (function () {
   const REQUIRES_INSTALL = [
     /* region functional tests */
-    'bundled-dependencies',
-    'concurrent-versions',
-    'dev-dependencies',
-    'git-protocol-dependency',
-    'github-protocol-dependency',
-    'juice-shop',
-    'local-dependencies',
-    'local-workspaces',
-    'package-aliasing',
-    'package-with-build-id'
+    // !! none of the following ACTUALLY REQUIRES an installation - lock files are enough
+    // 'bundled-dependencies',
+    // 'concurrent-versions',
+    // 'dev-dependencies',
+    // 'git-protocol-dependency',
+    // 'github-protocol-dependency',
+    // 'juice-shop',
+    // 'local-dependencies',
+    // 'local-workspaces',
+    // 'package-aliasing',
+    // 'package-with-build-id'
     /* endregion functional tests */
     /* region regression tests */
     // ... none so far