diff --git a/lib/manager/gradle/shallow/__snapshots__/extract.spec.ts.snap b/lib/manager/gradle/shallow/__snapshots__/extract.spec.ts.snap new file mode 100644 index 0000000000000000000000000000000000000000..45b6e6f532bbeed97957d4f07f9ec85e5a59f292 --- /dev/null +++ b/lib/manager/gradle/shallow/__snapshots__/extract.spec.ts.snap @@ -0,0 +1,31 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`manager/gradle/shallow/extract extracts from cross-referenced files 1`] = ` +Array [ + Object { + "datasource": "maven", + "deps": Array [ + Object { + "currentValue": "1.2.3", + "depName": "foo:bar", + "fileReplacePosition": 4, + "groupName": "baz", + "managerData": Object { + "fileReplacePosition": 4, + "packageFile": "gradle.properties", + }, + "registryUrls": Array [ + "https://repo.maven.apache.org/maven2", + "https://example.com", + ], + }, + ], + "packageFile": "gradle.properties", + }, + Object { + "datasource": "maven", + "deps": Array [], + "packageFile": "build.gradle", + }, +] +`; diff --git a/lib/manager/gradle/shallow/extract.spec.ts b/lib/manager/gradle/shallow/extract.spec.ts index b013534067ded72b55238a4a8993f5a2d9ca06d4..2b4f4751eaeb5423cf320e8e59b5ed61fce5e047 100644 --- a/lib/manager/gradle/shallow/extract.spec.ts +++ b/lib/manager/gradle/shallow/extract.spec.ts @@ -33,81 +33,26 @@ describe('manager/gradle/shallow/extract', () => { expect(res).toBeNull(); }); - it('works', async () => { + it('extracts from cross-referenced files', async () => { mockFs({ 'gradle.properties': 'baz=1.2.3', 'build.gradle': 'url "https://example.com"; "foo:bar:$baz"', - 'settings.gradle': null, }); const res = await extractAllPackageFiles({} as ExtractConfig, [ 'build.gradle', 'gradle.properties', - 'settings.gradle', ]); - expect(res).toMatchObject([ + expect(res).toMatchSnapshot([ { packageFile: 'gradle.properties', - deps: [ - { - depName: 'foo:bar', - currentValue: '1.2.3', - registryUrls: [ - 'https://repo.maven.apache.org/maven2', - 'https://example.com', - ], - }, - ], - }, - { - datasource: 'maven', - deps: [], - packageFile: 'settings.gradle', + deps: [{ depName: 'foo:bar', currentValue: '1.2.3' }], }, { packageFile: 'build.gradle', deps: [] }, ]); }); - it('works with file-ext', async () => { - mockFs({ - 'gradle.properties': '', - 'build.gradle': 'url "https://example.com"; "foo:bar:1.2.3@zip"', - 'settings.gradle': null, - }); - - const res = await extractAllPackageFiles({} as ExtractConfig, [ - 'build.gradle', - 'gradle.properties', - 'settings.gradle', - ]); - - expect(res).toMatchObject([ - { - packageFile: 'gradle.properties', - deps: [], - }, - { - datasource: 'maven', - deps: [], - packageFile: 'settings.gradle', - }, - { - packageFile: 'build.gradle', - deps: [ - { - depName: 'foo:bar', - currentValue: '1.2.3', - registryUrls: [ - 'https://repo.maven.apache.org/maven2', - 'https://example.com', - ], - }, - ], - }, - ]); - }); - it('skips versions composed from multiple variables', async () => { mockFs({ 'build.gradle': diff --git a/lib/manager/gradle/shallow/parser.spec.ts b/lib/manager/gradle/shallow/parser.spec.ts index dbeaefb3e2d232294dee432c043ff91c2a860359..3518da4690ed8049bebffb14e90e2d85f6574a83 100644 --- a/lib/manager/gradle/shallow/parser.spec.ts +++ b/lib/manager/gradle/shallow/parser.spec.ts @@ -205,6 +205,21 @@ describe('manager/gradle/shallow/parser', () => { skipReason: SkipReason.Ignored, }, ]); + + ({ deps } = parseGradle('url "https://example.com"; "foo:bar:1.2.3@zip"')); + expect(deps).toMatchInlineSnapshot(` + Array [ + Object { + "currentValue": "1.2.3", + "dataType": "zip", + "depName": "foo:bar", + "managerData": Object { + "fileReplacePosition": 36, + "packageFile": undefined, + }, + }, + ] + `); }); it('parses plugin', () => { let deps;