diff --git a/lib/manager/cargo/extract.js b/lib/manager/cargo/extract.js index 87ead9bd2df6aa40835b69931ef03918486ad248..e80891fa59e377a227d9c5d712b6a1fc3878cbe2 100644 --- a/lib/manager/cargo/extract.js +++ b/lib/manager/cargo/extract.js @@ -88,7 +88,7 @@ function extractFromSection(parsedContent, section, target) { depName, depType: section, currentValue, - nestedVersion, + managerData: { nestedVersion }, datasource: 'cargo', }; if (skipReason) { diff --git a/lib/manager/cargo/update.js b/lib/manager/cargo/update.js index 0aeaaf3bb7db7742ada92dce66fd6e4e1f1cba73..5b61b6a916afe08276b86db51431e5210d39a19b 100644 --- a/lib/manager/cargo/update.js +++ b/lib/manager/cargo/update.js @@ -26,7 +26,8 @@ function updateDependency(fileContent, upgrade) { if (!upgrade) { return fileContent; } - const { target, depType, depName, newValue, nestedVersion } = upgrade; + const { target, depType, depName, newValue, managerData } = upgrade; + const { nestedVersion } = managerData; let parsedContent; try { parsedContent = toml.parse(fileContent); diff --git a/lib/manager/poetry/extract.js b/lib/manager/poetry/extract.js index 3835e71875f285edc969bd449953d05e46814ddf..309124250797358c39cfa23947cb27f9f784c7ab 100644 --- a/lib/manager/poetry/extract.js +++ b/lib/manager/poetry/extract.js @@ -68,7 +68,7 @@ function extractFromSection(parsedFile, section) { depName, depType: section, currentValue, - nestedVersion, + managerData: { nestedVersion }, datasource: 'pypi', }; if (skipReason) { diff --git a/lib/manager/poetry/update.js b/lib/manager/poetry/update.js index 0c8b0e6d0f98c850482d80256cc10d4760ab39f9..a826d1a453ffe470dc23a432cad24e4df9edfc48 100644 --- a/lib/manager/poetry/update.js +++ b/lib/manager/poetry/update.js @@ -28,7 +28,8 @@ function updateDependency(fileContent, upgrade) { if (!upgrade) { return null; } - const { depType, depName, newValue, nestedVersion } = upgrade; + const { depType, depName, newValue, managerData } = upgrade; + const { nestedVersion } = managerData; const parsedContents = toml.parse(fileContent); if (!parsedContents.tool.poetry[depType]) { logger.info( diff --git a/test/manager/cargo/__snapshots__/extract.spec.js.snap b/test/manager/cargo/__snapshots__/extract.spec.js.snap index 5e0106c7166d567f54ce75933d66cc5a8c329bd9..bce1d687d5ce936a017df5f2f3ac57242bec11e8 100644 --- a/test/manager/cargo/__snapshots__/extract.spec.js.snap +++ b/test/manager/cargo/__snapshots__/extract.spec.js.snap @@ -7,21 +7,27 @@ Array [ "datasource": "cargo", "depName": "libc", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "1.0.4", "datasource": "cargo", "depName": "bitflags", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "=0.1", "datasource": "cargo", "depName": "pcap-sys", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -29,14 +35,18 @@ Array [ "datasource": "cargo", "depName": "pnet", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, }, Object { "currentValue": "0.1.0", "datasource": "cargo", "depName": "git_dep_with_version", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "git-dependency", }, Object { @@ -44,7 +54,9 @@ Array [ "datasource": "cargo", "depName": "git_dep", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "skipReason": "git-dependency", }, Object { @@ -52,35 +64,45 @@ Array [ "datasource": "cargo", "depName": "same_version_1__", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "0.0.0", "datasource": "cargo", "depName": "same_version_1_", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "0.0.0", "datasource": "cargo", "depName": "same_version_1", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "0.4.2", "datasource": "cargo", "depName": "dep1", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, }, Object { "currentValue": "=0.3.6", "datasource": "cargo", "depName": "winapi", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "target": "cfg(windows)", }, Object { @@ -88,7 +110,9 @@ Array [ "datasource": "cargo", "depName": "wasm-bindgen", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "target": "cfg(target_arch = \\"wasm32\\")", }, Object { @@ -96,7 +120,9 @@ Array [ "datasource": "cargo", "depName": "js-sys", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "target": "cfg(target_arch = \\"wasm32\\")", }, Object { @@ -104,7 +130,9 @@ Array [ "datasource": "cargo", "depName": "js_relative_import", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "skipReason": "path-dependency", "target": "cfg(target_arch = \\"wasm32\\")", }, @@ -113,7 +141,9 @@ Array [ "datasource": "cargo", "depName": "web-sys", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "target": "cfg(target_arch = \\"wasm32\\")", }, ] @@ -126,7 +156,9 @@ Array [ "datasource": "cargo", "depName": "amethyst_animation", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -134,7 +166,9 @@ Array [ "datasource": "cargo", "depName": "amethyst_assets", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -142,7 +176,9 @@ Array [ "datasource": "cargo", "depName": "amethyst_audio", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -150,7 +186,9 @@ Array [ "datasource": "cargo", "depName": "amethyst_config", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -158,7 +196,9 @@ Array [ "datasource": "cargo", "depName": "amethyst_core", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -166,7 +206,9 @@ Array [ "datasource": "cargo", "depName": "amethyst_controls", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -174,7 +216,9 @@ Array [ "datasource": "cargo", "depName": "amethyst_locale", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -182,7 +226,9 @@ Array [ "datasource": "cargo", "depName": "amethyst_renderer", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -190,7 +236,9 @@ Array [ "datasource": "cargo", "depName": "amethyst_input", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -198,7 +246,9 @@ Array [ "datasource": "cargo", "depName": "amethyst_ui", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -206,7 +256,9 @@ Array [ "datasource": "cargo", "depName": "amethyst_utils", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -214,56 +266,72 @@ Array [ "datasource": "cargo", "depName": "derivative", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "0.5", "datasource": "cargo", "depName": "fern", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, }, Object { "currentValue": "0.4", "datasource": "cargo", "depName": "log", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "1.0.1", "datasource": "cargo", "depName": "rayon", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "0.1", "datasource": "cargo", "depName": "rustc_version_runtime", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "0.15", "datasource": "cargo", "depName": "winit", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "0.1", "datasource": "cargo", "depName": "thread_profiler", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, }, Object { "currentValue": "0.2", "datasource": "cargo", "depName": "amethyst_gltf", "depType": "dev-dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -271,42 +339,54 @@ Array [ "datasource": "cargo", "depName": "env_logger", "depType": "dev-dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "0.6", "datasource": "cargo", "depName": "genmesh", "depType": "dev-dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "0.2", "datasource": "cargo", "depName": "ron", "depType": "dev-dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "1.0", "datasource": "cargo", "depName": "serde", "depType": "dev-dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "1.0", "datasource": "cargo", "depName": "serde_derive", "depType": "dev-dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "0.1", "datasource": "cargo", "depName": "vergen", "depType": "build-dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, ] `; @@ -318,7 +398,9 @@ Array [ "datasource": "cargo", "depName": "wasm-bindgen", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "target": "cfg(target_arch = \\"wasm32\\")", }, Object { @@ -326,7 +408,9 @@ Array [ "datasource": "cargo", "depName": "js-sys", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "target": "cfg(target_arch = \\"wasm32\\")", }, Object { @@ -334,7 +418,9 @@ Array [ "datasource": "cargo", "depName": "js_relative_import", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "skipReason": "path-dependency", "target": "cfg(target_arch = \\"wasm32\\")", }, @@ -343,7 +429,9 @@ Array [ "datasource": "cargo", "depName": "web-sys", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "target": "cfg(target_arch = \\"wasm32\\")", }, ] @@ -356,7 +444,9 @@ Array [ "datasource": "cargo", "depName": "pcap-sys", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -364,14 +454,18 @@ Array [ "datasource": "cargo", "depName": "pnet", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, }, Object { "currentValue": "1.2", "datasource": "cargo", "depName": "dep1", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -379,7 +473,9 @@ Array [ "datasource": "cargo", "depName": "dep2", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -387,7 +483,9 @@ Array [ "datasource": "cargo", "depName": "dep3", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -395,7 +493,9 @@ Array [ "datasource": "cargo", "depName": "dep4", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "unknown-version", }, Object { @@ -403,14 +503,18 @@ Array [ "datasource": "cargo", "depName": "dep5", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, }, Object { "currentValue": "", "datasource": "cargo", "depName": "dep6", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "skipReason": "invalid-dependency-specification", }, ] @@ -423,7 +527,9 @@ Array [ "datasource": "cargo", "depName": "dep1", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -431,7 +537,9 @@ Array [ "datasource": "cargo", "depName": "dep2", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -439,7 +547,9 @@ Array [ "datasource": "cargo", "depName": "dep3", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -447,7 +557,9 @@ Array [ "datasource": "cargo", "depName": "dep4", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -455,7 +567,9 @@ Array [ "datasource": "cargo", "depName": "dep5", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "skipReason": "path-dependency", }, Object { @@ -463,7 +577,9 @@ Array [ "datasource": "cargo", "depName": "dep7", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "skipReason": "invalid-dependency-specification", }, ] diff --git a/test/manager/cargo/update.spec.js b/test/manager/cargo/update.spec.js index aad8e74fdf035b8e180f031e88fa9c09b1b9969a..733a313ca1596abd13b289aa6fd2f63b35dcdce7 100644 --- a/test/manager/cargo/update.spec.js +++ b/test/manager/cargo/update.spec.js @@ -18,7 +18,7 @@ describe('lib/manager/cargo/update', () => { describe('updateDependency()', () => { let config; beforeEach(() => { - config = {}; + config = { managerData: {} }; }); it('returns same for invalid toml', () => { const cargotoml = 'invalid toml !#$#'; @@ -34,7 +34,7 @@ describe('lib/manager/cargo/update', () => { const upgrade = { depName: 'libc', depType: 'dependencies', - nestedVersion: false, + managerData: { nestedVersion: false }, newValue: '=0.2.43', }; expect(updateDependency(cargo1toml, upgrade)).not.toBeNull(); @@ -46,7 +46,7 @@ describe('lib/manager/cargo/update', () => { const upgrade = { depName: 'platform-specific-dep', depType: 'dependencies', - nestedVersion: false, + managerData: { nestedVersion: false }, target: 'foobar', newValue: '1.2.3', }; @@ -59,7 +59,7 @@ describe('lib/manager/cargo/update', () => { const upgrade = { depName: 'libc', depType: 'foobar', - nestedVersion: false, + managerData: { nestedVersion: false }, newValue: '1.2.3', }; expect(updateDependency(cargo1toml, upgrade)).not.toBeNull(); @@ -71,7 +71,7 @@ describe('lib/manager/cargo/update', () => { const upgrade = { depName: 'does not exist', depType: 'dependencies', - nestedVersion: false, + managerData: { nestedVersion: false }, newValue: '1.2.3', }; expect(updateDependency(cargo1toml, upgrade)).not.toBeNull(); @@ -81,7 +81,7 @@ describe('lib/manager/cargo/update', () => { const upgrade = { depName: 'libc', depType: 'dependencies', - nestedVersion: false, + managerData: { nestedVersion: false }, newValue: '0.3.0', }; expect(updateDependency(cargo1toml, upgrade)).not.toBeNull(); @@ -92,7 +92,7 @@ describe('lib/manager/cargo/update', () => { const upgrade = { depName: 'same_version_1', depType: 'dependencies', - nestedVersion: false, + managerData: { nestedVersion: false }, newValue: '1.2.3', }; expect(updateDependency(cargo1toml, upgrade)).not.toBeNull(); @@ -103,7 +103,7 @@ describe('lib/manager/cargo/update', () => { const upgrade = { depName: 'pcap-sys', depType: 'dependencies', - nestedVersion: true, + managerData: { nestedVersion: true }, newValue: '0.2.0', }; expect(updateDependency(cargo1toml, upgrade)).not.toBeNull(); @@ -115,7 +115,7 @@ describe('lib/manager/cargo/update', () => { depName: 'winapi', target: 'cfg(windows)', depType: 'dependencies', - nestedVersion: true, + managerData: { nestedVersion: true }, newValue: '0.4.0', }; expect(updateDependency(cargo1toml, upgrade)).not.toBeNull(); @@ -125,7 +125,7 @@ describe('lib/manager/cargo/update', () => { it('handles invalid standard tables gracefully', () => { const upgrade = { depName: 'dep5', - nestedVersion: true, + managerData: { nestedVersion: true }, depType: 'dependencies', newValue: '2.0.0', }; @@ -135,7 +135,7 @@ describe('lib/manager/cargo/update', () => { const upgrade = { depName: 'libc', devType: 'dev-dependencies', // Wrong devType - nestedVersion: false, + managerData: { nestedVersion: false }, newValue: '0.3.0', }; expect(updateDependency(cargo1toml, upgrade)).toEqual(cargo1toml); @@ -144,7 +144,7 @@ describe('lib/manager/cargo/update', () => { const upgrade = { depName: 'libc', devType: 'dependencies', - nestedVersion: true, // Should be false + managerData: { nestedVersion: true }, // Should be false newValue: '0.3.0', }; expect(updateDependency(cargo1toml, upgrade)).toEqual(cargo1toml); @@ -153,7 +153,7 @@ describe('lib/manager/cargo/update', () => { const upgrade = { depName: 'pcap-sys', devType: 'dependencies', - nestedVersion: false, // Should be true + managerData: { nestedVersion: false }, // Should be true newValue: '0.3.0', }; expect(updateDependency(cargo1toml, upgrade)).toEqual(cargo1toml); @@ -162,7 +162,7 @@ describe('lib/manager/cargo/update', () => { const upgrade = { depName: 'wasm-bindgen', depType: 'dependencies', - nestedVersion: false, + managerData: { nestedVersion: false }, target: 'cfg(target_arch = "wasm32")', newValue: '0.3.0', }; @@ -172,7 +172,7 @@ describe('lib/manager/cargo/update', () => { it('updates platform specific table dependency', () => { const upgrade = { depName: 'web-sys', - nestedVersion: true, + managerData: { nestedVersion: true }, depType: 'dependencies', target: 'cfg(target_arch = "wasm32")', newValue: '0.4.0', diff --git a/test/manager/poetry/__snapshots__/extract.spec.js.snap b/test/manager/poetry/__snapshots__/extract.spec.js.snap index 8635a124169f7593299d529a320ae5221e2cc566..dae3171c559d1a9e8cad0b129420098abfbd7a6c 100644 --- a/test/manager/poetry/__snapshots__/extract.spec.js.snap +++ b/test/manager/poetry/__snapshots__/extract.spec.js.snap @@ -7,21 +7,27 @@ Array [ "datasource": "pypi", "depName": "dep1", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, }, Object { "currentValue": "^0.6.0", "datasource": "pypi", "depName": "dep2", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, }, Object { "currentValue": "^0.33.6", "datasource": "pypi", "depName": "dep3", "depType": "dependencies", - "nestedVersion": true, + "managerData": Object { + "nestedVersion": true, + }, "skipReason": "path-dependency", }, Object { @@ -29,7 +35,9 @@ Array [ "datasource": "pypi", "depName": "dep4", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "skipReason": "path-dependency", }, Object { @@ -37,21 +45,27 @@ Array [ "datasource": "pypi", "depName": "extra_dep1", "depType": "extras", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "^0.9.4", "datasource": "pypi", "depName": "extra_dep2", "depType": "extras", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "^0.4.0", "datasource": "pypi", "depName": "extra_dep3", "depType": "extras", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, ] `; @@ -63,42 +77,54 @@ Array [ "datasource": "pypi", "depName": "dep1_", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "0.0.0", "datasource": "pypi", "depName": "dep1", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "^0.6.0", "datasource": "pypi", "depName": "dep2", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "^0.33.6", "datasource": "pypi", "depName": "dep3", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "^3.0", "datasource": "pypi", "depName": "dev_dep1", "depType": "dev-dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "Invalid version.", "datasource": "pypi", "depName": "dev_dep2", "depType": "dev-dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "skipReason": "unknown-version", }, Object { @@ -106,21 +132,27 @@ Array [ "datasource": "pypi", "depName": "extra_dep1", "depType": "extras", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "^0.9.4", "datasource": "pypi", "depName": "extra_dep2", "depType": "extras", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, Object { "currentValue": "^0.4.0", "datasource": "pypi", "depName": "extra_dep3", "depType": "extras", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, }, ] `; @@ -132,7 +164,9 @@ Array [ "datasource": "pypi", "depName": "foo", "depType": "dependencies", - "nestedVersion": false, + "managerData": Object { + "nestedVersion": false, + }, "skipReason": "multiple-constraint-dep", }, ] diff --git a/test/manager/poetry/update.spec.js b/test/manager/poetry/update.spec.js index d821307c3fa28c6f00e8da79a2afb3b155effe46..a937cfe7e17104f09ae5e6ca304f447cf0ec1fba 100644 --- a/test/manager/poetry/update.spec.js +++ b/test/manager/poetry/update.spec.js @@ -18,6 +18,7 @@ describe('manager/poetry/update', () => { depName: 'dep1', depType: 'dependencies', newValue: '1.0.0', + managerData: { nestedVersion: false }, }; const res = updateDependency(pyproject1toml, upgrade); expect(res).not.toEqual(pyproject1toml); @@ -29,6 +30,7 @@ describe('manager/poetry/update', () => { depName: 'dep1', depType: 'dependencies', newValue: '0.0.0', + managerData: { nestedVersion: false }, }; const res = updateDependency(pyproject1toml, upgrade); expect(res).toEqual(pyproject1toml); @@ -38,7 +40,7 @@ describe('manager/poetry/update', () => { depName: 'dep1', depType: 'dependencies', newValue: '1.0.0', - nestedVersion: true, + managerData: { nestedVersion: true }, }; const res = updateDependency(pyproject2toml, upgrade); expect(res).not.toEqual(pyproject2toml); @@ -50,7 +52,7 @@ describe('manager/poetry/update', () => { depName: 'dep3', depType: 'dependencies', newValue: '1.0.0', - nestedVersion: true, + managerData: { nestedVersion: true }, }; const res = updateDependency(pyproject2toml, upgrade); expect(res).not.toEqual(pyproject2toml); @@ -62,7 +64,7 @@ describe('manager/poetry/update', () => { depName: 'dep4', depType: 'dependencies', newValue: '1.0.0', - nestedVersion: true, + managerData: { nestedVersion: true }, }; const res = updateDependency(pyproject2toml, upgrade); expect(res).toBeNull(); @@ -72,6 +74,7 @@ describe('manager/poetry/update', () => { depName: 'extra_dep1', depType: 'extras', newValue: '1.0.0', + managerData: { nestedVersion: false }, }; const res = updateDependency(pyproject1toml, upgrade); expect(res).not.toEqual(pyproject1toml); @@ -83,6 +86,7 @@ describe('manager/poetry/update', () => { depName: 'dev_dep1', depType: 'dev-dependencies', newValue: '1.0.0', + managerData: { nestedVersion: false }, }; const res = updateDependency(pyproject1toml, upgrade); expect(res).not.toEqual(pyproject1toml); @@ -98,6 +102,7 @@ describe('manager/poetry/update', () => { depName: 'dev1', depType: '!invalid-dev-type!', newValue: '1.0.0', + managerData: { nestedVersion: false }, }; const res = updateDependency(pyproject1toml, upgrade); expect(res).toBeNull(); @@ -107,6 +112,7 @@ describe('manager/poetry/update', () => { depName: 'dev_dev1', depType: 'dev-dependencies', newValue: '1.0.0', + managerData: { nestedVersion: false }, }; const res = updateDependency(pyproject2toml, upgrade); expect(res).toBeNull(); @@ -116,6 +122,7 @@ describe('manager/poetry/update', () => { depName: '~invalid-dep-name~', depType: 'dependencies', newValue: '1.0.0', + managerData: { nestedVersion: false }, }; const res = updateDependency(pyproject1toml, upgrade); expect(res).toBeNull(); @@ -124,7 +131,7 @@ describe('manager/poetry/update', () => { const upgrade = { depName: '~invalid-dep-name~', depType: 'dependencies', - nestedVersion: true, + managerData: { nestedVersion: true }, newValue: '1.0.0', }; const res = updateDependency(pyproject2toml, upgrade);