From 3589d0e222bd2b188a2336df68e0aacbd22f81e1 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 3 Jul 2022 21:18:53 -0700 Subject: [PATCH] refactor: remove deprecated `loadFixture` calls (#16404) Co-authored-by: Michael Kriese --- lib/modules/datasource/clojure/index.spec.ts | 16 +++++----- lib/modules/datasource/dart/index.spec.ts | 4 +-- lib/modules/datasource/go/base.spec.ts | 25 ++++++++------- lib/modules/datasource/go/index.spec.ts | 11 ++++--- .../datasource/go/releases-goproxy.spec.ts | 4 +-- lib/modules/datasource/helm/common.spec.ts | 4 +-- lib/modules/datasource/nuget/index.spec.ts | 30 +++++++++--------- .../datasource/packagist/index.spec.ts | 10 +++--- .../manager/ansible-galaxy/extract.spec.ts | 14 ++++----- lib/modules/manager/bazel/update.spec.ts | 8 ++--- lib/modules/manager/bundler/extract.spec.ts | 31 ++++++++++--------- lib/modules/manager/bundler/gemfile.spec.ts | 4 +-- .../manager/bundler/locked-version.spec.ts | 12 +++---- .../manager/bundler/update-locked.spec.ts | 4 +-- lib/modules/manager/cargo/extract.spec.ts | 16 +++++----- lib/modules/manager/cocoapods/extract.spec.ts | 6 ++-- lib/modules/manager/composer/extract.spec.ts | 15 ++++----- .../manager/composer/update-locked.spec.ts | 4 +-- .../manager/docker-compose/extract.spec.ts | 10 +++--- lib/modules/manager/flux/extract.spec.ts | 18 +++++------ .../manager/gitlabci-include/extract.spec.ts | 8 ++--- .../manager/gradle-wrapper/extract.spec.ts | 16 +++++----- .../manager/helm-values/extract.spec.ts | 6 ++-- lib/modules/manager/helmsman/extract.spec.ts | 6 ++-- lib/modules/manager/homebrew/extract.spec.ts | 12 +++---- lib/modules/manager/homebrew/update.spec.ts | 6 ++-- lib/modules/manager/html/extract.spec.ts | 6 ++-- lib/modules/manager/jenkins/extract.spec.ts | 12 +++---- lib/modules/manager/npm/extract/index.spec.ts | 14 ++++----- lib/modules/manager/npm/extract/npm.spec.ts | 7 +++-- lib/modules/manager/npm/extract/yarn.spec.ts | 9 +++--- .../common/parent-version.spec.ts | 4 +-- .../package-lock/dep-constraints.spec.ts | 6 ++-- .../package-lock/get-locked.spec.ts | 6 ++-- .../yarn-lock/get-locked.spec.ts | 6 ++-- .../locked-dependency/yarn-lock/index.spec.ts | 7 +++-- .../yarn-lock/replace.spec.ts | 8 ++--- .../update/pr/changelog/release-notes.spec.ts | 15 ++++----- test/util.ts | 31 ------------------- 39 files changed, 204 insertions(+), 227 deletions(-) diff --git a/lib/modules/datasource/clojure/index.spec.ts b/lib/modules/datasource/clojure/index.spec.ts index 5fbaf52f888ae9..24fd6b26df6a4c 100644 --- a/lib/modules/datasource/clojure/index.spec.ts +++ b/lib/modules/datasource/clojure/index.spec.ts @@ -1,7 +1,7 @@ import upath from 'upath'; import { ReleaseResult, getPkgReleases } from '..'; +import { Fixtures } from '../../../../test/fixtures'; import * as httpMock from '../../../../test/http-mock'; -import { loadFixture } from '../../../../test/util'; import * as hostRules from '../../../util/host-rules'; import { id as versioning } from '../../versioning/maven'; import { ClojureDatasource } from '.'; @@ -33,11 +33,11 @@ function mockGenericPackage(opts: MockOpts = {}) { } = opts; const meta = opts.meta === undefined - ? loadFixture('metadata.xml', upath.join('..', 'maven')) + ? Fixtures.get('metadata.xml', upath.join('..', 'maven')) : opts.meta; const pom = opts.pom === undefined - ? loadFixture('pom.xml', upath.join('..', 'maven')) + ? Fixtures.get('pom.xml', upath.join('..', 'maven')) : opts.pom; const jars = opts.jars === undefined @@ -54,7 +54,7 @@ function mockGenericPackage(opts: MockOpts = {}) { ? [ { version: '1.0.3-SNAPSHOT', - meta: loadFixture( + meta: Fixtures.get( 'metadata-snapshot-version.xml', upath.join('..', 'maven') ), @@ -62,7 +62,7 @@ function mockGenericPackage(opts: MockOpts = {}) { }, { version: '1.0.4-SNAPSHOT', - meta: loadFixture( + meta: Fixtures.get( 'metadata-snapshot-version-invalid.xml', upath.join('..', 'maven') ), @@ -178,7 +178,7 @@ describe('modules/datasource/clojure/index', () => { mockGenericPackage(); mockGenericPackage({ base: baseUrlCustom, - meta: loadFixture('metadata-extra.xml', upath.join('..', 'maven')), + meta: Fixtures.get('metadata-extra.xml', upath.join('..', 'maven')), latest: '3.0.0', jars: { '3.0.0': 200 }, snapshots: [], @@ -250,7 +250,7 @@ describe('modules/datasource/clojure/index', () => { .get('/org/example/package/maven-metadata.xml') .reply( 200, - loadFixture('metadata-invalid.xml', upath.join('..', 'maven')) + Fixtures.get('metadata-invalid.xml', upath.join('..', 'maven')) ); const res = await get( @@ -298,7 +298,7 @@ describe('modules/datasource/clojure/index', () => { }); it('supports scm.url values prefixed with "scm:"', async () => { - const pom = loadFixture('pom.scm-prefix.xml', upath.join('..', 'maven')); + const pom = Fixtures.get('pom.scm-prefix.xml', upath.join('..', 'maven')); mockGenericPackage({ pom }); httpMock diff --git a/lib/modules/datasource/dart/index.spec.ts b/lib/modules/datasource/dart/index.spec.ts index 2d433c747623bd..7fc817f9c82294 100644 --- a/lib/modules/datasource/dart/index.spec.ts +++ b/lib/modules/datasource/dart/index.spec.ts @@ -1,9 +1,9 @@ import { getPkgReleases } from '..'; +import { Fixtures } from '../../../../test/fixtures'; import * as httpMock from '../../../../test/http-mock'; -import { loadJsonFixture } from '../../../../test/util'; import { DartDatasource } from '.'; -const body = loadJsonFixture('shared_preferences.json'); +const body = Fixtures.getJson('shared_preferences.json'); const baseUrl = 'https://pub.dartlang.org/api/packages/'; diff --git a/lib/modules/datasource/go/base.spec.ts b/lib/modules/datasource/go/base.spec.ts index 00a35b03db2225..317fd4542744cc 100644 --- a/lib/modules/datasource/go/base.spec.ts +++ b/lib/modules/datasource/go/base.spec.ts @@ -1,5 +1,6 @@ +import { Fixtures } from '../../../../test/fixtures'; import * as httpMock from '../../../../test/http-mock'; -import { loadFixture, mocked } from '../../../../test/util'; +import { mocked } from '../../../../test/util'; import * as _hostRules from '../../../util/host-rules'; import { GithubTagsDatasource } from '../github-tags'; import { GitlabTagsDatasource } from '../gitlab-tags'; @@ -65,7 +66,7 @@ describe('modules/datasource/go/base', () => { }); it('returns null for go-import prefix mismatch', async () => { - const mismatchResponse = loadFixture('go-get-github-ee.html').replace( + const mismatchResponse = Fixtures.get('go-get-github-ee.html').replace( 'git.enterprise.com/example/module', 'git.enterprise.com/badexample/badmodule' ); @@ -85,7 +86,7 @@ describe('modules/datasource/go/base', () => { httpMock .scope('https://golang.org') .get('/x/text?go-get=1') - .reply(200, loadFixture('go-get-github.html')); + .reply(200, Fixtures.get('go-get-github.html')); const res = await BaseGoDatasource.getDatasource('golang.org/x/text'); @@ -100,7 +101,7 @@ describe('modules/datasource/go/base', () => { httpMock .scope('https://git.enterprise.com') .get('/example/module?go-get=1') - .reply(200, loadFixture('go-get-github-ee.html')); + .reply(200, Fixtures.get('go-get-github-ee.html')); const res = await BaseGoDatasource.getDatasource( 'git.enterprise.com/example/module' @@ -117,7 +118,7 @@ describe('modules/datasource/go/base', () => { httpMock .scope('https://gitlab.com') .get('/group/subgroup?go-get=1') - .reply(200, loadFixture('go-get-gitlab.html')); + .reply(200, Fixtures.get('go-get-gitlab.html')); const res = await BaseGoDatasource.getDatasource( 'gitlab.com/group/subgroup' @@ -134,7 +135,7 @@ describe('modules/datasource/go/base', () => { httpMock .scope('https://gitlab.com') .get('/group/subgroup/private.git/v3?go-get=1') - .reply(200, loadFixture('go-get-gitlab.html')); + .reply(200, Fixtures.get('go-get-gitlab.html')); const res = await BaseGoDatasource.getDatasource( 'gitlab.com/group/subgroup/private.git/v3' @@ -148,7 +149,7 @@ describe('modules/datasource/go/base', () => { }); it('supports GitLab with URL mismatch', async () => { - const mismatchingResponse = loadFixture('go-get-github.html').replace( + const mismatchingResponse = Fixtures.get('go-get-github.html').replace( 'https://github.com/golang/text/', 'https://gitlab.com/golang/text/' ); @@ -170,7 +171,7 @@ describe('modules/datasource/go/base', () => { httpMock .scope('https://gitlab.com') .get('/group/subgroup/v2?go-get=1') - .reply(200, loadFixture('go-get-gitlab.html')); + .reply(200, Fixtures.get('go-get-gitlab.html')); const res = await BaseGoDatasource.getDatasource( 'gitlab.com/group/subgroup/v2' @@ -188,7 +189,7 @@ describe('modules/datasource/go/base', () => { httpMock .scope('https://my.custom.domain') .get('/golang/myrepo?go-get=1') - .reply(200, loadFixture('go-get-gitlab-ee.html')); + .reply(200, Fixtures.get('go-get-gitlab-ee.html')); const res = await BaseGoDatasource.getDatasource( 'my.custom.domain/golang/myrepo' @@ -206,7 +207,7 @@ describe('modules/datasource/go/base', () => { httpMock .scope('https://my.custom.domain') .get('/golang/subgroup/myrepo?go-get=1') - .reply(200, loadFixture('go-get-gitlab-ee-subgroup.html')); + .reply(200, Fixtures.get('go-get-gitlab-ee-subgroup.html')); const res = await BaseGoDatasource.getDatasource( 'my.custom.domain/golang/subgroup/myrepo' @@ -224,7 +225,7 @@ describe('modules/datasource/go/base', () => { httpMock .scope('https://my.custom.domain') .get('/golang/subgroup/myrepo/v2?go-get=1') - .reply(200, loadFixture('go-get-gitlab-ee-subgroup.html')); + .reply(200, Fixtures.get('go-get-gitlab-ee-subgroup.html')); const res = await BaseGoDatasource.getDatasource( 'my.custom.domain/golang/subgroup/myrepo/v2' @@ -242,7 +243,7 @@ describe('modules/datasource/go/base', () => { httpMock .scope('https://my.custom.domain') .get('/golang/subgroup/myrepo/monorepo?go-get=1') - .reply(200, loadFixture('go-get-gitlab-ee-subgroup.html')); + .reply(200, Fixtures.get('go-get-gitlab-ee-subgroup.html')); const res = await BaseGoDatasource.getDatasource( 'my.custom.domain/golang/subgroup/myrepo/monorepo' diff --git a/lib/modules/datasource/go/index.spec.ts b/lib/modules/datasource/go/index.spec.ts index 6ce14c1b1306dc..229bbb32f9dfff 100644 --- a/lib/modules/datasource/go/index.spec.ts +++ b/lib/modules/datasource/go/index.spec.ts @@ -1,5 +1,6 @@ +import { Fixtures } from '../../../../test/fixtures'; import * as httpMock from '../../../../test/http-mock'; -import { loadFixture, mocked } from '../../../../test/util'; +import { mocked } from '../../../../test/util'; import * as _hostRules from '../../../util/host-rules'; import { GoDatasource } from '.'; @@ -107,7 +108,7 @@ describe('modules/datasource/go/index', () => { httpMock .scope('https://golang.org/') .get('/y/text?go-get=1') - .reply(200, loadFixture('go-get-github.html')); + .reply(200, Fixtures.get('go-get-github.html')); const res = await datasource.getDigest( { packageName: 'golang.org/y/text' }, null @@ -119,7 +120,7 @@ describe('modules/datasource/go/index', () => { httpMock .scope('https://gitlab.com/') .get('/group/subgroup?go-get=1') - .reply(200, loadFixture('go-get-gitlab.html')); + .reply(200, Fixtures.get('go-get-gitlab.html')); getDigestGitlabMock.mockResolvedValue('abcdefabcdefabcdefabcdef'); const res = await datasource.getDigest( { packageName: 'gitlab.com/group/subgroup' }, @@ -133,7 +134,7 @@ describe('modules/datasource/go/index', () => { httpMock .scope('https://gitlab.com/') .get('/group/subgroup?go-get=1') - .reply(200, loadFixture('go-get-gitlab.html')); + .reply(200, Fixtures.get('go-get-gitlab.html')); getDigestGitlabMock.mockResolvedValue('abcdefabcdefabcdefabcdef'); const res = await datasource.getDigest( { packageName: 'gitlab.com/group/subgroup' }, @@ -146,7 +147,7 @@ describe('modules/datasource/go/index', () => { httpMock .scope('https://golang.org/') .get('/x/text?go-get=1') - .reply(200, loadFixture('go-get-github.html')); + .reply(200, Fixtures.get('go-get-github.html')); getDigestGithubMock.mockResolvedValueOnce('abcdefabcdefabcdefabcdef'); const res = await datasource.getDigest( { packageName: 'golang.org/x/text' }, diff --git a/lib/modules/datasource/go/releases-goproxy.spec.ts b/lib/modules/datasource/go/releases-goproxy.spec.ts index 7afdf286a85688..05b73286584765 100644 --- a/lib/modules/datasource/go/releases-goproxy.spec.ts +++ b/lib/modules/datasource/go/releases-goproxy.spec.ts @@ -1,5 +1,5 @@ +import { Fixtures } from '../../../../test/fixtures'; import * as httpMock from '../../../../test/http-mock'; -import { loadFixture } from '../../../../test/util'; import { GithubReleasesDatasource } from '../github-releases'; import { GithubTagsDatasource } from '../github-tags'; import { GoProxyDatasource } from './releases-goproxy'; @@ -31,7 +31,7 @@ describe('modules/datasource/go/releases-goproxy', () => { httpMock .scope(baseUrl) .get('/github.com/go-kit/kit/@v/list') - .reply(200, loadFixture('go-kit.list.txt')); + .reply(200, Fixtures.get('go-kit.list.txt')); const versions = await datasource.listVersions(baseUrl, packageName); diff --git a/lib/modules/datasource/helm/common.spec.ts b/lib/modules/datasource/helm/common.spec.ts index 48d4d0906d23a6..295dab31e574f7 100644 --- a/lib/modules/datasource/helm/common.spec.ts +++ b/lib/modules/datasource/helm/common.spec.ts @@ -1,10 +1,10 @@ import { load } from 'js-yaml'; -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { findSourceUrl } from './common'; import type { HelmRepository } from './types'; // Truncated index.yaml file -const repo = load(loadFixture('sample.yaml'), { +const repo = load(Fixtures.get('sample.yaml'), { json: true, }) as HelmRepository; diff --git a/lib/modules/datasource/nuget/index.spec.ts b/lib/modules/datasource/nuget/index.spec.ts index 203cb298392b38..bdc2c914a72734 100644 --- a/lib/modules/datasource/nuget/index.spec.ts +++ b/lib/modules/datasource/nuget/index.spec.ts @@ -1,6 +1,6 @@ import { getPkgReleases } from '..'; +import { Fixtures } from '../../../../test/fixtures'; import * as httpMock from '../../../../test/http-mock'; -import { loadFixture } from '../../../../test/util'; import * as _hostRules from '../../../util/host-rules'; import { id as versioning } from '../../versioning/nuget'; import { parseRegistryUrl } from './common'; @@ -12,43 +12,43 @@ const hostRules: any = _hostRules; jest.mock('../../../util/host-rules'); -const pkgInfoV3FromNuget = loadFixture('nunit/v3_nuget_org.xml'); -const pkgListV3Registration = loadFixture('nunit/v3_registration.json'); +const pkgInfoV3FromNuget = Fixtures.get('nunit/v3_nuget_org.xml'); +const pkgListV3Registration = Fixtures.get('nunit/v3_registration.json'); -const pkgListV2 = loadFixture('nunit/v2.xml'); -const pkgListV2NoGitHubProjectUrl = loadFixture( +const pkgListV2 = Fixtures.get('nunit/v2.xml'); +const pkgListV2NoGitHubProjectUrl = Fixtures.get( 'nunit/v2_noGitHubProjectUrl.xml' ); -const pkgListV2NoRelease = loadFixture('nunit/v2_no_release.xml'); -const pkgListV2WithoutProjectUrl = loadFixture( +const pkgListV2NoRelease = Fixtures.get('nunit/v2_no_release.xml'); +const pkgListV2WithoutProjectUrl = Fixtures.get( 'nunit/v2_withoutProjectUrl.xml' ); -const pkgListV2Page1of2 = loadFixture('nunit/v2_paginated_1.xml'); -const pkgListV2Page2of2 = loadFixture('nunit/v2_paginated_2.xml'); +const pkgListV2Page1of2 = Fixtures.get('nunit/v2_paginated_1.xml'); +const pkgListV2Page2of2 = Fixtures.get('nunit/v2_paginated_2.xml'); -const nugetIndexV3 = loadFixture('v3_index.json'); +const nugetIndexV3 = Fixtures.get('v3_index.json'); const nlogMocks = [ { url: '/v3/registration5-gz-semver2/nlog/index.json', - result: loadFixture('nlog/v3_registration.json'), + result: Fixtures.get('nlog/v3_registration.json'), }, { url: '/v3/registration5-gz-semver2/nlog/page/1.0.0.505/4.4.0-beta5.json', - result: loadFixture('nlog/v3_catalog_1.json'), + result: Fixtures.get('nlog/v3_catalog_1.json'), }, { url: '/v3/registration5-gz-semver2/nlog/page/4.4.0-beta6/4.6.0-rc2.json', - result: loadFixture('nlog/v3_catalog_2.json'), + result: Fixtures.get('nlog/v3_catalog_2.json'), }, { url: '/v3/registration5-gz-semver2/nlog/page/4.6.0-rc3/5.0.0-beta11.json', - result: loadFixture('nlog/v3_catalog_3.json'), + result: Fixtures.get('nlog/v3_catalog_3.json'), }, { url: '/v3-flatcontainer/nlog/4.7.3/nlog.nuspec', - result: loadFixture('nlog/nuspec.xml'), + result: Fixtures.get('nlog/nuspec.xml'), }, ]; diff --git a/lib/modules/datasource/packagist/index.spec.ts b/lib/modules/datasource/packagist/index.spec.ts index 2a1d34ef8de336..a0c7b09fc9f92b 100644 --- a/lib/modules/datasource/packagist/index.spec.ts +++ b/lib/modules/datasource/packagist/index.spec.ts @@ -1,6 +1,6 @@ import { getPkgReleases } from '..'; +import { Fixtures } from '../../../../test/fixtures'; import * as httpMock from '../../../../test/http-mock'; -import { loadJsonFixture } from '../../../../test/util'; import type { HostRule } from '../../../types'; import * as _hostRules from '../../../util/host-rules'; import * as composerVersioning from '../../versioning/composer'; @@ -11,10 +11,10 @@ jest.mock('../../../util/host-rules'); const hostRules = _hostRules; -const includesJson: any = loadJsonFixture('includes.json'); -const beytJson: any = loadJsonFixture('1beyt.json'); -const mailchimpJson: any = loadJsonFixture('mailchimp-api.json'); -const mailchimpDevJson: any = loadJsonFixture('mailchimp-api~dev.json'); +const includesJson = Fixtures.getJson('includes.json'); +const beytJson = Fixtures.getJson('1beyt.json'); +const mailchimpJson = Fixtures.getJson('mailchimp-api.json'); +const mailchimpDevJson = Fixtures.getJson('mailchimp-api~dev.json'); const baseUrl = 'https://packagist.org'; const datasource = PackagistDatasource.id; diff --git a/lib/modules/manager/ansible-galaxy/extract.spec.ts b/lib/modules/manager/ansible-galaxy/extract.spec.ts index 0aa97824f98c68..5c2dbb36274d7e 100644 --- a/lib/modules/manager/ansible-galaxy/extract.spec.ts +++ b/lib/modules/manager/ansible-galaxy/extract.spec.ts @@ -1,13 +1,13 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { getSliceEndNumber } from './extract'; import { extractPackageFile } from './'; -const yamlFile1 = loadFixture('requirements01.yml'); -const yamlFile2 = loadFixture('requirements02.yml'); -const helmRequirements = loadFixture('helmRequirements.yml'); -const collections1 = loadFixture('collections1.yml'); -const collections2 = loadFixture('collections2.yml'); -const galaxy = loadFixture('galaxy.yml'); +const yamlFile1 = Fixtures.get('requirements01.yml'); +const yamlFile2 = Fixtures.get('requirements02.yml'); +const helmRequirements = Fixtures.get('helmRequirements.yml'); +const collections1 = Fixtures.get('collections1.yml'); +const collections2 = Fixtures.get('collections2.yml'); +const galaxy = Fixtures.get('galaxy.yml'); describe('modules/manager/ansible-galaxy/extract', () => { describe('extractPackageFile()', () => { diff --git a/lib/modules/manager/bazel/update.spec.ts b/lib/modules/manager/bazel/update.spec.ts index 97156d79f9d4ed..98401844262b70 100644 --- a/lib/modules/manager/bazel/update.spec.ts +++ b/lib/modules/manager/bazel/update.spec.ts @@ -1,12 +1,12 @@ import { Readable } from 'stream'; +import { Fixtures } from '../../../../test/fixtures'; import * as httpMock from '../../../../test/http-mock'; -import { loadFixture } from '../../../../test/util'; import type { UpdateType } from '../../../config/types'; import { updateDependency } from '.'; -const content = loadFixture('WORKSPACE1'); -const contentContainerPull = loadFixture('container_pull'); -const fileWithBzlExtension = loadFixture('repositories.bzl'); +const content = Fixtures.get('WORKSPACE1'); +const contentContainerPull = Fixtures.get('container_pull'); +const fileWithBzlExtension = Fixtures.get('repositories.bzl'); /* git_repository( diff --git a/lib/modules/manager/bundler/extract.spec.ts b/lib/modules/manager/bundler/extract.spec.ts index 88a592a890c171..c0a054675e4a7e 100644 --- a/lib/modules/manager/bundler/extract.spec.ts +++ b/lib/modules/manager/bundler/extract.spec.ts @@ -1,28 +1,29 @@ import is from '@sindresorhus/is'; -import { fs, loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; +import { fs } from '../../../../test/util'; import { isValid } from '../../versioning/ruby'; import { extractPackageFile } from '.'; jest.mock('../../../util/fs'); -const railsGemfile = loadFixture('Gemfile.rails'); -const railsGemfileLock = loadFixture('Gemfile.rails.lock'); +const railsGemfile = Fixtures.get('Gemfile.rails'); +const railsGemfileLock = Fixtures.get('Gemfile.rails.lock'); -const sourceGroupGemfile = loadFixture('Gemfile.sourceGroup'); -const webPackerGemfile = loadFixture('Gemfile.webpacker'); -const webPackerGemfileLock = loadFixture('Gemfile.webpacker.lock'); -const mastodonGemfile = loadFixture('Gemfile.mastodon'); -const mastodonGemfileLock = loadFixture('Gemfile.mastodon.lock'); -const rubyCIGemfileLock = loadFixture('Gemfile.rubyci.lock'); +const sourceGroupGemfile = Fixtures.get('Gemfile.sourceGroup'); +const webPackerGemfile = Fixtures.get('Gemfile.webpacker'); +const webPackerGemfileLock = Fixtures.get('Gemfile.webpacker.lock'); +const mastodonGemfile = Fixtures.get('Gemfile.mastodon'); +const mastodonGemfileLock = Fixtures.get('Gemfile.mastodon.lock'); +const rubyCIGemfileLock = Fixtures.get('Gemfile.rubyci.lock'); -const rubyCIGemfile = loadFixture('Gemfile.rubyci'); -const gitlabFossGemfileLock = loadFixture('Gemfile.gitlab-foss.lock'); -const gitlabFossGemfile = loadFixture('Gemfile.gitlab-foss'); -const sourceBlockGemfile = loadFixture('Gemfile.sourceBlock'); -const sourceBlockWithNewLinesGemfileLock = loadFixture( +const rubyCIGemfile = Fixtures.get('Gemfile.rubyci'); +const gitlabFossGemfileLock = Fixtures.get('Gemfile.gitlab-foss.lock'); +const gitlabFossGemfile = Fixtures.get('Gemfile.gitlab-foss'); +const sourceBlockGemfile = Fixtures.get('Gemfile.sourceBlock'); +const sourceBlockWithNewLinesGemfileLock = Fixtures.get( 'Gemfile.sourceBlockWithNewLines.lock' ); -const sourceBlockWithNewLinesGemfile = loadFixture( +const sourceBlockWithNewLinesGemfile = Fixtures.get( 'Gemfile.sourceBlockWithNewLines' ); diff --git a/lib/modules/manager/bundler/gemfile.spec.ts b/lib/modules/manager/bundler/gemfile.spec.ts index c5c05912cbebe9..5cd5a15e822b8b 100644 --- a/lib/modules/manager/bundler/gemfile.spec.ts +++ b/lib/modules/manager/bundler/gemfile.spec.ts @@ -1,7 +1,7 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { extractLockFileEntries } from './locked-version'; -const gemLockFile = loadFixture('Gemfile.rails.lock'); +const gemLockFile = Fixtures.get('Gemfile.rails.lock'); describe('modules/manager/bundler/gemfile', () => { it('matches the expected output', () => { diff --git a/lib/modules/manager/bundler/locked-version.spec.ts b/lib/modules/manager/bundler/locked-version.spec.ts index 3843a3a150595e..e1d345bf98b6b6 100644 --- a/lib/modules/manager/bundler/locked-version.spec.ts +++ b/lib/modules/manager/bundler/locked-version.spec.ts @@ -1,11 +1,11 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { extractLockFileEntries } from './locked-version'; -const railsGemfileLock = loadFixture('Gemfile.rails.lock'); -const webPackerGemfileLock = loadFixture('Gemfile.webpacker.lock'); -const mastodonGemfileLock = loadFixture('Gemfile.mastodon.lock'); -const rubyCIGemfileLock = loadFixture('Gemfile.rubyci.lock'); -const gitlabFossGemfileLock = loadFixture('Gemfile.gitlab-foss.lock'); +const railsGemfileLock = Fixtures.get('Gemfile.rails.lock'); +const webPackerGemfileLock = Fixtures.get('Gemfile.webpacker.lock'); +const mastodonGemfileLock = Fixtures.get('Gemfile.mastodon.lock'); +const rubyCIGemfileLock = Fixtures.get('Gemfile.rubyci.lock'); +const gitlabFossGemfileLock = Fixtures.get('Gemfile.gitlab-foss.lock'); describe('modules/manager/bundler/locked-version', () => { test('Parse Rails Gem Lock File', () => { diff --git a/lib/modules/manager/bundler/update-locked.spec.ts b/lib/modules/manager/bundler/update-locked.spec.ts index 61bd70fff6f0c3..ab9d8510c8f485 100644 --- a/lib/modules/manager/bundler/update-locked.spec.ts +++ b/lib/modules/manager/bundler/update-locked.spec.ts @@ -1,8 +1,8 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import type { UpdateLockedConfig } from '../types'; import { updateLockedDependency } from '.'; -const lockFileContent = loadFixture('Gemfile.rubyci.lock'); +const lockFileContent = Fixtures.get('Gemfile.rubyci.lock'); describe('modules/manager/bundler/update-locked', () => { it('detects already updated', () => { diff --git a/lib/modules/manager/cargo/extract.spec.ts b/lib/modules/manager/cargo/extract.spec.ts index fdbdcc083c0edc..38cdf69cdc86cf 100644 --- a/lib/modules/manager/cargo/extract.spec.ts +++ b/lib/modules/manager/cargo/extract.spec.ts @@ -1,19 +1,19 @@ import { DirectoryResult, dir } from 'tmp-promise'; import { join } from 'upath'; -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { GlobalConfig } from '../../../config/global'; import type { RepoGlobalConfig } from '../../../config/types'; import { writeLocalFile } from '../../../util/fs'; import type { ExtractConfig } from '../types'; import { extractPackageFile } from '.'; -const cargo1toml = loadFixture('Cargo.1.toml'); -const cargo2toml = loadFixture('Cargo.2.toml'); -const cargo3toml = loadFixture('Cargo.3.toml'); -const cargo4toml = loadFixture('Cargo.4.toml'); -const cargo5toml = loadFixture('Cargo.5.toml'); -const cargo6configtoml = loadFixture('cargo.6.config.toml'); -const cargo6toml = loadFixture('Cargo.6.toml'); +const cargo1toml = Fixtures.get('Cargo.1.toml'); +const cargo2toml = Fixtures.get('Cargo.2.toml'); +const cargo3toml = Fixtures.get('Cargo.3.toml'); +const cargo4toml = Fixtures.get('Cargo.4.toml'); +const cargo5toml = Fixtures.get('Cargo.5.toml'); +const cargo6configtoml = Fixtures.get('cargo.6.config.toml'); +const cargo6toml = Fixtures.get('Cargo.6.toml'); describe('modules/manager/cargo/extract', () => { describe('extractPackageFile()', () => { diff --git a/lib/modules/manager/cocoapods/extract.spec.ts b/lib/modules/manager/cocoapods/extract.spec.ts index 9388fa2131d03c..ff7b06b5c2f553 100644 --- a/lib/modules/manager/cocoapods/extract.spec.ts +++ b/lib/modules/manager/cocoapods/extract.spec.ts @@ -1,10 +1,10 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { GlobalConfig } from '../../../config/global'; import type { RepoGlobalConfig } from '../../../config/types'; import { extractPackageFile } from '.'; -const simplePodfile = loadFixture('Podfile.simple'); -const complexPodfile = loadFixture('Podfile.complex'); +const simplePodfile = Fixtures.get('Podfile.simple'); +const complexPodfile = Fixtures.get('Podfile.complex'); const adminConfig: RepoGlobalConfig = { localDir: '' }; diff --git a/lib/modules/manager/composer/extract.spec.ts b/lib/modules/manager/composer/extract.spec.ts index aeb191389ee029..5e50e06ec4b8d7 100644 --- a/lib/modules/manager/composer/extract.spec.ts +++ b/lib/modules/manager/composer/extract.spec.ts @@ -1,14 +1,15 @@ -import { fs, loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; +import { fs } from '../../../../test/util'; import { extractPackageFile } from '.'; jest.mock('../../../util/fs'); -const requirements1 = loadFixture('composer1.json'); -const requirements2 = loadFixture('composer2.json'); -const requirements3 = loadFixture('composer3.json'); -const requirements4 = loadFixture('composer4.json'); -const requirements5 = loadFixture('composer5.json'); -const requirements5Lock = loadFixture('composer5.lock'); +const requirements1 = Fixtures.get('composer1.json'); +const requirements2 = Fixtures.get('composer2.json'); +const requirements3 = Fixtures.get('composer3.json'); +const requirements4 = Fixtures.get('composer4.json'); +const requirements5 = Fixtures.get('composer5.json'); +const requirements5Lock = Fixtures.get('composer5.lock'); describe('modules/manager/composer/extract', () => { describe('extractPackageFile()', () => { diff --git a/lib/modules/manager/composer/update-locked.spec.ts b/lib/modules/manager/composer/update-locked.spec.ts index 62cd056ec2833d..83b911441bcde4 100644 --- a/lib/modules/manager/composer/update-locked.spec.ts +++ b/lib/modules/manager/composer/update-locked.spec.ts @@ -1,10 +1,10 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import type { UpdateLockedConfig } from '../types'; import { updateLockedDependency } from '.'; const lockFile = 'compose.lock'; -const lockFileContent = loadFixture('composer5.lock'); +const lockFileContent = Fixtures.get('composer5.lock'); describe('modules/manager/composer/update-locked', () => { it('detects already updated', () => { diff --git a/lib/modules/manager/docker-compose/extract.spec.ts b/lib/modules/manager/docker-compose/extract.spec.ts index 00113e5ae7170a..c942391031c920 100644 --- a/lib/modules/manager/docker-compose/extract.spec.ts +++ b/lib/modules/manager/docker-compose/extract.spec.ts @@ -1,10 +1,10 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { extractPackageFile } from '.'; -const yamlFile1 = loadFixture('docker-compose.1.yml'); -const yamlFile3 = loadFixture('docker-compose.3.yml'); -const yamlFile3NoVersion = loadFixture('docker-compose.3-no-version.yml'); -const yamlFile3DefaultValue = loadFixture('docker-compose.3-default-val.yml'); +const yamlFile1 = Fixtures.get('docker-compose.1.yml'); +const yamlFile3 = Fixtures.get('docker-compose.3.yml'); +const yamlFile3NoVersion = Fixtures.get('docker-compose.3-no-version.yml'); +const yamlFile3DefaultValue = Fixtures.get('docker-compose.3-default-val.yml'); describe('modules/manager/docker-compose/extract', () => { describe('extractPackageFile()', () => { diff --git a/lib/modules/manager/flux/extract.spec.ts b/lib/modules/manager/flux/extract.spec.ts index adcc6b451c3f2d..331bd4c3ea23e2 100644 --- a/lib/modules/manager/flux/extract.spec.ts +++ b/lib/modules/manager/flux/extract.spec.ts @@ -1,4 +1,4 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { GlobalConfig } from '../../../config/global'; import type { RepoGlobalConfig } from '../../../config/types'; import type { ExtractConfig } from '../types'; @@ -15,7 +15,7 @@ describe('modules/manager/flux/extract', () => { describe('extractPackageFile()', () => { it('extracts multiple resources', () => { const result = extractPackageFile( - loadFixture('multidoc.yaml'), + Fixtures.get('multidoc.yaml'), 'multidoc.yaml' ); expect(result).toEqual({ @@ -32,7 +32,7 @@ describe('modules/manager/flux/extract', () => { it('extracts version and components from system manifests', () => { const result = extractPackageFile( - loadFixture('system.yaml'), + Fixtures.get('system.yaml'), 'clusters/my-cluster/flux-system/gotk-components.yaml' ); expect(result).toEqual({ @@ -68,7 +68,7 @@ describe('modules/manager/flux/extract', () => { it('extracts releases without repositories', () => { const result = extractPackageFile( - loadFixture('release.yaml'), + Fixtures.get('release.yaml'), 'release.yaml' ); expect(result?.deps[0].skipReason).toBe('unknown-registry'); @@ -86,7 +86,7 @@ describe('modules/manager/flux/extract', () => { it('ignores HelmRepository resources without metadata', () => { const result = extractPackageFile( - `${loadFixture('release.yaml')} + `${Fixtures.get('release.yaml')} --- apiVersion: source.toolkit.fluxcd.io/v1beta1 kind: HelmRepository @@ -143,7 +143,7 @@ spec: it('does not match HelmRelease resources without a sourceRef', () => { const result = extractPackageFile( - `${loadFixture('source.yaml')} + `${Fixtures.get('source.yaml')} --- apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease @@ -162,7 +162,7 @@ spec: it('does not match HelmRelease resources without a namespace', () => { const result = extractPackageFile( - `${loadFixture('source.yaml')} + `${Fixtures.get('source.yaml')} --- apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease @@ -182,7 +182,7 @@ spec: it('ignores HelmRepository resources without a namespace', () => { const result = extractPackageFile( - `${loadFixture('release.yaml')} + `${Fixtures.get('release.yaml')} --- apiVersion: source.toolkit.fluxcd.io/v1beta1 kind: HelmRepository @@ -196,7 +196,7 @@ metadata: it('ignores HelmRepository resources without a URL', () => { const result = extractPackageFile( - `${loadFixture('release.yaml')} + `${Fixtures.get('release.yaml')} --- apiVersion: source.toolkit.fluxcd.io/v1beta1 kind: HelmRepository diff --git a/lib/modules/manager/gitlabci-include/extract.spec.ts b/lib/modules/manager/gitlabci-include/extract.spec.ts index 4cd1c60567b200..1cf0dd2fdac771 100644 --- a/lib/modules/manager/gitlabci-include/extract.spec.ts +++ b/lib/modules/manager/gitlabci-include/extract.spec.ts @@ -1,10 +1,10 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { GlobalConfig } from '../../../config/global'; import { extractPackageFile } from '.'; -const yamlFileMultiConfig = loadFixture('gitlab-ci.1.yaml'); -const yamlFileSingleConfig = loadFixture('gitlab-ci.2.yaml'); -const yamlWithEmptyIncludeConfig = loadFixture('gitlab-ci.3.yaml'); +const yamlFileMultiConfig = Fixtures.get('gitlab-ci.1.yaml'); +const yamlFileSingleConfig = Fixtures.get('gitlab-ci.2.yaml'); +const yamlWithEmptyIncludeConfig = Fixtures.get('gitlab-ci.3.yaml'); describe('modules/manager/gitlabci-include/extract', () => { describe('extractPackageFile()', () => { diff --git a/lib/modules/manager/gradle-wrapper/extract.spec.ts b/lib/modules/manager/gradle-wrapper/extract.spec.ts index 6d642f77dc3612..7746bc170a7581 100644 --- a/lib/modules/manager/gradle-wrapper/extract.spec.ts +++ b/lib/modules/manager/gradle-wrapper/extract.spec.ts @@ -1,21 +1,21 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { extractPackageFile } from '.'; -const typeBinFileContent = loadFixture('gradle-wrapper-bin.properties'); -const typeAllFileContent = loadFixture('gradle-wrapper-all.properties'); -const prereleaseVersionFileContent = loadFixture( +const typeBinFileContent = Fixtures.get('gradle-wrapper-bin.properties'); +const typeAllFileContent = Fixtures.get('gradle-wrapper-all.properties'); +const prereleaseVersionFileContent = Fixtures.get( 'gradle-wrapper-prerelease.properties' ); -const unknownFormatFileContent = loadFixture( +const unknownFormatFileContent = Fixtures.get( 'gradle-wrapper-unknown-format.properties' ); -const whitespacePropertiesFile = loadFixture( +const whitespacePropertiesFile = Fixtures.get( 'gradle-wrapper-whitespace.properties' ); -const customTypeBinFileContent = loadFixture( +const customTypeBinFileContent = Fixtures.get( 'custom-gradle-wrapper-bin.properties' ); -const customTypeAllFileContent = loadFixture( +const customTypeAllFileContent = Fixtures.get( 'custom-gradle-wrapper-all.properties' ); diff --git a/lib/modules/manager/helm-values/extract.spec.ts b/lib/modules/manager/helm-values/extract.spec.ts index 9ba7962e3bb05b..933954c235c9f4 100644 --- a/lib/modules/manager/helm-values/extract.spec.ts +++ b/lib/modules/manager/helm-values/extract.spec.ts @@ -1,11 +1,11 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { extractPackageFile } from '.'; -const helmDefaultChartInitValues = loadFixture( +const helmDefaultChartInitValues = Fixtures.get( 'default_chart_init_values.yaml' ); -const helmMultiAndNestedImageValues = loadFixture( +const helmMultiAndNestedImageValues = Fixtures.get( 'multi_and_nested_image_values.yaml' ); diff --git a/lib/modules/manager/helmsman/extract.spec.ts b/lib/modules/manager/helmsman/extract.spec.ts index b291909823df18..6350530ce5046c 100644 --- a/lib/modules/manager/helmsman/extract.spec.ts +++ b/lib/modules/manager/helmsman/extract.spec.ts @@ -1,8 +1,8 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { extractPackageFile } from '.'; -const multiDepFile = loadFixture('validHelmsfile.yaml'); -const otherYamlFile = loadFixture('empty.yaml'); +const multiDepFile = Fixtures.get('validHelmsfile.yaml'); +const otherYamlFile = Fixtures.get('empty.yaml'); describe('modules/manager/helmsman/extract', () => { describe('extractPackageFile()', () => { diff --git a/lib/modules/manager/homebrew/extract.spec.ts b/lib/modules/manager/homebrew/extract.spec.ts index b2ed7d15672884..6ef01fa7578390 100644 --- a/lib/modules/manager/homebrew/extract.spec.ts +++ b/lib/modules/manager/homebrew/extract.spec.ts @@ -1,11 +1,11 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { extractPackageFile } from '.'; -const aalib = loadFixture('aalib.rb'); -const aap = loadFixture('aap.rb'); -const acmetool = loadFixture('acmetool.rb'); -const aide = loadFixture('aide.rb'); -const ibazel = loadFixture('ibazel.rb'); +const aalib = Fixtures.get('aalib.rb'); +const aap = Fixtures.get('aap.rb'); +const acmetool = Fixtures.get('acmetool.rb'); +const aide = Fixtures.get('aide.rb'); +const ibazel = Fixtures.get('ibazel.rb'); describe('modules/manager/homebrew/extract', () => { describe('extractPackageFile()', () => { diff --git a/lib/modules/manager/homebrew/update.spec.ts b/lib/modules/manager/homebrew/update.spec.ts index 55ca50f1def746..ae8087907b0cb5 100644 --- a/lib/modules/manager/homebrew/update.spec.ts +++ b/lib/modules/manager/homebrew/update.spec.ts @@ -1,10 +1,10 @@ import { Readable } from 'stream'; +import { Fixtures } from '../../../../test/fixtures'; import * as httpMock from '../../../../test/http-mock'; -import { loadFixture } from '../../../../test/util'; import { updateDependency } from '.'; -const aide = loadFixture('aide.rb'); -const ibazel = loadFixture('ibazel.rb'); +const aide = Fixtures.get('aide.rb'); +const ibazel = Fixtures.get('ibazel.rb'); const baseUrl = 'https://github.com'; diff --git a/lib/modules/manager/html/extract.spec.ts b/lib/modules/manager/html/extract.spec.ts index 30694e7e2ea01e..6abf45bb0a6408 100644 --- a/lib/modules/manager/html/extract.spec.ts +++ b/lib/modules/manager/html/extract.spec.ts @@ -1,8 +1,8 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { extractPackageFile } from '.'; -const sample = loadFixture(`sample.html`); -const nothing = loadFixture(`nothing.html`); +const sample = Fixtures.get(`sample.html`); +const nothing = Fixtures.get(`nothing.html`); describe('modules/manager/html/extract', () => { it('extractPackageFile', () => { diff --git a/lib/modules/manager/jenkins/extract.spec.ts b/lib/modules/manager/jenkins/extract.spec.ts index 165bc1b101e61f..740c5f1de18238 100644 --- a/lib/modules/manager/jenkins/extract.spec.ts +++ b/lib/modules/manager/jenkins/extract.spec.ts @@ -1,13 +1,13 @@ -import { loadFixture } from '../../../../test/util'; +import { Fixtures } from '../../../../test/fixtures'; import { extractPackageFile } from '.'; -const invalidYamlFile = loadFixture('invalid.yaml'); +const invalidYamlFile = Fixtures.get('invalid.yaml'); -const pluginsTextFile = loadFixture('plugins.txt'); -const pluginsYamlFile = loadFixture('plugins.yaml'); +const pluginsTextFile = Fixtures.get('plugins.txt'); +const pluginsYamlFile = Fixtures.get('plugins.yaml'); -const pluginsEmptyTextFile = loadFixture('empty.txt'); -const pluginsEmptyYamlFile = loadFixture('empty.yaml'); +const pluginsEmptyTextFile = Fixtures.get('empty.txt'); +const pluginsEmptyYamlFile = Fixtures.get('empty.yaml'); describe('modules/manager/jenkins/extract', () => { describe('extractPackageFile()', () => { diff --git a/lib/modules/manager/npm/extract/index.spec.ts b/lib/modules/manager/npm/extract/index.spec.ts index 06343c0a005a5f..98ff5aac49b88d 100644 --- a/lib/modules/manager/npm/extract/index.spec.ts +++ b/lib/modules/manager/npm/extract/index.spec.ts @@ -1,4 +1,4 @@ -import { loadFixture } from '../../../../../test/util'; +import { Fixtures } from '../../../../../test/fixtures'; import { getConfig } from '../../../../config/defaults'; import * as _fs from '../../../../util/fs'; import * as npmExtract from '.'; @@ -8,15 +8,15 @@ const fs: any = _fs; // TODO: fix types const defaultConfig = getConfig(); -const input01Content = loadFixture('inputs/01.json', '..'); -const input01GlobContent = loadFixture('inputs/01-glob.json', '..'); -const workspacesContent = loadFixture('inputs/workspaces.json', '..'); -const workspacesSimpleContent = loadFixture( +const input01Content = Fixtures.get('inputs/01.json', '..'); +const input01GlobContent = Fixtures.get('inputs/01-glob.json', '..'); +const workspacesContent = Fixtures.get('inputs/workspaces.json', '..'); +const workspacesSimpleContent = Fixtures.get( 'inputs/workspaces-simple.json', '..' ); -const vendorisedContent = loadFixture('is-object.json', '..'); -const invalidNameContent = loadFixture('invalid-name.json', '..'); +const vendorisedContent = Fixtures.get('is-object.json', '..'); +const invalidNameContent = Fixtures.get('invalid-name.json', '..'); describe('modules/manager/npm/extract/index', () => { describe('.extractPackageFile()', () => { diff --git a/lib/modules/manager/npm/extract/npm.spec.ts b/lib/modules/manager/npm/extract/npm.spec.ts index 3ccb36abacdd6c..321b56501dd0d7 100644 --- a/lib/modules/manager/npm/extract/npm.spec.ts +++ b/lib/modules/manager/npm/extract/npm.spec.ts @@ -1,4 +1,5 @@ -import { fs, loadFixture } from '../../../../../test/util'; +import { Fixtures } from '../../../../../test/fixtures'; +import { fs } from '../../../../../test/util'; import { getNpmLock } from './npm'; jest.mock('../../../../util/fs'); @@ -12,7 +13,7 @@ describe('modules/manager/npm/extract/npm', () => { }); it('extracts', async () => { - const plocktest1Lock = loadFixture('plocktest1/package-lock.json', '..'); + const plocktest1Lock = Fixtures.get('plocktest1/package-lock.json', '..'); fs.readLocalFile.mockResolvedValueOnce(plocktest1Lock as never); const res = await getNpmLock('package.json'); expect(res).toMatchSnapshot(); @@ -20,7 +21,7 @@ describe('modules/manager/npm/extract/npm', () => { }); it('extracts npm 7 lockfile', async () => { - const npm7Lock = loadFixture('npm7/package-lock.json', '..'); + const npm7Lock = Fixtures.get('npm7/package-lock.json', '..'); fs.readLocalFile.mockResolvedValueOnce(npm7Lock as never); const res = await getNpmLock('package.json'); expect(res).toMatchSnapshot(); diff --git a/lib/modules/manager/npm/extract/yarn.spec.ts b/lib/modules/manager/npm/extract/yarn.spec.ts index 62622d5f42ff68..e1e9acdf31a81c 100644 --- a/lib/modules/manager/npm/extract/yarn.spec.ts +++ b/lib/modules/manager/npm/extract/yarn.spec.ts @@ -1,4 +1,5 @@ -import { fs, loadFixture } from '../../../../../test/util'; +import { Fixtures } from '../../../../../test/fixtures'; +import { fs } from '../../../../../test/util'; import { getYarnLock } from './yarn'; jest.mock('../../../../util/fs'); @@ -13,7 +14,7 @@ describe('modules/manager/npm/extract/yarn', () => { }); it('extracts yarn 1', async () => { - const plocktest1Lock = loadFixture('plocktest1/yarn.lock', '..'); + const plocktest1Lock = Fixtures.get('plocktest1/yarn.lock', '..'); fs.readLocalFile.mockResolvedValueOnce(plocktest1Lock); const res = await getYarnLock('package.json'); expect(res.isYarn1).toBeTrue(); @@ -23,7 +24,7 @@ describe('modules/manager/npm/extract/yarn', () => { }); it('extracts yarn 2', async () => { - const plocktest1Lock = loadFixture('yarn2/yarn.lock', '..'); + const plocktest1Lock = Fixtures.get('yarn2/yarn.lock', '..'); fs.readLocalFile.mockResolvedValueOnce(plocktest1Lock); const res = await getYarnLock('package.json'); expect(res.isYarn1).toBeFalse(); @@ -33,7 +34,7 @@ describe('modules/manager/npm/extract/yarn', () => { }); it('extracts yarn 2 cache version', async () => { - const plocktest1Lock = loadFixture('yarn2.2/yarn.lock', '..'); + const plocktest1Lock = Fixtures.get('yarn2.2/yarn.lock', '..'); fs.readLocalFile.mockResolvedValueOnce(plocktest1Lock); const res = await getYarnLock('package.json'); expect(res.isYarn1).toBeFalse(); diff --git a/lib/modules/manager/npm/update/locked-dependency/common/parent-version.spec.ts b/lib/modules/manager/npm/update/locked-dependency/common/parent-version.spec.ts index fd86adde5d6bae..c745a89f12185b 100644 --- a/lib/modules/manager/npm/update/locked-dependency/common/parent-version.spec.ts +++ b/lib/modules/manager/npm/update/locked-dependency/common/parent-version.spec.ts @@ -1,8 +1,8 @@ +import { Fixtures } from '../../../../../../../test/fixtures'; import * as httpMock from '../../../../../../../test/http-mock'; -import { loadJsonFixture } from '../../../../../../../test/util'; import { findFirstParentVersion } from './parent-version'; -const expressJson = loadJsonFixture('express.json'); +const expressJson = Fixtures.getJson('express.json'); describe('modules/manager/npm/update/locked-dependency/common/parent-version', () => { describe('getLockedDependencies()', () => { diff --git a/lib/modules/manager/npm/update/locked-dependency/package-lock/dep-constraints.spec.ts b/lib/modules/manager/npm/update/locked-dependency/package-lock/dep-constraints.spec.ts index 71af186f404dff..8fa74090f2648e 100644 --- a/lib/modules/manager/npm/update/locked-dependency/package-lock/dep-constraints.spec.ts +++ b/lib/modules/manager/npm/update/locked-dependency/package-lock/dep-constraints.spec.ts @@ -1,10 +1,10 @@ -import { loadJsonFixture } from '../../../../../../../test/util'; +import { Fixtures } from '../../../../../../../test/fixtures'; import { findDepConstraints } from './dep-constraints'; jest.mock('../../../../../../util/fs'); -const packageJson = loadJsonFixture('package.json'); -const packageLockJson = loadJsonFixture('package-lock.json'); +const packageJson = Fixtures.getJson('package.json'); +const packageLockJson = Fixtures.getJson('package-lock.json'); describe('modules/manager/npm/update/locked-dependency/package-lock/dep-constraints', () => { describe('findDepConstraints()', () => { diff --git a/lib/modules/manager/npm/update/locked-dependency/package-lock/get-locked.spec.ts b/lib/modules/manager/npm/update/locked-dependency/package-lock/get-locked.spec.ts index 22a7665d9a8330..e9b68dabad74b8 100644 --- a/lib/modules/manager/npm/update/locked-dependency/package-lock/get-locked.spec.ts +++ b/lib/modules/manager/npm/update/locked-dependency/package-lock/get-locked.spec.ts @@ -1,10 +1,10 @@ -import { loadJsonFixture } from '../../../../../../../test/util'; +import { Fixtures } from '../../../../../../../test/fixtures'; import { getLockedDependencies } from './get-locked'; jest.mock('../../../../../../util/fs'); -const packageLockJson = loadJsonFixture('package-lock.json'); -const bundledPackageLockJson = loadJsonFixture('bundled.package-lock.json'); +const packageLockJson = Fixtures.getJson('package-lock.json'); +const bundledPackageLockJson = Fixtures.getJson('bundled.package-lock.json'); describe('modules/manager/npm/update/locked-dependency/package-lock/get-locked', () => { describe('getLockedDependencies()', () => { diff --git a/lib/modules/manager/npm/update/locked-dependency/yarn-lock/get-locked.spec.ts b/lib/modules/manager/npm/update/locked-dependency/yarn-lock/get-locked.spec.ts index 61b7b87a47b17e..9a68efb23fe925 100644 --- a/lib/modules/manager/npm/update/locked-dependency/yarn-lock/get-locked.spec.ts +++ b/lib/modules/manager/npm/update/locked-dependency/yarn-lock/get-locked.spec.ts @@ -1,9 +1,9 @@ import { parseSyml } from '@yarnpkg/parsers'; -import { loadFixture } from '../../../../../../../test/util'; +import { Fixtures } from '../../../../../../../test/fixtures'; import { getLockedDependencies } from './get-locked'; -const yarnLock1 = parseSyml(loadFixture('express.yarn.lock')); -const yarnLock3 = parseSyml(loadFixture('3.yarn.lock')); +const yarnLock1 = parseSyml(Fixtures.get('express.yarn.lock')); +const yarnLock3 = parseSyml(Fixtures.get('3.yarn.lock')); describe('modules/manager/npm/update/locked-dependency/yarn-lock/get-locked', () => { describe('replaceConstraintVersion()', () => { diff --git a/lib/modules/manager/npm/update/locked-dependency/yarn-lock/index.spec.ts b/lib/modules/manager/npm/update/locked-dependency/yarn-lock/index.spec.ts index 7c9b9b431f4a36..94a998162216d7 100644 --- a/lib/modules/manager/npm/update/locked-dependency/yarn-lock/index.spec.ts +++ b/lib/modules/manager/npm/update/locked-dependency/yarn-lock/index.spec.ts @@ -1,9 +1,10 @@ -import { loadFixture, partial } from '../../../../../../../test/util'; +import { Fixtures } from '../../../../../../../test/fixtures'; +import { partial } from '../../../../../../../test/util'; import type { UpdateLockedConfig } from '../../../../types'; import { updateLockedDependency } from '.'; -const yarnLock1 = loadFixture('express.yarn.lock'); -const yarn2Lock = loadFixture('yarn2.lock'); +const yarnLock1 = Fixtures.get('express.yarn.lock'); +const yarn2Lock = Fixtures.get('yarn2.lock'); describe('modules/manager/npm/update/locked-dependency/yarn-lock/index', () => { describe('updateLockedDependency()', () => { diff --git a/lib/modules/manager/npm/update/locked-dependency/yarn-lock/replace.spec.ts b/lib/modules/manager/npm/update/locked-dependency/yarn-lock/replace.spec.ts index a7036f042fcd59..8fc99aeb53a6f5 100644 --- a/lib/modules/manager/npm/update/locked-dependency/yarn-lock/replace.spec.ts +++ b/lib/modules/manager/npm/update/locked-dependency/yarn-lock/replace.spec.ts @@ -1,10 +1,10 @@ import * as Diff from 'diff'; -import { loadFixture } from '../../../../../../../test/util'; +import { Fixtures } from '../../../../../../../test/fixtures'; import { replaceConstraintVersion } from './replace'; -const yarnLock1 = loadFixture('express.yarn.lock'); -const yarnLock2 = loadFixture('2.yarn.lock'); -const yarn2Lock = loadFixture('yarn2.lock'); +const yarnLock1 = Fixtures.get('express.yarn.lock'); +const yarnLock2 = Fixtures.get('2.yarn.lock'); +const yarn2Lock = Fixtures.get('yarn2.lock'); describe('modules/manager/npm/update/locked-dependency/yarn-lock/replace', () => { describe('replaceConstraintVersion()', () => { diff --git a/lib/workers/repository/update/pr/changelog/release-notes.spec.ts b/lib/workers/repository/update/pr/changelog/release-notes.spec.ts index 661f58796fbcbf..1e64033a602d6e 100644 --- a/lib/workers/repository/update/pr/changelog/release-notes.spec.ts +++ b/lib/workers/repository/update/pr/changelog/release-notes.spec.ts @@ -1,6 +1,7 @@ import { DateTime } from 'luxon'; +import { Fixtures } from '../../../../../../test/fixtures'; import * as httpMock from '../../../../../../test/http-mock'; -import { loadFixture, mocked } from '../../../../../../test/util'; +import { mocked } from '../../../../../../test/util'; import { CacheableGithubReleases } from '../../../../../modules/datasource/github-releases/cache'; import { clone } from '../../../../../util/clone'; import * as _hostRules from '../../../../../util/host-rules'; @@ -24,12 +25,12 @@ jest.mock('../../../../../util/host-rules'); const hostRules = mocked(_hostRules); -const angularJsChangelogMd = loadFixture('angular-js.md', '..'); -const jestChangelogMd = loadFixture('jest.md', '..'); -const jsYamlChangelogMd = loadFixture('js-yaml.md', '..'); -const yargsChangelogMd = loadFixture('yargs.md', '..'); -const adapterutilsChangelogMd = loadFixture('adapter-utils.md', '..'); -const gitterWebappChangelogMd = loadFixture('gitter-webapp.md', '..'); +const angularJsChangelogMd = Fixtures.get('angular-js.md', '..'); +const jestChangelogMd = Fixtures.get('jest.md', '..'); +const jsYamlChangelogMd = Fixtures.get('js-yaml.md', '..'); +const yargsChangelogMd = Fixtures.get('yargs.md', '..'); +const adapterutilsChangelogMd = Fixtures.get('adapter-utils.md', '..'); +const gitterWebappChangelogMd = Fixtures.get('gitter-webapp.md', '..'); const githubTreeResponse = { tree: [ diff --git a/test/util.ts b/test/util.ts index c6c7dd261b5601..b08e208ee05892 100644 --- a/test/util.ts +++ b/test/util.ts @@ -1,5 +1,4 @@ import crypto from 'crypto'; -import { readFileSync } from 'fs'; import { expect } from '@jest/globals'; import upath from 'upath'; import { getConfig } from '../lib/config/defaults'; @@ -89,36 +88,6 @@ export function getFixturePath(fixtureFile: string, fixtureRoot = '.'): string { return upath.join(callerDir, fixtureRoot, '__fixtures__', fixtureFile); } -/** - * @deprecated use Fixtures.getBinary - */ -export function loadBinaryFixture( - fixtureFile: string, - fixtureRoot = '.' -): Buffer { - const fixtureAbsFile = getFixturePath(fixtureFile, fixtureRoot); - return readFileSync(fixtureAbsFile); -} - -/** - * @deprecated use Fixtures.get - */ -export function loadFixture(fixtureFile: string, fixtureRoot = '.'): string { - const fixtureAbsFile = getFixturePath(fixtureFile, fixtureRoot); - return readFileSync(fixtureAbsFile, { encoding: 'utf8' }); -} - -/** - * @deprecated use Fixtures.getJson - */ -export function loadJsonFixture( - fixtureFile: string, - fixtureRoot = '.' -): T { - const rawFixture = loadFixture(fixtureFile, fixtureRoot); - return JSON.parse(rawFixture) as T; -} - /** * Can be used to search and replace strings in jest snapshots. * @example