From c911a2dfafde13e2a54d4bb5423cc319a2e8f93a Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Sun, 9 Jun 2019 08:18:41 +0200 Subject: [PATCH] refactor: getArtifacts -> updateArtifacts --- lib/manager/bundler/artifacts.js | 6 +++--- lib/manager/bundler/index.js | 4 ++-- lib/manager/cargo/artifacts.js | 6 +++--- lib/manager/cargo/index.js | 4 ++-- lib/manager/composer/artifacts.js | 6 +++--- lib/manager/composer/index.js | 4 ++-- lib/manager/gomod/artifacts.js | 6 +++--- lib/manager/gomod/index.js | 4 ++-- lib/manager/pipenv/artifacts.js | 6 +++--- lib/manager/pipenv/index.js | 4 ++-- lib/manager/poetry/artifacts.js | 6 +++--- lib/manager/poetry/index.js | 4 ++-- lib/workers/branch/get-updated.js | 6 +++--- test/manager/bundler/artifacts.spec.js | 4 ++-- .../__snapshots__/artifacts.spec.js.snap | 2 +- test/manager/cargo/artifacts.spec.js | 14 +++++++------ .../__snapshots__/artifacts.spec.js.snap | 4 ++-- test/manager/composer/artifacts.spec.js | 18 ++++++++--------- .../__snapshots__/artifacts.spec.js.snap | 2 +- test/manager/gomod/artifacts.spec.js | 20 +++++++++++-------- .../__snapshots__/artifacts.spec.js.snap | 2 +- test/manager/pipenv/artifacts.spec.js | 14 +++++++------ .../__snapshots__/artifacts.spec.js.snap | 2 +- test/manager/poetry/artifacts.spec.js | 12 +++++------ test/workers/branch/get-updated.spec.js | 6 +++--- 25 files changed, 87 insertions(+), 79 deletions(-) diff --git a/lib/manager/bundler/artifacts.js b/lib/manager/bundler/artifacts.js index 4394a47161..1a5572ae21 100644 --- a/lib/manager/bundler/artifacts.js +++ b/lib/manager/bundler/artifacts.js @@ -11,17 +11,17 @@ const { } = require('../../versioning/ruby'); module.exports = { - getArtifacts, + updateArtifacts, }; // istanbul ignore next -async function getArtifacts( +async function updateArtifacts( packageFileName, updatedDeps, newPackageFileContent, config ) { - logger.debug(`bundler.getArtifacts(${packageFileName})`); + logger.debug(`bundler.updateArtifacts(${packageFileName})`); // istanbul ignore if if (global.repoCache.bundlerArtifactsError) { logger.info('Aborting Bundler artifacts due to previous failed attempt'); diff --git a/lib/manager/bundler/index.js b/lib/manager/bundler/index.js index 5d5954b561..886cc5b079 100644 --- a/lib/manager/bundler/index.js +++ b/lib/manager/bundler/index.js @@ -1,6 +1,6 @@ const { extractPackageFile } = require('./extract'); const { updateDependency } = require('./update'); -const { getArtifacts } = require('./artifacts'); +const { updateArtifacts } = require('./artifacts'); const { getRangeStrategy } = require('./range'); const language = 'ruby'; @@ -12,7 +12,7 @@ const language = 'ruby'; module.exports = { extractPackageFile, // Mandatory unless extractAllPackageFiles is used instead - getArtifacts, // Optional + updateArtifacts, // Optional getRangeStrategy, // Optional language, // Optional updateDependency, // Mandatory diff --git a/lib/manager/cargo/artifacts.js b/lib/manager/cargo/artifacts.js index cfa4a9e66e..3c19feeec6 100644 --- a/lib/manager/cargo/artifacts.js +++ b/lib/manager/cargo/artifacts.js @@ -4,16 +4,16 @@ const fs = require('fs-extra'); const { exec } = require('child-process-promise'); module.exports = { - getArtifacts, + updateArtifacts, }; -async function getArtifacts( +async function updateArtifacts( packageFileName, updatedDeps, newPackageFileContent, config ) { - await logger.debug(`cargo.getArtifacts(${packageFileName})`); + await logger.debug(`cargo.updateArtifacts(${packageFileName})`); if (updatedDeps === undefined || updatedDeps.length < 1) { logger.debug('No updated cargo deps - returning null'); return null; diff --git a/lib/manager/cargo/index.js b/lib/manager/cargo/index.js index e08067ed82..fbe1889565 100644 --- a/lib/manager/cargo/index.js +++ b/lib/manager/cargo/index.js @@ -1,12 +1,12 @@ const { extractPackageFile } = require('./extract'); const { updateDependency } = require('./update'); -const { getArtifacts } = require('./artifacts'); +const { updateArtifacts } = require('./artifacts'); const language = 'rust'; module.exports = { extractPackageFile, - getArtifacts, + updateArtifacts, language, updateDependency, // TODO: Support this diff --git a/lib/manager/composer/artifacts.js b/lib/manager/composer/artifacts.js index 34ccb6f067..583e710a6a 100644 --- a/lib/manager/composer/artifacts.js +++ b/lib/manager/composer/artifacts.js @@ -6,16 +6,16 @@ const upath = require('upath'); const hostRules = require('../../util/host-rules'); module.exports = { - getArtifacts, + updateArtifacts, }; -async function getArtifacts( +async function updateArtifacts( packageFileName, updatedDeps, newPackageFileContent, config ) { - logger.debug(`composer.getArtifacts(${packageFileName})`); + logger.debug(`composer.updateArtifacts(${packageFileName})`); process.env.COMPOSER_CACHE_DIR = process.env.COMPOSER_CACHE_DIR || upath.join(config.cacheDir, './others/composer'); diff --git a/lib/manager/composer/index.js b/lib/manager/composer/index.js index dce6748694..568ada54ab 100644 --- a/lib/manager/composer/index.js +++ b/lib/manager/composer/index.js @@ -1,13 +1,13 @@ const { extractPackageFile } = require('./extract'); const { updateDependency } = require('../npm/update'); -const { getArtifacts } = require('./artifacts'); +const { updateArtifacts } = require('./artifacts'); const { getRangeStrategy } = require('./range'); const language = 'php'; module.exports = { extractPackageFile, - getArtifacts, + updateArtifacts, language, updateDependency, getRangeStrategy, diff --git a/lib/manager/gomod/artifacts.js b/lib/manager/gomod/artifacts.js index 93c1655ae7..25b2e57a8a 100644 --- a/lib/manager/gomod/artifacts.js +++ b/lib/manager/gomod/artifacts.js @@ -4,16 +4,16 @@ const upath = require('upath'); const hostRules = require('../../util/host-rules'); module.exports = { - getArtifacts, + updateArtifacts, }; -async function getArtifacts( +async function updateArtifacts( goModFileName, updatedDeps, newGoModContent, config ) { - logger.debug(`gomod.getArtifacts(${goModFileName})`); + logger.debug(`gomod.updateArtifacts(${goModFileName})`); process.env.GOPATH = process.env.GOPATH || upath.join(config.cacheDir, './others/go'); await fs.ensureDir(process.env.GOPATH); diff --git a/lib/manager/gomod/index.js b/lib/manager/gomod/index.js index 552fd05735..4e6836ebcb 100644 --- a/lib/manager/gomod/index.js +++ b/lib/manager/gomod/index.js @@ -1,10 +1,10 @@ const { extractPackageFile } = require('./extract'); const { updateDependency } = require('./update'); -const { getArtifacts } = require('./artifacts'); +const { updateArtifacts } = require('./artifacts'); module.exports = { extractPackageFile, updateDependency, - getArtifacts, + updateArtifacts, language: 'golang', }; diff --git a/lib/manager/pipenv/artifacts.js b/lib/manager/pipenv/artifacts.js index ba9a45d05c..fdf47edb0e 100644 --- a/lib/manager/pipenv/artifacts.js +++ b/lib/manager/pipenv/artifacts.js @@ -3,16 +3,16 @@ const fs = require('fs-extra'); const upath = require('upath'); module.exports = { - getArtifacts, + updateArtifacts, }; -async function getArtifacts( +async function updateArtifacts( pipfileName, updatedDeps, newPipfileContent, config ) { - logger.debug(`pipenv.getArtifacts(${pipfileName})`); + logger.debug(`pipenv.updateArtifacts(${pipfileName})`); process.env.PIPENV_CACHE_DIR = process.env.PIPENV_CACHE_DIR || upath.join(config.cacheDir, './others/pipenv'); diff --git a/lib/manager/pipenv/index.js b/lib/manager/pipenv/index.js index e2001f3d8c..28b8605f08 100644 --- a/lib/manager/pipenv/index.js +++ b/lib/manager/pipenv/index.js @@ -1,12 +1,12 @@ const { extractPackageFile } = require('./extract'); const { updateDependency } = require('./update'); -const { getArtifacts } = require('./artifacts'); +const { updateArtifacts } = require('./artifacts'); const language = 'python'; module.exports = { extractPackageFile, updateDependency, - getArtifacts, + updateArtifacts, language, }; diff --git a/lib/manager/poetry/artifacts.js b/lib/manager/poetry/artifacts.js index b3791f4e4f..cc3412e32c 100644 --- a/lib/manager/poetry/artifacts.js +++ b/lib/manager/poetry/artifacts.js @@ -4,16 +4,16 @@ const fs = require('fs-extra'); const { exec } = require('child-process-promise'); module.exports = { - getArtifacts, + updateArtifacts, }; -async function getArtifacts( +async function updateArtifacts( packageFileName, updatedDeps, newPackageFileContent, config ) { - await logger.debug(`poetry.getArtifacts(${packageFileName})`); + await logger.debug(`poetry.updateArtifacts(${packageFileName})`); if (updatedDeps === undefined || updatedDeps.length < 1) { logger.debug('No updated poetry deps - returning null'); return null; diff --git a/lib/manager/poetry/index.js b/lib/manager/poetry/index.js index a2a396b6f4..5a4a763d73 100644 --- a/lib/manager/poetry/index.js +++ b/lib/manager/poetry/index.js @@ -1,12 +1,12 @@ const { extractPackageFile } = require('./extract'); const { updateDependency } = require('./update'); -const { getArtifacts } = require('./artifacts'); +const { updateArtifacts } = require('./artifacts'); const language = 'python'; module.exports = { extractPackageFile, - getArtifacts, + updateArtifacts, language, updateDependency, // TODO: Support this diff --git a/lib/workers/branch/get-updated.js b/lib/workers/branch/get-updated.js index 32608026e5..f8b0c54253 100644 --- a/lib/workers/branch/get-updated.js +++ b/lib/workers/branch/get-updated.js @@ -70,9 +70,9 @@ async function getUpdatedPackageFiles(config) { for (const packageFile of updatedPackageFiles) { const manager = packageFileManagers[packageFile.name]; const updatedDeps = packageFileUpdatedDeps[packageFile.name]; - const getArtifacts = get(manager, 'getArtifacts'); - if (getArtifacts) { - const results = await getArtifacts( + const updateArtifacts = get(manager, 'updateArtifacts'); + if (updateArtifacts) { + const results = await updateArtifacts( packageFile.name, updatedDeps, packageFile.contents, diff --git a/test/manager/bundler/artifacts.spec.js b/test/manager/bundler/artifacts.spec.js index fe2918907f..08cfdee3d0 100644 --- a/test/manager/bundler/artifacts.spec.js +++ b/test/manager/bundler/artifacts.spec.js @@ -2,12 +2,12 @@ const cargo = require('../../../lib/manager/bundler/artifacts'); let config; -describe('bundler.getArtifacts()', () => { +describe('bundler.updateArtifacts()', () => { beforeEach(() => { jest.resetAllMocks(); config = {}; }); it('returns null by default', async () => { - expect(await cargo.getArtifacts('', [], '', config)).toBeNull(); + expect(await cargo.updateArtifacts('', [], '', config)).toBeNull(); }); }); diff --git a/test/manager/cargo/__snapshots__/artifacts.spec.js.snap b/test/manager/cargo/__snapshots__/artifacts.spec.js.snap index a9ebac1868..661e78ddb9 100644 --- a/test/manager/cargo/__snapshots__/artifacts.spec.js.snap +++ b/test/manager/cargo/__snapshots__/artifacts.spec.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`.getArtifacts() catches errors 1`] = ` +exports[`.updateArtifacts() catches errors 1`] = ` Object { "lockFileError": Object { "lockFile": "Cargo.lock", diff --git a/test/manager/cargo/artifacts.spec.js b/test/manager/cargo/artifacts.spec.js index 14ef245cd6..ad8e1728b8 100644 --- a/test/manager/cargo/artifacts.spec.js +++ b/test/manager/cargo/artifacts.spec.js @@ -9,7 +9,7 @@ const config = { localDir: '/tmp/github/some/repo', }; -describe('.getArtifacts()', () => { +describe('.updateArtifacts()', () => { beforeEach(() => { jest.resetAllMocks(); }); @@ -24,11 +24,13 @@ describe('.getArtifacts()', () => { }, ]; expect( - await cargo.getArtifacts('Cargo.toml', updatedDeps, '', config) + await cargo.updateArtifacts('Cargo.toml', updatedDeps, '', config) ).toBeNull(); }); it('returns null if updatedDeps is empty', async () => { - expect(await cargo.getArtifacts('Cargo.toml', [], '', config)).toBeNull(); + expect( + await cargo.updateArtifacts('Cargo.toml', [], '', config) + ).toBeNull(); }); it('returns null if unchanged', async () => { platform.getFile.mockReturnValueOnce('Current Cargo.lock'); @@ -44,7 +46,7 @@ describe('.getArtifacts()', () => { }, ]; expect( - await cargo.getArtifacts('Cargo.toml', updatedDeps, '', config) + await cargo.updateArtifacts('Cargo.toml', updatedDeps, '', config) ).toBeNull(); }); it('returns updated Cargo.lock', async () => { @@ -62,7 +64,7 @@ describe('.getArtifacts()', () => { ]; global.trustLevel = 'high'; expect( - await cargo.getArtifacts('Cargo.toml', updatedDeps, '{}', config) + await cargo.updateArtifacts('Cargo.toml', updatedDeps, '{}', config) ).not.toBeNull(); }); it('catches errors', async () => { @@ -77,7 +79,7 @@ describe('.getArtifacts()', () => { }, ]; expect( - await cargo.getArtifacts('Cargo.toml', updatedDeps, '{}', config) + await cargo.updateArtifacts('Cargo.toml', updatedDeps, '{}', config) ).toMatchSnapshot(); }); }); diff --git a/test/manager/composer/__snapshots__/artifacts.spec.js.snap b/test/manager/composer/__snapshots__/artifacts.spec.js.snap index f4b89c9286..e05e04ebe1 100644 --- a/test/manager/composer/__snapshots__/artifacts.spec.js.snap +++ b/test/manager/composer/__snapshots__/artifacts.spec.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`.getArtifacts() catches errors 1`] = ` +exports[`.updateArtifacts() catches errors 1`] = ` Array [ Object { "artifactError": Object { @@ -11,7 +11,7 @@ Array [ ] `; -exports[`.getArtifacts() catches unmet requirements errors 1`] = ` +exports[`.updateArtifacts() catches unmet requirements errors 1`] = ` Array [ Object { "artifactError": Object { diff --git a/test/manager/composer/artifacts.spec.js b/test/manager/composer/artifacts.spec.js index 19e73d5562..5bf5e76a76 100644 --- a/test/manager/composer/artifacts.spec.js +++ b/test/manager/composer/artifacts.spec.js @@ -12,7 +12,7 @@ const config = { cacheDir: '/tmp/renovate/cache', }; -describe('.getArtifacts()', () => { +describe('.updateArtifacts()', () => { beforeEach(() => { jest.resetAllMocks(); }); @@ -21,7 +21,7 @@ describe('.getArtifacts()', () => { }); it('returns if no composer.lock found', async () => { expect( - await composer.getArtifacts('composer.json', [], '{}', config) + await composer.updateArtifacts('composer.json', [], '{}', config) ).toBeNull(); }); it('returns null if unchanged', async () => { @@ -33,7 +33,7 @@ describe('.getArtifacts()', () => { fs.readFile = jest.fn(() => 'Current composer.lock'); platform.getRepoStatus.mockResolvedValue({ modified: [] }); expect( - await composer.getArtifacts('composer.json', [], '{}', config) + await composer.updateArtifacts('composer.json', [], '{}', config) ).toBeNull(); }); it('uses hostRules to write auth.json', async () => { @@ -57,7 +57,7 @@ describe('.getArtifacts()', () => { }); platform.getRepoStatus.mockResolvedValue({ modified: [] }); expect( - await composer.getArtifacts('composer.json', [], '{}', authConfig) + await composer.updateArtifacts('composer.json', [], '{}', authConfig) ).toBeNull(); }); it('returns updated composer.lock', async () => { @@ -70,7 +70,7 @@ describe('.getArtifacts()', () => { global.trustLevel = 'high'; platform.getRepoStatus.mockResolvedValue({ modified: ['composer.lock'] }); expect( - await composer.getArtifacts('composer.json', [], '{}', config) + await composer.updateArtifacts('composer.json', [], '{}', config) ).not.toBeNull(); }); it('supports docker mode', async () => { @@ -81,7 +81,7 @@ describe('.getArtifacts()', () => { }); fs.readFile = jest.fn(() => 'New composer.lock'); expect( - await composer.getArtifacts('composer.json', [], '{}', { + await composer.updateArtifacts('composer.json', [], '{}', { ...config, binarySource: 'docker', }) @@ -93,7 +93,7 @@ describe('.getArtifacts()', () => { throw new Error('not found'); }); expect( - await composer.getArtifacts('composer.json', [], '{}', config) + await composer.updateArtifacts('composer.json', [], '{}', config) ).toMatchSnapshot(); }); it('catches unmet requirements errors', async () => { @@ -104,7 +104,7 @@ describe('.getArtifacts()', () => { ); }); expect( - await composer.getArtifacts('composer.json', [], '{}', config) + await composer.updateArtifacts('composer.json', [], '{}', config) ).toMatchSnapshot(); }); it('throws for disk space', async () => { @@ -115,7 +115,7 @@ describe('.getArtifacts()', () => { ); }); await expect( - composer.getArtifacts('composer.json', [], '{}', config) + composer.updateArtifacts('composer.json', [], '{}', config) ).rejects.toThrow(); }); }); diff --git a/test/manager/gomod/__snapshots__/artifacts.spec.js.snap b/test/manager/gomod/__snapshots__/artifacts.spec.js.snap index 1ea549e9ed..0d8b4b1cf5 100644 --- a/test/manager/gomod/__snapshots__/artifacts.spec.js.snap +++ b/test/manager/gomod/__snapshots__/artifacts.spec.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`.getArtifacts() catches errors 1`] = ` +exports[`.updateArtifacts() catches errors 1`] = ` Array [ Object { "artifactError": Object { diff --git a/test/manager/gomod/artifacts.spec.js b/test/manager/gomod/artifacts.spec.js index ed72d2ea6f..35115d7eb5 100644 --- a/test/manager/gomod/artifacts.spec.js +++ b/test/manager/gomod/artifacts.spec.js @@ -24,7 +24,7 @@ const config = { cacheDir: '/tmp/renovate/cache', }; -describe('.getArtifacts()', () => { +describe('.updateArtifacts()', () => { beforeEach(() => { jest.resetAllMocks(); exec.mockResolvedValue({ @@ -33,7 +33,9 @@ describe('.getArtifacts()', () => { }); }); it('returns if no go.sum found', async () => { - expect(await gomod.getArtifacts('go.mod', [], gomod1, config)).toBeNull(); + expect( + await gomod.updateArtifacts('go.mod', [], gomod1, config) + ).toBeNull(); }); it('returns null if unchanged', async () => { platform.getFile.mockReturnValueOnce('Current go.sum'); @@ -42,7 +44,9 @@ describe('.getArtifacts()', () => { stderror: '', }); platform.getRepoStatus.mockResolvedValue({ modified: [] }); - expect(await gomod.getArtifacts('go.mod', [], gomod1, config)).toBeNull(); + expect( + await gomod.updateArtifacts('go.mod', [], gomod1, config) + ).toBeNull(); }); it('returns updated go.sum', async () => { platform.getFile.mockReturnValueOnce('Current go.sum'); @@ -53,7 +57,7 @@ describe('.getArtifacts()', () => { platform.getRepoStatus.mockResolvedValue({ modified: ['go.sum'] }); fs.readFile = jest.fn(() => 'New go.sum'); expect( - await gomod.getArtifacts('go.mod', [], gomod1, config) + await gomod.updateArtifacts('go.mod', [], gomod1, config) ).not.toBeNull(); }); it('supports docker mode without credentials', async () => { @@ -65,7 +69,7 @@ describe('.getArtifacts()', () => { platform.getRepoStatus.mockResolvedValue({ modified: ['go.sum'] }); fs.readFile = jest.fn(() => 'New go.sum'); expect( - await gomod.getArtifacts('go.mod', [], gomod1, { + await gomod.updateArtifacts('go.mod', [], gomod1, { ...config, binarySource: 'docker', }) @@ -83,7 +87,7 @@ describe('.getArtifacts()', () => { platform.getRepoStatus.mockResolvedValue({ modified: ['go.sum'] }); fs.readFile = jest.fn(() => 'New go.sum'); expect( - await gomod.getArtifacts('go.mod', [], gomod1, { + await gomod.updateArtifacts('go.mod', [], gomod1, { ...config, binarySource: 'docker', }) @@ -102,7 +106,7 @@ describe('.getArtifacts()', () => { global.appMode = true; global.trustLevel = 'high'; expect( - await gomod.getArtifacts('go.mod', [], gomod1, { + await gomod.updateArtifacts('go.mod', [], gomod1, { ...config, binarySource: 'docker', postUpdateOptions: ['gomodTidy'], @@ -119,7 +123,7 @@ describe('.getArtifacts()', () => { throw new Error('This update totally doesnt work'); }); expect( - await gomod.getArtifacts('go.mod', [], gomod1, config) + await gomod.updateArtifacts('go.mod', [], gomod1, config) ).toMatchSnapshot(); }); }); diff --git a/test/manager/pipenv/__snapshots__/artifacts.spec.js.snap b/test/manager/pipenv/__snapshots__/artifacts.spec.js.snap index 29d6b76183..67453de3b7 100644 --- a/test/manager/pipenv/__snapshots__/artifacts.spec.js.snap +++ b/test/manager/pipenv/__snapshots__/artifacts.spec.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`.getArtifacts() catches errors 1`] = ` +exports[`.updateArtifacts() catches errors 1`] = ` Array [ Object { "artifactError": Object { diff --git a/test/manager/pipenv/artifacts.spec.js b/test/manager/pipenv/artifacts.spec.js index e9bfc68f99..1abe4b5a3a 100644 --- a/test/manager/pipenv/artifacts.spec.js +++ b/test/manager/pipenv/artifacts.spec.js @@ -11,7 +11,7 @@ const config = { cacheDir: '/tmp/renovate/cache', }; -describe('.getArtifacts()', () => { +describe('.updateArtifacts()', () => { beforeEach(() => { jest.resetAllMocks(); }); @@ -19,7 +19,7 @@ describe('.getArtifacts()', () => { delete global.trustLevel; }); it('returns if no Pipfile.lock found', async () => { - expect(await pipenv.getArtifacts('Pipfile', [], '', config)).toBeNull(); + expect(await pipenv.updateArtifacts('Pipfile', [], '', config)).toBeNull(); }); it('returns null if unchanged', async () => { platform.getFile.mockReturnValueOnce('Current Pipfile.lock'); @@ -28,7 +28,9 @@ describe('.getArtifacts()', () => { stderror: '', }); fs.readFile = jest.fn(() => 'Current Pipfile.lock'); - expect(await pipenv.getArtifacts('Pipfile', [], '{}', config)).toBeNull(); + expect( + await pipenv.updateArtifacts('Pipfile', [], '{}', config) + ).toBeNull(); }); it('returns updated Pipfile.lock', async () => { platform.getFile.mockReturnValueOnce('Current Pipfile.lock'); @@ -40,7 +42,7 @@ describe('.getArtifacts()', () => { fs.readFile = jest.fn(() => 'New Pipfile.lock'); global.trustLevel = 'high'; expect( - await pipenv.getArtifacts('Pipfile', [], '{}', config) + await pipenv.updateArtifacts('Pipfile', [], '{}', config) ).not.toBeNull(); }); it('supports docker mode', async () => { @@ -52,7 +54,7 @@ describe('.getArtifacts()', () => { platform.getRepoStatus.mockResolvedValue({ modified: ['Pipfile.lock'] }); fs.readFile = jest.fn(() => 'New Pipfile.lock'); expect( - await pipenv.getArtifacts('Pipfile', [], '{}', { + await pipenv.updateArtifacts('Pipfile', [], '{}', { ...config, binarySource: 'docker', }) @@ -64,7 +66,7 @@ describe('.getArtifacts()', () => { throw new Error('not found'); }); expect( - await pipenv.getArtifacts('Pipfile', [], '{}', config) + await pipenv.updateArtifacts('Pipfile', [], '{}', config) ).toMatchSnapshot(); }); }); diff --git a/test/manager/poetry/__snapshots__/artifacts.spec.js.snap b/test/manager/poetry/__snapshots__/artifacts.spec.js.snap index 46da37a1ed..af6f308a76 100644 --- a/test/manager/poetry/__snapshots__/artifacts.spec.js.snap +++ b/test/manager/poetry/__snapshots__/artifacts.spec.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`.getArtifacts() catches errors 1`] = ` +exports[`.updateArtifacts() catches errors 1`] = ` Object { "lockFileError": Object { "lockFile": "poetry.lock", diff --git a/test/manager/poetry/artifacts.spec.js b/test/manager/poetry/artifacts.spec.js index 0410c19d59..1f99df6b4c 100644 --- a/test/manager/poetry/artifacts.spec.js +++ b/test/manager/poetry/artifacts.spec.js @@ -9,7 +9,7 @@ const config = { localDir: '/tmp/github/some/repo', }; -describe('.getArtifacts()', () => { +describe('.updateArtifacts()', () => { beforeEach(() => { jest.resetAllMocks(); }); @@ -24,12 +24,12 @@ describe('.getArtifacts()', () => { }, ]; expect( - await poetry.getArtifacts('pyproject.toml', updatedDeps, '', config) + await poetry.updateArtifacts('pyproject.toml', updatedDeps, '', config) ).toBeNull(); }); it('returns null if updatedDeps is empty', async () => { expect( - await poetry.getArtifacts('pyproject.toml', [], '', config) + await poetry.updateArtifacts('pyproject.toml', [], '', config) ).toBeNull(); }); it('returns null if unchanged', async () => { @@ -46,7 +46,7 @@ describe('.getArtifacts()', () => { }, ]; expect( - await poetry.getArtifacts('pyproject.toml', updatedDeps, '', config) + await poetry.updateArtifacts('pyproject.toml', updatedDeps, '', config) ).toBeNull(); }); it('returns updated poetry.lock', async () => { @@ -64,7 +64,7 @@ describe('.getArtifacts()', () => { ]; global.trustLevel = 'high'; expect( - await poetry.getArtifacts('pyproject.toml', updatedDeps, '{}', config) + await poetry.updateArtifacts('pyproject.toml', updatedDeps, '{}', config) ).not.toBeNull(); }); it('catches errors', async () => { @@ -79,7 +79,7 @@ describe('.getArtifacts()', () => { }, ]; expect( - await poetry.getArtifacts('pyproject.toml', updatedDeps, '{}', config) + await poetry.updateArtifacts('pyproject.toml', updatedDeps, '{}', config) ).toMatchSnapshot(); }); }); diff --git a/test/workers/branch/get-updated.spec.js b/test/workers/branch/get-updated.spec.js index 168a22cc61..4bacff0a4a 100644 --- a/test/workers/branch/get-updated.spec.js +++ b/test/workers/branch/get-updated.spec.js @@ -14,7 +14,7 @@ describe('workers/branch/get-updated', () => { upgrades: [], }; composer.updateDependency = jest.fn(); - composer.getArtifacts = jest.fn(); + composer.updateArtifacts = jest.fn(); npm.updateDependency = jest.fn(); platform.getFile.mockReturnValueOnce('existing content'); }); @@ -44,7 +44,7 @@ describe('workers/branch/get-updated', () => { manager: 'composer', }); composer.updateDependency.mockReturnValue('some new content'); - composer.getArtifacts.mockReturnValue([ + composer.updateArtifacts.mockReturnValue([ { file: { name: 'composer.json', @@ -61,7 +61,7 @@ describe('workers/branch/get-updated', () => { manager: 'composer', }); composer.updateDependency.mockReturnValue('some new content'); - composer.getArtifacts.mockReturnValue([ + composer.updateArtifacts.mockReturnValue([ { artifactError: { name: 'composer.lock', -- GitLab