From e1baf3eb3d70755a00c5804fe4f4376449659759 Mon Sep 17 00:00:00 2001 From: Or Geva Date: Sun, 15 Oct 2023 18:29:22 +0300 Subject: [PATCH] Remove __dirname --- src/test/tests/appsConfig.test.ts | 4 ++-- src/test/tests/iacScan.test.ts | 2 +- src/test/tests/integration/iac.test.ts | 2 +- src/test/tests/integration/secrets.test.ts | 2 +- src/test/tests/sastScan.test.ts | 2 +- src/test/tests/scanAnlayzerRunner.test.ts | 2 +- src/test/tests/secretsScan.test.ts | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/tests/appsConfig.test.ts b/src/test/tests/appsConfig.test.ts index 00dd77e3..cfbc8e03 100644 --- a/src/test/tests/appsConfig.test.ts +++ b/src/test/tests/appsConfig.test.ts @@ -42,7 +42,7 @@ describe('JFrog Apps Config Tests', () => { { excludeScanners: [ExcludeScannerName.Secrets, ExcludeScannerName.ContextualAnalysis] as ExcludeScannerName[], shouldSkip: true } ].forEach(testCase => { it('Should skip scanner - ' + testCase.excludeScanners, () => { - let module: AppsConfigModule = new AppsConfigModule(__dirname, { exclude_scanners: testCase.excludeScanners } as Module); + let module: AppsConfigModule = new AppsConfigModule('', { exclude_scanners: testCase.excludeScanners } as Module); assert.equal(module.ShouldSkipScanner(ScanType.AnalyzeApplicability), testCase.shouldSkip); }); }); @@ -96,7 +96,7 @@ describe('JFrog Apps Config Tests', () => { { scanner: { exclude_patterns: ['exclude-dir-1', 'exclude-dir-2'] } as Scanner } ].forEach(testCase => { it('Get exclude patterns - ' + testCase.scanner?.exclude_patterns, () => { - let module: AppsConfigModule = new AppsConfigModule(__dirname, { + let module: AppsConfigModule = new AppsConfigModule('', { exclude_patterns: ['exclude-root'], scanners: { secrets: testCase?.scanner } } as Module); diff --git a/src/test/tests/iacScan.test.ts b/src/test/tests/iacScan.test.ts index cc3de00f..2de60313 100644 --- a/src/test/tests/iacScan.test.ts +++ b/src/test/tests/iacScan.test.ts @@ -129,7 +129,7 @@ describe('Iac Scan Tests', () => { createTestStepProgress(), {} as ConnectionManager, logManager, - new AppsConfigModule(__dirname) + new AppsConfigModule('') ); } }); diff --git a/src/test/tests/integration/iac.test.ts b/src/test/tests/integration/iac.test.ts index 2c49584d..e6cd7c69 100644 --- a/src/test/tests/integration/iac.test.ts +++ b/src/test/tests/integration/iac.test.ts @@ -36,7 +36,7 @@ describe('Iac Integration Tests', async () => { createTestStepProgress(), integrationManager.connectionManager, integrationManager.logManager, - new AppsConfigModule(__dirname), + new AppsConfigModule(testDataRoot), integrationManager.resource ); runner.verbose = true; diff --git a/src/test/tests/integration/secrets.test.ts b/src/test/tests/integration/secrets.test.ts index cf29fd73..d5c58d66 100644 --- a/src/test/tests/integration/secrets.test.ts +++ b/src/test/tests/integration/secrets.test.ts @@ -36,7 +36,7 @@ describe('Secrets Scan Integration Tests', async () => { createTestStepProgress(), integrationManager.connectionManager, integrationManager.logManager, - new AppsConfigModule(__dirname), + new AppsConfigModule(testDataRoot), integrationManager.resource ); runner.verbose = true; diff --git a/src/test/tests/sastScan.test.ts b/src/test/tests/sastScan.test.ts index a67b4d5b..67d81ddd 100644 --- a/src/test/tests/sastScan.test.ts +++ b/src/test/tests/sastScan.test.ts @@ -127,7 +127,7 @@ describe('Sast Tests', () => { createTestStepProgress(), {} as ConnectionManager, logManager, - new AppsConfigModule(__dirname) + new AppsConfigModule('') ); } }); diff --git a/src/test/tests/scanAnlayzerRunner.test.ts b/src/test/tests/scanAnlayzerRunner.test.ts index 71a67781..71dd49b0 100644 --- a/src/test/tests/scanAnlayzerRunner.test.ts +++ b/src/test/tests/scanAnlayzerRunner.test.ts @@ -58,7 +58,7 @@ describe('Analyzer BinaryRunner tests', async () => { ): Promise { await RunUtils.runWithTimeout(timeout, checkCancel, dummyAction()); } - })(connection, dummyName, logManager, new AppsConfigModule(__dirname)); + })(connection, dummyName, logManager, new AppsConfigModule('')); } [ diff --git a/src/test/tests/secretsScan.test.ts b/src/test/tests/secretsScan.test.ts index 2aa2a66c..564c977a 100644 --- a/src/test/tests/secretsScan.test.ts +++ b/src/test/tests/secretsScan.test.ts @@ -127,7 +127,7 @@ describe('Secrets Scan Tests', () => { createTestStepProgress(), {} as ConnectionManager, logManager, - new AppsConfigModule(__dirname) + new AppsConfigModule('') ); } });