refactor: remove deprecated loadFixture calls (#16404)

Co-authored-by: Michael Kriese <michael.kriese@visualon.de>

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,15 +54,15 @@ function mockGenericPackage(opts: MockOpts = {}) {
       ? [
           {
             version: '1.0.3-SNAPSHOT',
-            meta: loadFixture(
+            meta: Fixtures.get(
               'metadata-snapshot-version.xml',
               upath.join('..', 'maven')
             ),
             jarStatus: 200,
           },
           {
             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

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/';
 

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'

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' },

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);
 

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;
 

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'),
   },
 ];
 

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;

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()', () => {

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(