diff --git a/lib/workers/pr/changelog/index.js b/lib/workers/pr/changelog/index.js index 5d2f804ba12a666b563885373cea351780ddb1d8..6c80632d3e2ac2b56960b13f5ce91b11e3fd5250 100644 --- a/lib/workers/pr/changelog/index.js +++ b/lib/workers/pr/changelog/index.js @@ -1,5 +1,4 @@ const versioning = require('../../../versioning'); -const { addReleaseNotes } = require('./release-notes'); const sourceGithub = require('./source-github'); @@ -42,15 +41,14 @@ async function getChangeLogJSON(args) { try { const res = await sourceGithub.getChangeLogJSON({ ...args }); - const output = await addReleaseNotes(res); const cacheMinutes = 60; await renovateCache.set( cacheNamespace, getCacheKey(args), - output, + res, cacheMinutes ); - return output; + return res; } catch (err) /* istanbul ignore next */ { logger.error( { err, message: err.message, stack: err.stack }, diff --git a/lib/workers/pr/changelog/source-github.js b/lib/workers/pr/changelog/source-github.js index 6bf4ec93344991142774a039ad463e5c4240982d..cc1068f1093669db52b7986c22794641d2171707 100644 --- a/lib/workers/pr/changelog/source-github.js +++ b/lib/workers/pr/changelog/source-github.js @@ -2,6 +2,7 @@ const URL = require('url'); const endpoints = require('../../../util/endpoints'); const versioning = require('../../../versioning'); const ghGot = require('../../../platform/github/gh-got-wrapper'); +const { addReleaseNotes } = require('./release-notes'); module.exports = { getChangeLogJSON, @@ -131,7 +132,7 @@ async function getChangeLogJSON({ } } - const res = { + let res = { project: { githubBaseURL, github: repository, @@ -140,6 +141,7 @@ async function getChangeLogJSON({ versions: changelogReleases, }; - logger.debug({ res }, 'Manual res'); + res = await addReleaseNotes(res); + return res; } diff --git a/test/workers/pr/__snapshots__/changelog.spec.js.snap b/test/workers/pr/changelog/__snapshots__/index.spec.js.snap similarity index 100% rename from test/workers/pr/__snapshots__/changelog.spec.js.snap rename to test/workers/pr/changelog/__snapshots__/index.spec.js.snap diff --git a/test/workers/pr/__snapshots__/release-notes.spec.js.snap b/test/workers/pr/changelog/__snapshots__/release-notes.spec.js.snap similarity index 100% rename from test/workers/pr/__snapshots__/release-notes.spec.js.snap rename to test/workers/pr/changelog/__snapshots__/release-notes.spec.js.snap diff --git a/test/workers/pr/changelog.spec.js b/test/workers/pr/changelog/index.spec.js similarity index 92% rename from test/workers/pr/changelog.spec.js rename to test/workers/pr/changelog/index.spec.js index 4df4f1f32eb029cf1d1c18fcaa21f1739a867ef9..5311d358a4057fbbba40e8fb4af59b689408ced3 100644 --- a/test/workers/pr/changelog.spec.js +++ b/test/workers/pr/changelog/index.spec.js @@ -1,11 +1,14 @@ -jest.mock('../../../lib/platform/github/gh-got-wrapper'); -jest.mock('../../../lib/datasource/npm'); +jest.mock('../../../../lib/platform/github/gh-got-wrapper'); +jest.mock('../../../../lib/datasource/npm'); jest.mock('got'); -const endpoints = require('../../../lib/util/endpoints'); -const ghGot = require('../../../lib/platform/github/gh-got-wrapper'); +const endpoints = require('../../../../lib/util/endpoints'); +const ghGot = require('../../../../lib/platform/github/gh-got-wrapper'); -const { getChangeLogJSON } = require('../../../lib/workers/pr/changelog'); +const { getChangeLogJSON } = require('../../../../lib/workers/pr/changelog'); +const releaseNotes = require('../../../../lib/workers/pr/changelog/release-notes'); + +releaseNotes.addReleaseNotes = jest.fn(input => input); const upgrade = { depName: 'renovate', diff --git a/test/workers/pr/release-notes.spec.js b/test/workers/pr/changelog/release-notes.spec.js similarity index 93% rename from test/workers/pr/release-notes.spec.js rename to test/workers/pr/changelog/release-notes.spec.js index b140b605ee8ac53067acf059d60f0bd04baa18a1..252415cb9fa9ac0669af7e9b3c7d627c5c7bf79a 100644 --- a/test/workers/pr/release-notes.spec.js +++ b/test/workers/pr/changelog/release-notes.spec.js @@ -1,9 +1,10 @@ const fs = require('fs-extra'); const ghGot = require('gh-got'); const { + addReleaseNotes, getReleaseNotes, getReleaseNotesMd, -} = require('../../../lib/workers/pr/changelog/release-notes'); +} = require('../../../../lib/workers/pr/changelog/release-notes'); const angularJsChangelogMd = fs.readFileSync( 'test/_fixtures/changelog-md/angular.js.md', @@ -28,6 +29,12 @@ const contentsResponse = [ jest.mock('gh-got'); describe('workers/pr/release-notes', () => { + describe('addReleaseNotes()', () => { + it('returns input if invalid', async () => { + const input = { a: 1 }; + expect(await addReleaseNotes(input)).toEqual(input); + }); + }); describe('getReleaseNotes()', () => { it('gets release notes', async () => { ghGot.mockReturnValueOnce({