diff --git a/test/config/config/_fixtures/argv.js b/test/config/config/_fixtures/argv.ts
similarity index 73%
rename from test/config/config/_fixtures/argv.js
rename to test/config/config/_fixtures/argv.ts
index 09f5cec265634159e58ea106faef66fa88979b5e..612756be9f7796b6b11686d80bb7aa1cc77148ba 100644
--- a/test/config/config/_fixtures/argv.js
+++ b/test/config/config/_fixtures/argv.ts
@@ -1,4 +1,4 @@
-module.exports = () => [
+export default () => [
'/usr/local/bin/node',
'/Users/me/github/renovate/renovate',
];
diff --git a/test/config/config/_fixtures/file-with-repo-presets.js b/test/config/config/_fixtures/file-with-repo-presets.js
deleted file mode 100644
index 1121a499f0bdd259919087f383845a55d1047b71..0000000000000000000000000000000000000000
--- a/test/config/config/_fixtures/file-with-repo-presets.js
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = {
- logLevel: 'error',
- extends: [':prHourlyLimit1', ':automergePatch'],
- automerge: true,
- separateMinorPatch: true,
- repositories: [
- 'bar/baz',
- {
- repository: 'foo/bar',
- automerge: false,
- },
- {
- repository: 'renovatebot/renovate',
- extends: [':pinVersions']
- },
- {
- repository: 'rennovateapp/github-app-cli',
- extends: [':prHourlyLimit2']
- }
- ],
-};
diff --git a/test/config/config/_fixtures/file.js b/test/config/config/_fixtures/file.js
index c0d636dd5549016a6222f8b6781f33a4220cc070..61600196f14b7dadadcb0e14d6a24997d2034873 100644
--- a/test/config/config/_fixtures/file.js
+++ b/test/config/config/_fixtures/file.js
@@ -1,3 +1,4 @@
+// @ts-ignore
module.exports = {
token: 'abcdefg',
logLevel: 'error'
diff --git a/test/config/config/_fixtures/file2.js b/test/config/config/_fixtures/file2.js
index b8b35e670de78050b35a331f64671fe22e4f8c9d..1bc01da7697ab4eb0669577c60b6354ee70b9ae3 100644
--- a/test/config/config/_fixtures/file2.js
+++ b/test/config/config/_fixtures/file2.js
@@ -1,3 +1,4 @@
+// @ts-ignore
module.exports = {
upgradeInRange: true
};
diff --git a/test/config/config/_fixtures/index.js b/test/config/config/_fixtures/index.js
deleted file mode 100644
index dfe43cb8a13473f103017868d28e1a21746763e5..0000000000000000000000000000000000000000
--- a/test/config/config/_fixtures/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const defaultConfig = require('../../../../lib/config/defaults').getConfig();
-
-module.exports = {
- ...defaultConfig,
-};
diff --git a/test/config/file.spec.ts b/test/config/file.spec.ts
index ddb54b17beaf98e15b7dd2c1f993e44454641fb3..b274362c39d5b87c4372fc49c42a285f6f684b4f 100644
--- a/test/config/file.spec.ts
+++ b/test/config/file.spec.ts
@@ -23,7 +23,7 @@ describe('config/file', () => {
expect(res.rangeStrategy).toEqual('bump');
});
it('informs user when error in parsing config.js', () => {
- const configFile = path.resolve(__dirname, './config/_fixtures/file3.js');
+ const configFile = path.resolve(__dirname, './config/_fixtures/file3.ts');
const fileContent = `module.exports = {
"platform": "github",
"token":"abcdef",
@@ -44,7 +44,7 @@ describe('config/file', () => {
});
});
it('handles when invalid file location is provided', () => {
- const configFile = path.resolve(__dirname, './config/_fixtures/file4.js');
+ const configFile = path.resolve(__dirname, './config/_fixtures/file4.ts');
expect(file.getConfig({ RENOVATE_CONFIG_FILE: configFile })).toStrictEqual(
{}
);
diff --git a/test/config/index.spec.ts b/test/config/index.spec.ts
index 5208f38ef754f6e3eb42a00e6bd34c8c9d826b67..32feedb3f384773cb7877d0577578e72c6001171 100644
--- a/test/config/index.spec.ts
+++ b/test/config/index.spec.ts
@@ -1,4 +1,4 @@
-import argv from './config/_fixtures/argv';
+import getArgv from './config/_fixtures/argv';
import { getConfig } from '../../lib/config/defaults';
import * as _npm from '../../lib/datasource/npm';
import presetDefaults from './npm/_fixtures/renovate-config-default.json';
@@ -27,7 +27,7 @@ describe('config/index', () => {
beforeEach(() => {
jest.resetModules();
configParser = require('../../lib/config/index');
- defaultArgv = argv();
+ defaultArgv = getArgv();
jest.mock('delay');
require('delay').mockImplementation(() => Promise.resolve());
});
diff --git a/test/config/migrate-validate.spec.ts b/test/config/migrate-validate.spec.ts
index 40e6ba1416e49a003da313ea9f79626c479fecd1..e813a1c868af968e4843e09f84162ba511b7ca4c 100644
--- a/test/config/migrate-validate.spec.ts
+++ b/test/config/migrate-validate.spec.ts
@@ -1,10 +1,10 @@
import { migrateAndValidate } from '../../lib/config/migrate-validate';
-import { RenovateConfig } from '../../lib/config';
+import { getConfig, RenovateConfig } from '../util';
let config: RenovateConfig;
beforeEach(() => {
jest.resetAllMocks();
- config = { ...require('./config/_fixtures') };
+ config = getConfig();
});
describe('config/migrate-validate', () => {
diff --git a/test/platform/bitbucket-server/_fixtures/responses.js b/test/platform/bitbucket-server/_fixtures/responses.ts
similarity index 99%
rename from test/platform/bitbucket-server/_fixtures/responses.js
rename to test/platform/bitbucket-server/_fixtures/responses.ts
index 3396ad075c0a7617c6e21a16c31c6144d554e9d4..1c631c2b191f801a880b096d127091ea530f4bd9 100644
--- a/test/platform/bitbucket-server/_fixtures/responses.js
+++ b/test/platform/bitbucket-server/_fixtures/responses.ts
@@ -1,6 +1,4 @@
-const { URL } = require('url');
-
-function generateRepo(endpoint, projectKey, repositorySlug) {
+function generateRepo(endpoint: string, projectKey: string, repositorySlug: string) {
let projectKeyLower = projectKey.toLowerCase();
return {
slug: repositorySlug,
@@ -578,7 +576,7 @@ function generateServerResponses(endpoint) {
};
}
-module.exports = {
+export default {
'endpoint with no path': generateServerResponses(
'https://stash.renovatebot.com'
),
diff --git a/test/platform/bitbucket/_fixtures/responses.js b/test/platform/bitbucket/_fixtures/responses.ts
similarity index 99%
rename from test/platform/bitbucket/_fixtures/responses.js
rename to test/platform/bitbucket/_fixtures/responses.ts
index 045997aad67e214df45255024cf8d3418daa3c60..f097eba6fecf905b2785f84757363261d6ec40c5 100644
--- a/test/platform/bitbucket/_fixtures/responses.js
+++ b/test/platform/bitbucket/_fixtures/responses.ts
@@ -1,4 +1,4 @@
-const pr = id => ({
+const pr = (id: number) => ({
id,
source: { branch: { name: 'branch' } },
destination: { branch: { name: 'master' } },
@@ -32,7 +32,7 @@ function notFound() {
throw err;
}
-module.exports = {
+export default {
'/2.0/user': {
username: 'nobody',
},
diff --git a/test/workers/repository/process/fetch.spec.ts b/test/workers/repository/process/fetch.spec.ts
index b4803c03e2707f4136894ed01b91d801ba842393..255b3ea72cc3447a7bae5f5a4f2b574e97df08dc 100644
--- a/test/workers/repository/process/fetch.spec.ts
+++ b/test/workers/repository/process/fetch.spec.ts
@@ -1,7 +1,7 @@
import { fetchUpdates } from '../../../../lib/workers/repository/process/fetch';
import * as _npm from '../../../../lib/manager/npm';
import * as lookup from '../../../../lib/workers/repository/process/lookup';
-import { mocked } from '../../../util';
+import { getConfig, mocked, RenovateConfig } from '../../../util';
import { ManagerApi } from '../../../../lib/manager/common';
import { DATASOURCE_NPM } from '../../../../lib/constants/data-binary-source';
@@ -12,10 +12,10 @@ jest.mock('../../../../lib/workers/repository/process/lookup');
describe('workers/repository/process/fetch', () => {
describe('fetchUpdates()', () => {
- let config;
+ let config: RenovateConfig;
beforeEach(() => {
jest.resetAllMocks();
- config = require('../../../config/config/_fixtures');
+ config = getConfig();
});
it('handles empty deps', async () => {
const packageFiles = {
diff --git a/test/workers/repository/process/index.spec.ts b/test/workers/repository/process/index.spec.ts
index b2c04243cef0050f431e90c3f56e4f8bbfdc0d7b..ae7795a4aee7d94798546c94e796ef5fef138fca 100644
--- a/test/workers/repository/process/index.spec.ts
+++ b/test/workers/repository/process/index.spec.ts
@@ -1,15 +1,15 @@
import { processRepo } from '../../../../lib/workers/repository/process/index';
import * as _extractUpdate from '../../../../lib/workers/repository/process/extract-update';
-import { mocked } from '../../../util';
+import { getConfig, mocked, RenovateConfig } from '../../../util';
jest.mock('../../../../lib/workers/repository/process/extract-update');
const extractAndUpdate = mocked(_extractUpdate).extractAndUpdate;
-let config;
+let config: RenovateConfig;
beforeEach(() => {
jest.resetAllMocks();
- config = require('../../../config/config/_fixtures');
+ config = getConfig();
});
describe('workers/repository/process/index', () => {