diff --git a/lib/datasource/gradle-version/__snapshots__/index.spec.ts.snap b/lib/datasource/gradle-version/__snapshots__/index.spec.ts.snap index 52ae5d3180b2b0..d12e5606719bbd 100644 --- a/lib/datasource/gradle-version/__snapshots__/index.spec.ts.snap +++ b/lib/datasource/gradle-version/__snapshots__/index.spec.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`datasource/gradle getPkgReleases calls configured registryUrls 1`] = ` +exports[`datasource/gradle-version getPkgReleases calls configured registryUrls 1`] = ` Object { "homepage": "https://gradle.org", "releases": Array [ @@ -669,7 +669,7 @@ Object { } `; -exports[`datasource/gradle getPkgReleases processes real data 1`] = ` +exports[`datasource/gradle-version getPkgReleases processes real data 1`] = ` Object { "homepage": "https://gradle.org", "releases": Array [ diff --git a/lib/datasource/gradle-version/index.spec.ts b/lib/datasource/gradle-version/index.spec.ts index 015c2774b3bb77..5a3485a25e2091 100644 --- a/lib/datasource/gradle-version/index.spec.ts +++ b/lib/datasource/gradle-version/index.spec.ts @@ -13,7 +13,7 @@ const allResponse: any = fs.readFileSync( let config: datasource.PkgReleaseConfig = {}; -describe('datasource/gradle', () => { +describe('datasource/gradle-version', () => { describe('getPkgReleases', () => { beforeEach(() => { config = { @@ -24,39 +24,6 @@ describe('datasource/gradle', () => { return global.renovateCache.rmAll(); }); - it('throws for empty result', async () => { - got.mockReturnValueOnce({ body: {} }); - await expect( - datasource.getPkgReleases({ - ...config, - }) - ).rejects.toThrow(); - }); - - it('throws for 404', async () => { - got.mockImplementationOnce(() => - Promise.reject({ - statusCode: 404, - }) - ); - await expect( - datasource.getPkgReleases({ - ...config, - }) - ).rejects.toThrow(); - }); - - it('throws for unknown error', async () => { - got.mockImplementationOnce(() => { - throw new Error(); - }); - await expect( - datasource.getPkgReleases({ - ...config, - }) - ).rejects.toThrow(); - }); - it('processes real data', async () => { got.mockReturnValueOnce({ body: JSON.parse(allResponse), diff --git a/lib/datasource/gradle-version/index.ts b/lib/datasource/gradle-version/index.ts index d248eca06f4888..cefc2932a5db4a 100644 --- a/lib/datasource/gradle-version/index.ts +++ b/lib/datasource/gradle-version/index.ts @@ -48,24 +48,25 @@ export async function getPkgReleases({ checksumUrl: release.checksumUrl, })); return releases; - } catch (err) { - logger.debug({ err }); - if (!(err.statusCode === 404 || err.code === 'ENOTFOUND')) { - logger.warn({ err }, 'Gradle release lookup failure: Unknown error'); - } + } catch (err) /* istanbul ignore next */ { // istanbul ignore if if (err.host === 'services.gradle.org') { throw new DatasourceError(err); } + logger.debug({ err }, 'gradle-version err'); return null; } }) ); - const gradle: ReleaseResult = { - releases: Array.prototype.concat.apply([], allReleases), + const res: ReleaseResult = { + releases: Array.prototype.concat.apply([], allReleases).filter(Boolean), homepage: 'https://gradle.org', sourceUrl: 'https://github.com/gradle/gradle', }; - return gradle; + if (res.releases.length) { + return res; + } + // istanbul ignore next + return null; }