Add merge commit to test data

cookpete · Dec 21, 2017 · 4462118 · 4462118
1 parent 3323916
commit 4462118
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/test/commits.js b/test/commits.js
@@ -40,7 +40,7 @@ describe('parseCommits', () => {
   it('supports startingCommit option', async () => {
     const gitLog = await readFile(join(__dirname, 'data', 'git-log.txt'), 'utf-8')
     const options = { startingCommit: '17fbef87e82889f01d8257900f7edc55b05918a2' }
-    expect(parseCommits(gitLog, origins.github, options)).to.have.length(9)
+    expect(parseCommits(gitLog, origins.github, options)).to.have.length(10)
   })
 
   it('invalid startingCommit throws an error', done => {

diff --git a/test/data/commits.js b/test/data/commits.js
@@ -133,6 +133,22 @@ export default [
     },
     "href": "https://github.com/user/repo/commit/0e24bf427a51eac52133cc731b4b5d74a7e04672"
   },
+  {
+    "hash": "92839699a6aaea148dcd72ea897321e66cae0c18",
+    "shorthash": "9283969",
+    "author": "Pete Cook",
+    "email": "email@example.com",
+    "date": "2015-12-29T11:35:54+00:00",
+    "tag": null,
+    "subject": "Merge remote-tracking branch 'random-branch' into master",
+    "message": "Merge remote-tracking branch 'random-branch' into master",
+    "fixes": null,
+    "merge": null,
+    "href": "https://github.com/user/repo/commit/92839699a6aaea148dcd72ea897321e66cae0c18",
+    "files": 1,
+    "insertions": 1,
+    "deletions": 0
+  },
   {
     "hash": "17fbef87e82889f01d8257900f7edc55b05918a2",
     "shorthash": "17fbef8",

diff --git a/test/data/git-log.txt b/test/data/git-log.txt
@@ -72,6 +72,15 @@ Merge pull request #5 from repo/branch
 
 Should not parse #4 in PR title
 __AUTO_CHANGELOG_MESSAGE_SEPARATOR__
+__AUTO_CHANGELOG_COMMIT_SEPARATOR__92839699a6aaea148dcd72ea897321e66cae0c18
+
+2015-12-29T11:35:54+00:00
+Pete Cook
+email@example.com
+Merge remote-tracking branch 'random-branch' into master
+__AUTO_CHANGELOG_MESSAGE_SEPARATOR__
+ 1 file changed, 1 insertion(+)
+
 __AUTO_CHANGELOG_COMMIT_SEPARATOR__17fbef87e82889f01d8257900f7edc55b05918a2
 
 2015-12-28T11:35:54+00:00