test: modernize code (#17470)

Co-authored-by: Jamie Magee <jamie.magee@gmail.com>
renovatebot · Aug 30, 2022 · 4c52a27 · 4c52a27
1 parent 6a93997
commit 4c52a27
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 50 deletions.
diff --git a/lib/config/secrets.spec.ts b/lib/config/secrets.spec.ts
@@ -1,4 +1,4 @@
-import { defaultConfig } from '../../test/util';
+import { getConfig } from '../../test/util';
 import {
   CONFIG_SECRETS_INVALID,
   CONFIG_VALIDATION,
@@ -8,7 +8,7 @@ import { applySecretsToConfig, validateConfigSecrets } from './secrets';
 describe('config/secrets', () => {
   describe('validateConfigSecrets(config)', () => {
     it('works with default config', () => {
-      expect(() => validateConfigSecrets(defaultConfig)).not.toThrow();
+      expect(() => validateConfigSecrets(getConfig())).not.toThrow();
     });
 
     it('returns if no secrets', () => {
@@ -46,7 +46,7 @@ describe('config/secrets', () => {
 
   describe('applySecretsToConfig(config)', () => {
     it('works with default config', () => {
-      expect(() => applySecretsToConfig(defaultConfig)).not.toThrow();
+      expect(() => applySecretsToConfig(getConfig())).not.toThrow();
     });
 
     it('throws if disallowed field is used', () => {

diff --git a/lib/workers/repository/config-migration/branch/rebase.spec.ts b/lib/workers/repository/config-migration/branch/rebase.spec.ts
@@ -1,7 +1,7 @@
 import { Fixtures } from '../../../../../test/fixtures';
 import {
   RenovateConfig,
-  defaultConfig,
+  getConfig,
   git,
   platform,
 } from '../../../../../test/util';
@@ -32,7 +32,7 @@ describe('workers/repository/config-migration/branch/rebase', () => {
       GlobalConfig.reset();
       migratedConfigData = { content: renovateConfig, filename };
       config = {
-        ...defaultConfig,
+        ...getConfig(),
         repository: 'some/repo',
       };
     });

diff --git a/lib/workers/repository/config-migration/index.spec.ts b/lib/workers/repository/config-migration/index.spec.ts
@@ -1,5 +1,5 @@
 import { Fixtures } from '../../../../test/fixtures';
-import { defaultConfig, mockedFunction } from '../../../../test/util';
+import { getConfig, mockedFunction } from '../../../../test/util';
 import { checkConfigMigrationBranch } from './branch';
 import { MigratedDataFactory } from './branch/migrated-data';
 import { ensureConfigMigrationPr } from './pr';
@@ -13,7 +13,7 @@ const content = Fixtures.getJson('./migrated-data.json', './branch');
 const filename = 'renovate.json';
 const branchName = 'renovate/config-migration';
 const config = {
-  ...defaultConfig,
+  ...getConfig(),
   configMigration: true,
 };
 

diff --git a/lib/workers/repository/extract/index.spec.ts b/lib/workers/repository/extract/index.spec.ts
@@ -1,4 +1,4 @@
-import { defaultConfig, git, mocked } from '../../../../test/util';
+import { getConfig, git, mocked } from '../../../../test/util';
 import type { RenovateConfig } from '../../../config/types';
 import { logger } from '../../../logger';
 import * as _managerFiles from './manager-files';
@@ -17,7 +17,7 @@ describe('workers/repository/extract/index', () => {
     beforeEach(() => {
       jest.resetAllMocks();
       git.getFileList.mockResolvedValue(fileList);
-      config = { ...defaultConfig };
+      config = getConfig();
     });
 
     it('runs', async () => {

diff --git a/lib/workers/repository/init/vulnerability.spec.ts b/lib/workers/repository/init/vulnerability.spec.ts
@@ -1,6 +1,6 @@
 import {
   RenovateConfig,
-  defaultConfig,
+  getConfig,
   partial,
   platform,
 } from '../../../../test/util';
@@ -12,7 +12,7 @@ let config: RenovateConfig;
 
 beforeEach(() => {
   jest.resetAllMocks();
-  config = JSON.parse(JSON.stringify(defaultConfig));
+  config = getConfig();
 });
 
 describe('workers/repository/init/vulnerability', () => {

diff --git a/lib/workers/repository/onboarding/branch/rebase.spec.ts b/lib/workers/repository/onboarding/branch/rebase.spec.ts
@@ -1,6 +1,6 @@
 import {
   RenovateConfig,
-  defaultConfig,
+  getConfig,
   git,
   platform,
 } from '../../../../../test/util';
@@ -22,7 +22,7 @@ describe('workers/repository/onboarding/branch/rebase', () => {
     beforeEach(() => {
       jest.resetAllMocks();
       config = {
-        ...defaultConfig,
+        ...getConfig(),
         repository: 'some/repo',
       };
     });
@@ -35,7 +35,7 @@ describe('workers/repository/onboarding/branch/rebase', () => {
 
     it('does nothing if branch is up to date', async () => {
       const contents =
-        JSON.stringify(defaultConfig.onboardingConfig, null, 2) + '\n';
+        JSON.stringify(getConfig().onboardingConfig, null, 2) + '\n';
       git.getFile
         .mockResolvedValueOnce(contents) // package.json
         .mockResolvedValueOnce(contents); // renovate.json

diff --git a/lib/workers/repository/onboarding/pr/index.spec.ts b/lib/workers/repository/onboarding/pr/index.spec.ts
@@ -1,7 +1,7 @@
 import type { RequestError, Response } from 'got';
 import {
   RenovateConfig,
-  defaultConfig,
+  getConfig,
   git,
   partial,
   platform,
@@ -28,7 +28,7 @@ describe('workers/repository/onboarding/pr/index', () => {
     beforeEach(() => {
       jest.resetAllMocks();
       config = {
-        ...defaultConfig,
+        ...getConfig(),
         errors: [],
         warnings: [],
         description: [],

diff --git a/lib/workers/repository/update/branch/auto-replace.spec.ts b/lib/workers/repository/update/branch/auto-replace.spec.ts
@@ -1,5 +1,5 @@
 import { Fixtures } from '../../../../../test/fixtures';
-import { defaultConfig } from '../../../../../test/util';
+import { getConfig, partial } from '../../../../../test/util';
 import { GlobalConfig } from '../../../../config/global';
 import { WORKER_FILE_UPDATE_FAILED } from '../../../../constants/error-messages';
 import { extractPackageFile } from '../../../../modules/manager/html';
@@ -25,12 +25,12 @@ describe('workers/repository/update/branch/auto-replace', () => {
     });
 
     beforeEach(() => {
-      upgrade = {
-        // TODO: fix type #7154
-        ...JSON.parse(JSON.stringify(defaultConfig)),
+      upgrade = partial<BranchUpgradeConfig>({
+        // TODO: fix types (#7154)
+        ...(getConfig() as any),
         manager: 'html',
         packageFile: 'test',
-      };
+      });
       reuseExistingBranch = false;
     });
 

diff --git a/lib/workers/repository/update/branch/automerge.spec.ts b/lib/workers/repository/update/branch/automerge.spec.ts
@@ -1,4 +1,4 @@
-import { defaultConfig, git, platform } from '../../../../../test/util';
+import { getConfig, git, platform } from '../../../../../test/util';
 import { GlobalConfig } from '../../../../config/global';
 import type { RenovateConfig } from '../../../../config/types';
 import { BranchStatus } from '../../../../types';
@@ -13,9 +13,7 @@ describe('workers/repository/update/branch/automerge', () => {
     let config: RenovateConfig;
 
     beforeEach(() => {
-      config = {
-        ...defaultConfig,
-      };
+      config = getConfig();
       GlobalConfig.reset();
     });
 

diff --git a/lib/workers/repository/update/branch/check-existing.spec.ts b/lib/workers/repository/update/branch/check-existing.spec.ts
@@ -1,4 +1,4 @@
-import { defaultConfig, partial, platform } from '../../../../../test/util';
+import { getConfig, partial, platform } from '../../../../../test/util';
 import { logger } from '../../../../logger';
 import type { Pr } from '../../../../modules/platform';
 import { PrState } from '../../../../types';
@@ -10,9 +10,9 @@ describe('workers/repository/update/branch/check-existing', () => {
     let config: BranchConfig;
 
     beforeEach(() => {
-      // TODO #7154 incompatible types
+      // TODO: incompatible types (#7154)
       config = {
-        ...defaultConfig,
+        ...getConfig(),
         branchName: 'some-branch',
         prTitle: 'some-title',
       } as BranchConfig;

diff --git a/lib/workers/repository/update/branch/commit.spec.ts b/lib/workers/repository/update/branch/commit.spec.ts
@@ -1,5 +1,5 @@
 import {
-  defaultConfig,
+  getConfig,
   git,
   mockedFunction,
   platform,
@@ -15,9 +15,9 @@ describe('workers/repository/update/branch/commit', () => {
     let config: BranchConfig;
 
     beforeEach(() => {
-      // TODO #7154 incompatible types
+      // TODO: incompatible types (#7154)
       config = {
-        ...defaultConfig,
+        ...getConfig(),
         branchName: 'renovate/some-branch',
         commitMessage: 'some commit message',
         semanticCommits: 'disabled',

diff --git a/lib/workers/repository/update/branch/get-updated.spec.ts b/lib/workers/repository/update/branch/get-updated.spec.ts
@@ -1,4 +1,4 @@
-import { defaultConfig, git, mocked } from '../../../../../test/util';
+import { getConfig, git, mocked } from '../../../../../test/util';
 import { GitRefsDatasource } from '../../../../modules/datasource/git-refs';
 import * as _composer from '../../../../modules/manager/composer';
 import * as _gitSubmodules from '../../../../modules/manager/git-submodules';
@@ -29,10 +29,11 @@ describe('workers/repository/update/branch/get-updated', () => {
     let config: BranchConfig;
 
     beforeEach(() => {
+      // TODO: incompatible types (#7154)
       config = {
-        ...defaultConfig,
+        ...getConfig(),
         upgrades: [],
-      } as never;
+      } as BranchConfig;
       npm.updateDependency = jest.fn();
       git.getFile.mockResolvedValueOnce('existing content');
     });

diff --git a/lib/workers/repository/update/branch/index.spec.ts b/lib/workers/repository/update/branch/index.spec.ts
@@ -1,6 +1,6 @@
 import {
-  defaultConfig,
   fs,
+  getConfig,
   git,
   mocked,
   mockedFunction,
@@ -100,8 +100,9 @@ describe('workers/repository/update/branch/index', () => {
       git.branchExists.mockReturnValue(false);
       prWorker.ensurePr = jest.fn();
       prAutomerge.checkAutoMerge = jest.fn();
+      // TODO: incompatible types (#7154)
       config = {
-        ...defaultConfig,
+        ...getConfig(),
         branchName: 'renovate/some-branch',
         errors: [],
         warnings: [],
@@ -1294,7 +1295,7 @@ describe('workers/repository/update/branch/index', () => {
         },
         upgrades: [
           {
-            ...defaultConfig,
+            ...getConfig(),
             depName: 'some-dep-name',
             postUpgradeTasks: {
               executionMode: 'update',
@@ -1384,7 +1385,7 @@ describe('workers/repository/update/branch/index', () => {
         ...config,
         upgrades: [
           {
-            ...defaultConfig,
+            ...getConfig(),
             depName: 'some-dep-name',
             postUpgradeTasks: {
               commands: ['exit 1'],
@@ -1468,7 +1469,7 @@ describe('workers/repository/update/branch/index', () => {
         },
         upgrades: [
           {
-            ...defaultConfig,
+            ...getConfig(),
             depName: 'some-dep-name',
             postUpgradeTasks: {
               executionMode: 'update',
@@ -1572,7 +1573,7 @@ describe('workers/repository/update/branch/index', () => {
         },
         upgrades: [
           {
-            ...defaultConfig,
+            ...getConfig(),
             depName: 'some-dep-name-1',
             postUpgradeTasks: {
               executionMode: 'update',
@@ -1586,7 +1587,7 @@ describe('workers/repository/update/branch/index', () => {
             },
           } as BranchUpgradeConfig,
           {
-            ...defaultConfig,
+            ...getConfig(),
             depName: 'some-dep-name-2',
             postUpgradeTasks: {
               executionMode: 'update',
@@ -1718,7 +1719,7 @@ describe('workers/repository/update/branch/index', () => {
         },
         upgrades: [
           {
-            ...defaultConfig,
+            ...getConfig(),
             depName: 'some-dep-name-1',
             postUpgradeTasks: {
               executionMode: 'branch',
@@ -1732,7 +1733,7 @@ describe('workers/repository/update/branch/index', () => {
             },
           } as BranchUpgradeConfig,
           {
-            ...defaultConfig,
+            ...getConfig(),
             depName: 'some-dep-name-2',
             postUpgradeTasks: {
               executionMode: 'branch',

diff --git a/lib/workers/repository/update/branch/status-checks.spec.ts b/lib/workers/repository/update/branch/status-checks.spec.ts
@@ -1,4 +1,4 @@
-import { defaultConfig, platform } from '../../../../../test/util';
+import { getConfig, platform } from '../../../../../test/util';
 import { BranchStatus } from '../../../../types';
 import {
   ConfidenceConfig,
@@ -14,7 +14,7 @@ describe('workers/repository/update/branch/status-checks', () => {
 
     beforeEach(() => {
       config = {
-        ...defaultConfig,
+        ...getConfig(),
         branchName: 'renovate/some-branch',
       };
     });
@@ -56,7 +56,7 @@ describe('workers/repository/update/branch/status-checks', () => {
 
     beforeEach(() => {
       config = {
-        ...defaultConfig,
+        ...getConfig(),
         branchName: 'renovate/some-branch',
       };
     });

diff --git a/lib/workers/repository/updates/generate.spec.ts b/lib/workers/repository/updates/generate.spec.ts
@@ -1,11 +1,14 @@
-import { defaultConfig } from '../../../../test/util';
-import type { UpdateType } from '../../../config/types';
+import { getConfig } from '../../../../test/util';
+import type { RenovateConfig, UpdateType } from '../../../config/types';
 import { NpmDatasource } from '../../../modules/datasource/npm';
 import type { BranchUpgradeConfig } from '../../types';
 import { generateBranchConfig } from './generate';
 
+let defaultConfig: RenovateConfig;
+
 beforeEach(() => {
   jest.resetAllMocks();
+  defaultConfig = getConfig();
 });
 
 describe('workers/repository/updates/generate', () => {

diff --git a/test/util.ts b/test/util.ts
@@ -45,8 +45,6 @@ export const logger = mocked(_logger);
 
 export type { RenovateConfig };
 
-export const defaultConfig = getConfig();
-
 export { getConfig };
 
 function getCallerFileName(): string | null {