From 439367e22319b0c58015256ec2cad6fbe2bd5e65 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@keylocation.sg>
Date: Fri, 16 Jun 2017 09:46:57 +0200
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20show=20commit=20details=20when?=
=?UTF-8?q?=20none=20present=20(#311)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes #308
---
lib/config/templates/group-pr-body.hbs | 5 +++--
lib/config/templates/pr-body.hbs | 4 ++--
test/workers/__snapshots__/pr.spec.js.snap | 3 +++
test/workers/pr.spec.js | 3 +--
4 files changed, 9 insertions(+), 6 deletions(-)
create mode 100644 test/workers/__snapshots__/pr.spec.js.snap
diff --git a/lib/config/templates/group-pr-body.hbs b/lib/config/templates/group-pr-body.hbs
index 9ba59af454..a8896cb3c4 100644
--- a/lib/config/templates/group-pr-body.hbs
+++ b/lib/config/templates/group-pr-body.hbs
@@ -7,10 +7,11 @@ This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request renovates the package grou
### Commits
{{#each upgrades as |upgrade|}}
+{{#if upgrade.releases.length}}
<details>
<summary>{{upgrade.githubName}}</summary>
-
{{#each upgrade.releases as |release|}}
+
#### {{release.version}}
{{#each release.commits as |commit|}}
- [`{{commit.shortSha}}`]({{commit.url}}){{commit.message}}
@@ -18,9 +19,9 @@ This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request renovates the package grou
{{/each}}
</details>
+{{/if}}
{{/each}}
-<br />
<br />
This {{#if isGitHub}}PR{{else}}MR{{/if}} has been generated by [Renovate Bot](https://keylocation.sg/our-tech/renovate).
diff --git a/lib/config/templates/pr-body.hbs b/lib/config/templates/pr-body.hbs
index b6781c332c..d87b43ba52 100644
--- a/lib/config/templates/pr-body.hbs
+++ b/lib/config/templates/pr-body.hbs
@@ -1,4 +1,5 @@
This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request updates dependency [{{depName}}]({{repositoryUrl}}) from version `{{currentVersion}}` to `{{newVersion}}`
+{{#if releases.length}}
### Commits
@@ -13,8 +14,7 @@ This {{#if isGitHub}}Pull{{else}}Merge{{/if}} Request updates dependency [{{depN
{{/each}}
</details>
-
-<br />
+{{/if}}
<br />
This {{#if isGitHub}}PR{{else}}MR{{/if}} has been generated by [Renovate Bot](https://keylocation.sg/our-tech/renovate).
diff --git a/test/workers/__snapshots__/pr.spec.js.snap b/test/workers/__snapshots__/pr.spec.js.snap
new file mode 100644
index 0000000000..fddec193f4
--- /dev/null
+++ b/test/workers/__snapshots__/pr.spec.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`workers/pr ensurePr(upgrades) should return unmodified existing PR 1`] = `Array []`;
diff --git a/test/workers/pr.spec.js b/test/workers/pr.spec.js
index 23429b2d64..07674d8494 100644
--- a/test/workers/pr.spec.js
+++ b/test/workers/pr.spec.js
@@ -99,8 +99,6 @@ describe('workers/pr', () => {
- [\`abcdefg\`](https://github.com/renovateapp/dummy/commit/abcdefghijklmnopqrstuvwxyz)foo [#3](https://github.com/renovateapp/dummy/issues/3)
</details>
-
-<br />
<br />
This PR has been generated by [Renovate Bot](https://keylocation.sg/our-tech/renovate).`,
@@ -191,6 +189,7 @@ This PR has been generated by [Renovate Bot](https://keylocation.sg/our-tech/ren
config.api.getBranchPr = jest.fn(() => existingPr);
config.api.updatePr = jest.fn();
const pr = await prWorker.ensurePr([config]);
+ expect(config.api.updatePr.mock.calls).toMatchSnapshot();
expect(config.api.updatePr.mock.calls.length).toBe(0);
expect(pr).toMatchObject(existingPr);
});
--
GitLab