From ea9c10ae8e54a3ac62bca13bb2c437594f05b579 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Fri, 24 May 2024 13:00:35 +0200 Subject: [PATCH] tests: prep test runs Signed-off-by: Jan Kowalleck --- .../alternative-package-registry/package.json | 2 -- .../testbeds/alternative-package-registry/yarn.lock | 12 ++++++++++++ tests/integration/index.test.js | 10 ++++++---- tests/integration/setup.js | 1 + 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/tests/_data/testbeds/alternative-package-registry/package.json b/tests/_data/testbeds/alternative-package-registry/package.json index 6beae7a2..0c7d4e2c 100644 --- a/tests/_data/testbeds/alternative-package-registry/package.json +++ b/tests/_data/testbeds/alternative-package-registry/package.json @@ -4,8 +4,6 @@ "version": "0.0.0", "description": "demo: alternative-package-registry -- showcase how lternative package registrier affect the result", "license": "Apache-2.0", - "dependencies": { - }, "scripts": { "SBOM": "YARN_PLUGINS=$PROJECT_CWD/../../../../bundles/@yarnpkg/plugin-cyclonedx.js yarn cyclonedx" } diff --git a/tests/_data/testbeds/alternative-package-registry/yarn.lock b/tests/_data/testbeds/alternative-package-registry/yarn.lock index e69de29b..5bdae865 100644 --- a/tests/_data/testbeds/alternative-package-registry/yarn.lock +++ b/tests/_data/testbeds/alternative-package-registry/yarn.lock @@ -0,0 +1,12 @@ +# This file is generated by running "yarn install" inside your project. +# Manual changes might be lost - proceed with caution! + +__metadata: + version: 8 + cacheKey: 10c0 + +"demo-alternative-package-registry@workspace:.": + version: 0.0.0-use.local + resolution: "demo-alternative-package-registry@workspace:." + languageName: unknown + linkType: soft diff --git a/tests/integration/index.test.js b/tests/integration/index.test.js index 391abc92..b4090413 100644 --- a/tests/integration/index.test.js +++ b/tests/integration/index.test.js @@ -43,6 +43,7 @@ const { const testSetups = [ /* region functional tests */ + 'alternative-package-registry', 'bundled-dependencies', 'concurrent-versions', 'dev-dependencies', @@ -167,10 +168,11 @@ suite('integration', () => { }) suite('short PURLs', () => { - const testSetup = 'juice-shop' - test(`${testSetup}`, - () => runTest('short-PURLs', testSetup, format, ['--short-PURLs']) - ).timeout(longTestTimeout) + ['alternative-package-registry', 'juice-shop'].forEach(testSetup => { + test(`${testSetup}`, + () => runTest('short-PURLs', testSetup, format, ['--short-PURLs']) + ).timeout(longTestTimeout) + }) }) test('dogfooding', async () => { diff --git a/tests/integration/setup.js b/tests/integration/setup.js index 371e74e4..5db34e96 100644 --- a/tests/integration/setup.js +++ b/tests/integration/setup.js @@ -27,6 +27,7 @@ const testbedsPath = path.join(testRootPath, '_data', 'testbeds'); const REQUIRES_INSTALL = [ /* region functional tests */ // !! none of the following ACTUALLY REQUIRES an installation - lock files are enough + 'alternative-package-registry', 'bundled-dependencies', 'concurrent-versions', 'dev-dependencies',