From 6c9aad38a88f36986860b5dea4ee6dcd925f22b4 Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Sat, 26 Feb 2022 17:09:01 +0100 Subject: [PATCH] refactor: remove unnecessarily long paths in imports and mocks (#14429) --- lib/manager/buildkite/extract.spec.ts | 2 +- lib/manager/bundler/artifacts.spec.ts | 10 +++++----- lib/manager/composer/artifacts.spec.ts | 2 +- lib/manager/composer/utils.spec.ts | 2 +- lib/manager/npm/post-update/lerna.spec.ts | 2 +- lib/util/exec/buildpack.spec.ts | 2 +- lib/util/exec/index.spec.ts | 2 +- lib/util/fs/index.spec.ts | 2 +- lib/util/git/conflicts-cache.spec.ts | 4 ++-- lib/util/http/github.spec.ts | 6 +++--- lib/util/http/github.ts | 2 +- lib/workers/pr/changelog/github.spec.ts | 2 +- lib/workers/pr/changelog/gitlab.spec.ts | 2 +- lib/workers/repository/onboarding/branch/index.spec.ts | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/manager/buildkite/extract.spec.ts b/lib/manager/buildkite/extract.spec.ts index 21ba0818a6..17f831bd44 100644 --- a/lib/manager/buildkite/extract.spec.ts +++ b/lib/manager/buildkite/extract.spec.ts @@ -1,5 +1,5 @@ import { Fixtures } from '../../../test/fixtures'; -import type { PackageDependency } from '../../manager/types'; +import type { PackageDependency } from '../types'; import { extractPackageFile } from './extract'; describe('manager/buildkite/extract', () => { diff --git a/lib/manager/bundler/artifacts.spec.ts b/lib/manager/bundler/artifacts.spec.ts index 2205349b20..a4b6a59acd 100644 --- a/lib/manager/bundler/artifacts.spec.ts +++ b/lib/manager/bundler/artifacts.spec.ts @@ -19,11 +19,11 @@ const bundlerHostRules = mocked(_bundlerHostRules); jest.mock('fs-extra'); jest.mock('child_process'); -jest.mock('../../../lib/util/exec/env'); -jest.mock('../../../lib/datasource'); -jest.mock('../../../lib/util/fs'); -jest.mock('../../../lib/util/git'); -jest.mock('../../../lib/util/host-rules'); +jest.mock('../../util/exec/env'); +jest.mock('../../datasource'); +jest.mock('../../util/fs'); +jest.mock('../../util/git'); +jest.mock('../../util/host-rules'); jest.mock('./host-rules'); const adminConfig: RepoGlobalConfig = { diff --git a/lib/manager/composer/artifacts.spec.ts b/lib/manager/composer/artifacts.spec.ts index 8e6be19076..32acef212b 100644 --- a/lib/manager/composer/artifacts.spec.ts +++ b/lib/manager/composer/artifacts.spec.ts @@ -14,7 +14,7 @@ import * as composer from './artifacts'; jest.mock('child_process'); jest.mock('../../util/exec/env'); -jest.mock('../../../lib/datasource'); +jest.mock('../../datasource'); jest.mock('../../util/fs'); jest.mock('../../util/git'); diff --git a/lib/manager/composer/utils.spec.ts b/lib/manager/composer/utils.spec.ts index 47de19bd1a..6769e27de5 100644 --- a/lib/manager/composer/utils.spec.ts +++ b/lib/manager/composer/utils.spec.ts @@ -5,7 +5,7 @@ import { requireComposerDependencyInstallation, } from './utils'; -jest.mock('../../../lib/datasource'); +jest.mock('../../datasource'); describe('manager/composer/utils', () => { describe('extractContraints', () => { diff --git a/lib/manager/npm/post-update/lerna.spec.ts b/lib/manager/npm/post-update/lerna.spec.ts index d48fa30fd5..70b0f9fe1a 100644 --- a/lib/manager/npm/post-update/lerna.spec.ts +++ b/lib/manager/npm/post-update/lerna.spec.ts @@ -7,7 +7,7 @@ import * as _lernaHelper from './lerna'; jest.mock('child_process'); jest.mock('../../../util/exec/env'); -jest.mock('../../../manager/npm/post-update/node-version'); +jest.mock('../../npm/post-update/node-version'); const exec: jest.Mock<typeof _exec> = _exec as any; const env = mocked(_env); diff --git a/lib/util/exec/buildpack.spec.ts b/lib/util/exec/buildpack.spec.ts index 479b0cbed4..0c13818aeb 100644 --- a/lib/util/exec/buildpack.spec.ts +++ b/lib/util/exec/buildpack.spec.ts @@ -8,7 +8,7 @@ import { } from './buildpack'; import type { ToolConstraint } from './types'; -jest.mock('../../../lib/datasource'); +jest.mock('../../datasource'); const datasource = mocked(_datasource); diff --git a/lib/util/exec/index.spec.ts b/lib/util/exec/index.spec.ts index d7a2cb02dd..6c85a86279 100644 --- a/lib/util/exec/index.spec.ts +++ b/lib/util/exec/index.spec.ts @@ -13,7 +13,7 @@ import { exec } from '.'; const cpExec: jest.Mock<typeof _cpExec> = _cpExec as any; jest.mock('child_process'); -jest.mock('../../../lib/datasource'); +jest.mock('../../datasource'); interface TestInput { processEnv: Record<string, string>; diff --git a/lib/util/fs/index.spec.ts b/lib/util/fs/index.spec.ts index 517c8b839b..3c15ab39c4 100644 --- a/lib/util/fs/index.spec.ts +++ b/lib/util/fs/index.spec.ts @@ -18,7 +18,7 @@ import { writeLocalFile, } from '.'; -jest.mock('../../util/exec/env'); +jest.mock('../exec/env'); jest.mock('find-up'); const findUp = mockedFunction(_findUp); diff --git a/lib/util/git/conflicts-cache.spec.ts b/lib/util/git/conflicts-cache.spec.ts index a6c8de8b80..2ae180aece 100644 --- a/lib/util/git/conflicts-cache.spec.ts +++ b/lib/util/git/conflicts-cache.spec.ts @@ -1,12 +1,12 @@ import { mocked } from '../../../test/util'; -import * as _repositoryCache from '../../util/cache/repository'; +import * as _repositoryCache from '../cache/repository'; import type { Cache } from '../cache/repository/types'; import { getCachedConflictResult, setCachedConflictResult, } from './conflicts-cache'; -jest.mock('../../util/cache/repository'); +jest.mock('../cache/repository'); const repositoryCache = mocked(_repositoryCache); describe('util/git/conflicts-cache', () => { diff --git a/lib/util/http/github.spec.ts b/lib/util/http/github.spec.ts index a298cfcafc..5d83c56677 100644 --- a/lib/util/http/github.spec.ts +++ b/lib/util/http/github.spec.ts @@ -9,12 +9,12 @@ import { REPOSITORY_CHANGED, } from '../../constants/error-messages'; import { GithubReleasesDatasource } from '../../datasource/github-releases'; -import * as _repositoryCache from '../../util/cache/repository'; -import type { Cache } from '../../util/cache/repository/types'; +import * as _repositoryCache from '../cache/repository'; +import type { Cache } from '../cache/repository/types'; import * as hostRules from '../host-rules'; import { GithubHttp, setBaseUrl } from './github'; -jest.mock('../../util/cache/repository'); +jest.mock('../cache/repository'); const repositoryCache = mocked(_repositoryCache); const githubApiHost = 'https://api.github.com'; diff --git a/lib/util/http/github.ts b/lib/util/http/github.ts index 039763ba38..ebad865829 100644 --- a/lib/util/http/github.ts +++ b/lib/util/http/github.ts @@ -10,7 +10,7 @@ import { } from '../../constants/error-messages'; import { logger } from '../../logger'; import { ExternalHostError } from '../../types/errors/external-host-error'; -import { getCache } from '../../util/cache/repository'; +import { getCache } from '../cache/repository'; import { maskToken } from '../mask'; import { range } from '../range'; import { regEx } from '../regex'; diff --git a/lib/workers/pr/changelog/github.spec.ts b/lib/workers/pr/changelog/github.spec.ts index b4b3459434..e0292dfd60 100644 --- a/lib/workers/pr/changelog/github.spec.ts +++ b/lib/workers/pr/changelog/github.spec.ts @@ -5,7 +5,7 @@ import * as semverVersioning from '../../../versioning/semver'; import type { BranchUpgradeConfig } from '../../types'; import { ChangeLogError, getChangeLogJSON } from '.'; -jest.mock('../../../../lib/datasource/npm'); +jest.mock('../../../datasource/npm'); const upgrade: BranchUpgradeConfig = { branchName: undefined, diff --git a/lib/workers/pr/changelog/gitlab.spec.ts b/lib/workers/pr/changelog/gitlab.spec.ts index 6cc2398ff9..90dcd112c3 100644 --- a/lib/workers/pr/changelog/gitlab.spec.ts +++ b/lib/workers/pr/changelog/gitlab.spec.ts @@ -5,7 +5,7 @@ import * as semverVersioning from '../../../versioning/semver'; import type { BranchUpgradeConfig } from '../../types'; import { getChangeLogJSON } from '.'; -jest.mock('../../../../lib/datasource/npm'); +jest.mock('../../../datasource/npm'); const upgrade: BranchUpgradeConfig = { branchName: undefined, diff --git a/lib/workers/repository/onboarding/branch/index.spec.ts b/lib/workers/repository/onboarding/branch/index.spec.ts index caea529bb1..4e71973075 100644 --- a/lib/workers/repository/onboarding/branch/index.spec.ts +++ b/lib/workers/repository/onboarding/branch/index.spec.ts @@ -23,7 +23,7 @@ import { checkOnboardingBranch } from '.'; const rebase: any = _rebase; const configModule: any = _config; -jest.mock('../../../../workers/repository/onboarding/branch/rebase'); +jest.mock('../../../repository/onboarding/branch/rebase'); jest.mock('../../../../util/cache/repository'); jest.mock('../../../../util/fs'); jest.mock('../../../../util/git'); -- GitLab