diff --git a/lib/config/migrate-validate.spec.ts b/lib/config/migrate-validate.spec.ts index e64b707b59ecafefe464b5f20738df30aa06c985..bd3ba37d5fd9ee7223e45c3b79f3ed45a9d9133c 100644 --- a/lib/config/migrate-validate.spec.ts +++ b/lib/config/migrate-validate.spec.ts @@ -1,4 +1,5 @@ -import { RenovateConfig, getConfig } from '../../test/util'; +import type { RenovateConfig } from '../../test/util'; +import { getConfig } from './defaults'; import { migrateAndValidate } from './migrate-validate'; let config: RenovateConfig; diff --git a/lib/config/secrets.spec.ts b/lib/config/secrets.spec.ts index b66dbb36c2bbda8410fa7ecb041b49e5d819bbc5..18656049a1e9c1ce2c11219fa79a7fa8ed31b1b5 100644 --- a/lib/config/secrets.spec.ts +++ b/lib/config/secrets.spec.ts @@ -1,8 +1,8 @@ -import { getConfig } from '../../test/util'; import { CONFIG_SECRETS_INVALID, CONFIG_VALIDATION, } from '../constants/error-messages'; +import { getConfig } from './defaults'; import { applySecretsToConfig, validateConfigSecrets } from './secrets'; describe('config/secrets', () => { diff --git a/lib/modules/manager/cpanfile/extract.spec.ts b/lib/modules/manager/cpanfile/extract.spec.ts index f50caf784390571a0ef1f59ca8cfd448de1be91a..e5ebdc5ce1e3fb3290a2e8298918a9a6ae6b3a45 100644 --- a/lib/modules/manager/cpanfile/extract.spec.ts +++ b/lib/modules/manager/cpanfile/extract.spec.ts @@ -1,5 +1,5 @@ import { codeBlock } from 'common-tags'; -import { extractPackageFile } from './extract'; +import { extractPackageFile } from '.'; describe('modules/manager/cpanfile/extract', () => { describe('extractPackageFile()', () => { diff --git a/lib/modules/manager/kustomize/extract.spec.ts b/lib/modules/manager/kustomize/extract.spec.ts index 4d8b1c47ec594f0e4ab2f9a7ddbee5ab5a724367..10da86921eaf00df7d67c45cc6e1e7ce12f4beb2 100644 --- a/lib/modules/manager/kustomize/extract.spec.ts +++ b/lib/modules/manager/kustomize/extract.spec.ts @@ -7,10 +7,10 @@ import { HelmDatasource } from '../../datasource/helm'; import { extractHelmChart, extractImage, - extractPackageFile, extractResource, parseKustomize, } from './extract'; +import { extractPackageFile } from '.'; const kustomizeGitSSHBase = Fixtures.get('gitSshBase.yaml'); const kustomizeEmpty = Fixtures.get('kustomizeEmpty.yaml'); diff --git a/lib/modules/manager/nodenv/extract.spec.ts b/lib/modules/manager/nodenv/extract.spec.ts index 40b8b939e7897109184f83c9447c28dbc72e3382..f0b6ded133f7a720ac1e8fb0a18152f91fec80d1 100644 --- a/lib/modules/manager/nodenv/extract.spec.ts +++ b/lib/modules/manager/nodenv/extract.spec.ts @@ -1,4 +1,4 @@ -import { extractPackageFile } from './extract'; +import { extractPackageFile } from '.'; describe('modules/manager/nodenv/extract', () => { describe('extractPackageFile()', () => { diff --git a/lib/modules/manager/osgi/extract.spec.ts b/lib/modules/manager/osgi/extract.spec.ts index c77c15151d46eb142acd0ea70f5e838ac22404f3..a6dec86575b1a86800c4c0f3ce66a19d987c5a36 100644 --- a/lib/modules/manager/osgi/extract.spec.ts +++ b/lib/modules/manager/osgi/extract.spec.ts @@ -1,4 +1,4 @@ -import { extractPackageFile } from './extract'; +import { extractPackageFile } from '.'; const noArtifacts = `{ "configurations": { diff --git a/lib/modules/manager/pep621/extract.spec.ts b/lib/modules/manager/pep621/extract.spec.ts index 4c14791d1db938b51be0d18d6291496de9e07b3f..f7a5cea44f76306b0e0a542cf294d154d1f2910e 100644 --- a/lib/modules/manager/pep621/extract.spec.ts +++ b/lib/modules/manager/pep621/extract.spec.ts @@ -1,6 +1,6 @@ import { codeBlock } from 'common-tags'; import { Fixtures } from '../../../../test/fixtures'; -import { extractPackageFile } from './extract'; +import { extractPackageFile } from '.'; const pdmPyProject = Fixtures.get('pyproject_with_pdm.toml'); const pdmSourcesPyProject = Fixtures.get('pyproject_pdm_sources.toml'); diff --git a/lib/workers/repository/config-migration/branch/create.spec.ts b/lib/workers/repository/config-migration/branch/create.spec.ts index 6f854ccc3c0075c8baba8a47c1e84a5b6cc9bab0..8a1d1aab545d18179ba284a910beff5c964eed65 100644 --- a/lib/workers/repository/config-migration/branch/create.spec.ts +++ b/lib/workers/repository/config-migration/branch/create.spec.ts @@ -1,6 +1,7 @@ import type { Indent } from 'detect-indent'; import { Fixtures } from '../../../../../test/fixtures'; -import { RenovateConfig, getConfig, partial } from '../../../../../test/util'; +import { RenovateConfig, partial } from '../../../../../test/util'; +import { getConfig } from '../../../../config/defaults'; import { scm } from '../../../../modules/platform/scm'; import { createConfigMigrationBranch } from './create'; import { MigratedDataFactory } from './migrated-data'; diff --git a/lib/workers/repository/config-migration/branch/index.spec.ts b/lib/workers/repository/config-migration/branch/index.spec.ts index 34edd71ef7c3b70c29bf100edcca112c5e823cdf..e9c88a0b49141028616317e8b0842c7a4c286751 100644 --- a/lib/workers/repository/config-migration/branch/index.spec.ts +++ b/lib/workers/repository/config-migration/branch/index.spec.ts @@ -2,13 +2,13 @@ import { mock } from 'jest-mock-extended'; import { Fixtures } from '../../../../../test/fixtures'; import { RenovateConfig, - getConfig, git, mockedFunction, partial, platform, scm, } from '../../../../../test/util'; +import { getConfig } from '../../../../config/defaults'; import { GlobalConfig } from '../../../../config/global'; import { logger } from '../../../../logger'; import type { Pr } from '../../../../modules/platform'; diff --git a/lib/workers/repository/config-migration/branch/rebase.spec.ts b/lib/workers/repository/config-migration/branch/rebase.spec.ts index 4f7ebdb6884e06c966e13c18795e9316ca2fb42a..b09a7654cb655ffea49265fdaa8c6adbc0e4b927 100644 --- a/lib/workers/repository/config-migration/branch/rebase.spec.ts +++ b/lib/workers/repository/config-migration/branch/rebase.spec.ts @@ -1,13 +1,8 @@ import type { Indent } from 'detect-indent'; import JSON5 from 'json5'; import { Fixtures } from '../../../../../test/fixtures'; -import { - RenovateConfig, - getConfig, - git, - partial, - scm, -} from '../../../../../test/util'; +import { RenovateConfig, git, partial, scm } from '../../../../../test/util'; +import { getConfig } from '../../../../config/defaults'; import { GlobalConfig } from '../../../../config/global'; import { MigratedDataFactory } from './migrated-data'; import type { MigratedData } from './migrated-data'; diff --git a/lib/workers/repository/config-migration/index.spec.ts b/lib/workers/repository/config-migration/index.spec.ts index 3ab683886d360cab8d85e30b391e0fc6253a83d8..eaed898146c97a9e059e78fd01568b7e8e0685e4 100644 --- a/lib/workers/repository/config-migration/index.spec.ts +++ b/lib/workers/repository/config-migration/index.spec.ts @@ -1,6 +1,7 @@ import type { Indent } from 'detect-indent'; import { Fixtures } from '../../../../test/fixtures'; -import { getConfig, mockedFunction, partial } from '../../../../test/util'; +import { mockedFunction, partial } from '../../../../test/util'; +import { getConfig } from '../../../config/defaults'; import { checkConfigMigrationBranch } from './branch'; import { MigratedDataFactory } from './branch/migrated-data'; import { ensureConfigMigrationPr } from './pr'; diff --git a/lib/workers/repository/config-migration/pr/index.spec.ts b/lib/workers/repository/config-migration/pr/index.spec.ts index e0dc57d32f908c56e3005cb99f330eb713925f95..25f4ab65f1344235f82e02629b2643039b2fc1ac 100644 --- a/lib/workers/repository/config-migration/pr/index.spec.ts +++ b/lib/workers/repository/config-migration/pr/index.spec.ts @@ -4,11 +4,11 @@ import { mock } from 'jest-mock-extended'; import { Fixtures } from '../../../../../test/fixtures'; import { RenovateConfig, - getConfig, partial, platform, scm, } from '../../../../../test/util'; +import { getConfig } from '../../../../config/defaults'; import { GlobalConfig } from '../../../../config/global'; import { logger } from '../../../../logger'; import type { Pr } from '../../../../modules/platform'; diff --git a/lib/workers/repository/dependency-dashboard.spec.ts b/lib/workers/repository/dependency-dashboard.spec.ts index 809669c610824b98ec84eebd6215f3a55a3274f4..054eef3f32be5597ad5074c79f9b7a0da85fabdc 100644 --- a/lib/workers/repository/dependency-dashboard.spec.ts +++ b/lib/workers/repository/dependency-dashboard.spec.ts @@ -4,11 +4,11 @@ import { mock } from 'jest-mock-extended'; import { Fixtures } from '../../../test/fixtures'; import { RenovateConfig, - getConfig, logger, mockedFunction, platform, } from '../../../test/util'; +import { getConfig } from '../../config/defaults'; import { GlobalConfig } from '../../config/global'; import type { PackageDependency, diff --git a/lib/workers/repository/extract/index.spec.ts b/lib/workers/repository/extract/index.spec.ts index c748146cee26e121dc3957f003acefeaebaabcbb..b2e0b5848b67df7f6e91c13bad3fed5f4cc0cff2 100644 --- a/lib/workers/repository/extract/index.spec.ts +++ b/lib/workers/repository/extract/index.spec.ts @@ -1,4 +1,5 @@ -import { getConfig, mocked, partial, scm } from '../../../../test/util'; +import { mocked, partial, scm } from '../../../../test/util'; +import { getConfig } from '../../../config/defaults'; import type { RenovateConfig } from '../../../config/types'; import { logger } from '../../../logger'; import type { PackageFile } from '../../../modules/manager/types'; diff --git a/lib/workers/repository/index.spec.ts b/lib/workers/repository/index.spec.ts index 67f5578a2795e9a3ec7704abe74ab1fbd799807b..62068c172c584cef5043e81bc25bc851154645b6 100644 --- a/lib/workers/repository/index.spec.ts +++ b/lib/workers/repository/index.spec.ts @@ -1,6 +1,6 @@ import { mock } from 'jest-mock-extended'; - -import { RenovateConfig, getConfig, mocked } from '../../../test/util'; +import { RenovateConfig, mocked } from '../../../test/util'; +import { getConfig } from '../../config/defaults'; import { GlobalConfig } from '../../config/global'; import * as _process from './process'; import type { ExtractResult } from './process/extract-update'; diff --git a/lib/workers/repository/init/apis.spec.ts b/lib/workers/repository/init/apis.spec.ts index b87e59d4013abf02bcb81b44446106770b09de26..07df2ace20fc8553460f6708c4d139d30312dd17 100644 --- a/lib/workers/repository/init/apis.spec.ts +++ b/lib/workers/repository/init/apis.spec.ts @@ -1,4 +1,5 @@ -import { RenovateConfig, getConfig, platform } from '../../../../test/util'; +import { RenovateConfig, platform } from '../../../../test/util'; +import { getConfig } from '../../../config/defaults'; import { REPOSITORY_DISABLED, REPOSITORY_FORKED, diff --git a/lib/workers/repository/init/merge.spec.ts b/lib/workers/repository/init/merge.spec.ts index 595275293d4223ff4d9001dfbdcd2e5683b9400a..af798bf329a2bbff3d9e6f0d27406ca35aa70a40 100644 --- a/lib/workers/repository/init/merge.spec.ts +++ b/lib/workers/repository/init/merge.spec.ts @@ -1,13 +1,13 @@ import { RenovateConfig, fs, - getConfig, logger, mocked, partial, platform, scm, } from '../../../../test/util'; +import { getConfig } from '../../../config/defaults'; import * as _migrateAndValidate from '../../../config/migrate-validate'; import * as _migrate from '../../../config/migration'; import * as repoCache from '../../../util/cache/repository'; diff --git a/lib/workers/repository/init/vulnerability.spec.ts b/lib/workers/repository/init/vulnerability.spec.ts index 7b47d5ab7aa06a7251d01b931a9a9bc923ab21a4..3fd52b0116e2d3f5b41487400309b709d5ac027a 100644 --- a/lib/workers/repository/init/vulnerability.spec.ts +++ b/lib/workers/repository/init/vulnerability.spec.ts @@ -1,9 +1,5 @@ -import { - RenovateConfig, - getConfig, - partial, - platform, -} from '../../../../test/util'; +import { RenovateConfig, partial, platform } from '../../../../test/util'; +import { getConfig } from '../../../config/defaults'; import { NO_VULNERABILITY_ALERTS } from '../../../constants/error-messages'; import type { VulnerabilityAlert } from '../../../types'; import { detectVulnerabilityAlerts } from './vulnerability'; diff --git a/lib/workers/repository/onboarding/branch/create.spec.ts b/lib/workers/repository/onboarding/branch/create.spec.ts index ccd2b2dae75f59ed92c578951900b61af4a48857..af05137a06a8911b52c86ea759300bae786cf69b 100644 --- a/lib/workers/repository/onboarding/branch/create.spec.ts +++ b/lib/workers/repository/onboarding/branch/create.spec.ts @@ -1,4 +1,5 @@ -import { RenovateConfig, getConfig, scm } from '../../../../../test/util'; +import { RenovateConfig, scm } from '../../../../../test/util'; +import { getConfig } from '../../../../config/defaults'; import { createOnboardingBranch } from './create'; jest.mock('./config', () => ({ diff --git a/lib/workers/repository/onboarding/branch/index.spec.ts b/lib/workers/repository/onboarding/branch/index.spec.ts index ca37252be7d2feae169ae6d311eff71b0f2b30de..1c30ac8a2c8a6a9386cd77a2835f1968e2a1ebf6 100644 --- a/lib/workers/repository/onboarding/branch/index.spec.ts +++ b/lib/workers/repository/onboarding/branch/index.spec.ts @@ -2,13 +2,13 @@ import { mock } from 'jest-mock-extended'; import { RenovateConfig, fs, - getConfig, git, mocked, platform, scm, } from '../../../../../test/util'; import { configFileNames } from '../../../../config/app-strings'; +import { getConfig } from '../../../../config/defaults'; import { GlobalConfig } from '../../../../config/global'; import { REPOSITORY_FORKED, diff --git a/lib/workers/repository/onboarding/pr/base-branch.spec.ts b/lib/workers/repository/onboarding/pr/base-branch.spec.ts index 6ceed109586708905b620505478034e062b4ad1d..516884c129307161e2a816f024178c9fa41cdaad 100644 --- a/lib/workers/repository/onboarding/pr/base-branch.spec.ts +++ b/lib/workers/repository/onboarding/pr/base-branch.spec.ts @@ -1,5 +1,4 @@ import { RenovateConfig, partial } from '../../../../../test/util'; - import { getBaseBranchDesc } from './base-branch'; describe('workers/repository/onboarding/pr/base-branch', () => { diff --git a/lib/workers/repository/onboarding/pr/index.spec.ts b/lib/workers/repository/onboarding/pr/index.spec.ts index 0bc3ad94282deb4d2e1c0f56d7d192588242a8d3..b8647263459f26247dce42fd7a5ced911c03ba94 100644 --- a/lib/workers/repository/onboarding/pr/index.spec.ts +++ b/lib/workers/repository/onboarding/pr/index.spec.ts @@ -1,11 +1,11 @@ import type { RequestError, Response } from 'got'; import { RenovateConfig, - getConfig, partial, platform, scm, } from '../../../../../test/util'; +import { getConfig } from '../../../../config/defaults'; import { GlobalConfig } from '../../../../config/global'; import { logger } from '../../../../logger'; import type { PackageFile } from '../../../../modules/manager/types'; diff --git a/lib/workers/repository/process/fetch.spec.ts b/lib/workers/repository/process/fetch.spec.ts index 101d80ee1e96697df592a0588d3a5b193dc2d33e..5dbda356324fc2b84f7f39059a9a63f1bb085102 100644 --- a/lib/workers/repository/process/fetch.spec.ts +++ b/lib/workers/repository/process/fetch.spec.ts @@ -1,4 +1,5 @@ -import { RenovateConfig, getConfig, mocked } from '../../../../test/util'; +import { RenovateConfig, mocked } from '../../../../test/util'; +import { getConfig } from '../../../config/defaults'; import { MavenDatasource } from '../../../modules/datasource/maven'; import type { PackageFile } from '../../../modules/manager/types'; import { ExternalHostError } from '../../../types/errors/external-host-error'; diff --git a/lib/workers/repository/process/index.spec.ts b/lib/workers/repository/process/index.spec.ts index 21f8f9c0f4d3ecede1272021c0a4f231602e826c..0a7a53999f382e7ec005106fefe497ff7d36e909 100644 --- a/lib/workers/repository/process/index.spec.ts +++ b/lib/workers/repository/process/index.spec.ts @@ -1,12 +1,12 @@ import { RenovateConfig, - getConfig, git, logger, mocked, platform, scm, } from '../../../../test/util'; +import { getConfig } from '../../../config/defaults'; import { GlobalConfig } from '../../../config/global'; import { CONFIG_VALIDATION } from '../../../constants/error-messages'; import { addMeta } from '../../../logger'; diff --git a/lib/workers/repository/process/lookup/index.spec.ts b/lib/workers/repository/process/lookup/index.spec.ts index f960b5b59e70eda90b9756ebb114d2a82b7ed04d..6a3122b53838c5e5018a3a4ffec838bc88f950b5 100644 --- a/lib/workers/repository/process/lookup/index.spec.ts +++ b/lib/workers/repository/process/lookup/index.spec.ts @@ -1,7 +1,8 @@ import * as hostRules from '../../../../../lib/util/host-rules'; import { Fixtures } from '../../../../../test/fixtures'; import * as httpMock from '../../../../../test/http-mock'; -import { getConfig, partial } from '../../../../../test/util'; +import { partial } from '../../../../../test/util'; +import { getConfig } from '../../../../config/defaults'; import { CONFIG_VALIDATION } from '../../../../constants/error-messages'; import { DockerDatasource } from '../../../../modules/datasource/docker'; import { GitRefsDatasource } from '../../../../modules/datasource/git-refs'; diff --git a/lib/workers/repository/process/vulnerabilities.spec.ts b/lib/workers/repository/process/vulnerabilities.spec.ts index eb63590dea7a21dd518dcf96a898a337263a2ca6..fa370f831a693f02a1957fac3af8d6d35c7a085b 100644 --- a/lib/workers/repository/process/vulnerabilities.spec.ts +++ b/lib/workers/repository/process/vulnerabilities.spec.ts @@ -1,7 +1,8 @@ import type { Osv, OsvOffline } from '@renovatebot/osv-offline'; import { codeBlock } from 'common-tags'; import { mockFn } from 'jest-mock-extended'; -import { RenovateConfig, getConfig, logger } from '../../../../test/util'; +import { RenovateConfig, logger } from '../../../../test/util'; +import { getConfig } from '../../../config/defaults'; import type { PackageFile } from '../../../modules/manager/types'; import { Vulnerabilities } from './vulnerabilities'; diff --git a/lib/workers/repository/process/write.spec.ts b/lib/workers/repository/process/write.spec.ts index f06af54dcda5e33b2790b13aaf20708f0a935282..63ef3419bbef07f40b4f3006f9d351b34b344359 100644 --- a/lib/workers/repository/process/write.spec.ts +++ b/lib/workers/repository/process/write.spec.ts @@ -1,12 +1,12 @@ import is from '@sindresorhus/is'; import { RenovateConfig, - getConfig, logger, mocked, partial, scm, } from '../../../../test/util'; +import { getConfig } from '../../../config/defaults'; import { GlobalConfig } from '../../../config/global'; import { addMeta } from '../../../logger'; import { hashMap } from '../../../modules/manager'; diff --git a/lib/workers/repository/update/branch/auto-replace.spec.ts b/lib/workers/repository/update/branch/auto-replace.spec.ts index 069045985b8723b939cfe61276f814e29c5d6c1d..b455ceb3e0942c942c4b3b43ea54ac1069f89bef 100644 --- a/lib/workers/repository/update/branch/auto-replace.spec.ts +++ b/lib/workers/repository/update/branch/auto-replace.spec.ts @@ -1,6 +1,6 @@ import { codeBlock } from 'common-tags'; import { Fixtures } from '../../../../../test/fixtures'; -import { getConfig } from '../../../../../test/util'; +import { getConfig } from '../../../../config/defaults'; import { GlobalConfig } from '../../../../config/global'; import { WORKER_FILE_UPDATE_FAILED } from '../../../../constants/error-messages'; import { extractPackageFile } from '../../../../modules/manager/html'; diff --git a/lib/workers/repository/update/branch/index.spec.ts b/lib/workers/repository/update/branch/index.spec.ts index 7ec2535e19f3f6c09bc35c6308f0eb2405018135..fb98eda0326aa6ddca5fb966d2b19043833efa14 100644 --- a/lib/workers/repository/update/branch/index.spec.ts +++ b/lib/workers/repository/update/branch/index.spec.ts @@ -1,6 +1,5 @@ import { fs, - getConfig, git, mocked, mockedFunction, @@ -8,6 +7,7 @@ import { platform, scm, } from '../../../../../test/util'; +import { getConfig } from '../../../../config/defaults'; import { GlobalConfig } from '../../../../config/global'; import type { RepoGlobalConfig } from '../../../../config/types'; import { diff --git a/lib/workers/repository/updates/flatten.spec.ts b/lib/workers/repository/updates/flatten.spec.ts index b0c83caf13de27e74182b125fb639b9a2adb3f5d..68e14d4aaf1d7fb9e2cdd7b3e192ac01d06bed5f 100644 --- a/lib/workers/repository/updates/flatten.spec.ts +++ b/lib/workers/repository/updates/flatten.spec.ts @@ -1,5 +1,6 @@ import is from '@sindresorhus/is'; -import { RenovateConfig, getConfig } from '../../../../test/util'; +import type { RenovateConfig } from '../../../../test/util'; +import { getConfig } from '../../../config/defaults'; import { flattenUpdates } from './flatten'; jest.mock('../../../util/git/semantic'); diff --git a/lib/workers/repository/updates/generate.spec.ts b/lib/workers/repository/updates/generate.spec.ts index ca0b111abb5bd8bb89b10eb9578064769302cf8c..03d2a1e9e174aaceceebae342eda344021d0bcec 100644 --- a/lib/workers/repository/updates/generate.spec.ts +++ b/lib/workers/repository/updates/generate.spec.ts @@ -1,5 +1,5 @@ import { codeBlock } from 'common-tags'; -import { getConfig } from '../../../../test/util'; +import { getConfig } from '../../../config/defaults'; import type { UpdateType } from '../../../config/types'; import { NpmDatasource } from '../../../modules/datasource/npm'; import type { BranchUpgradeConfig } from '../../types'; diff --git a/test/util.ts b/test/util.ts index 560c9b243117dead843765724e46fa467c4347bd..9e140ef5d78202d8214171c102b9fb076e52cfe3 100644 --- a/test/util.ts +++ b/test/util.ts @@ -2,7 +2,6 @@ import crypto from 'node:crypto'; import { expect, jest } from '@jest/globals'; import type { Plugin } from 'pretty-format'; import upath from 'upath'; -import { getConfig } from '../lib/config/defaults'; import type { RenovateConfig } from '../lib/config/types'; import * as _logger from '../lib/logger'; import { Platform, platform as _platform } from '../lib/modules/platform'; @@ -54,8 +53,6 @@ export const logger = mocked(_logger); export type { RenovateConfig }; -export { getConfig }; - function getCallerFileName(): string | null { let result: string | null = null;