Merge 0b306da into ff0ddae

github-tools · May 25, 2021 · 960dbb2 · 960dbb2
2 parents ff0ddae + 0b306da
commit 960dbb2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/lib/src/Gren.js b/lib/src/Gren.js
@@ -430,7 +430,7 @@ class Gren {
         const { headers: { link }, data: prs } = results;
         const totalPages = this._getLastPage(link);
         const filterPrs = prs.filter(pr => pr.merged_at);
-        if (prs.length > 0 && since < prs[prs.length - 1].updated_at &&
+        if (prs.length > 0 && since < (new Date(prs[prs.length - 1].updated_at)) &&
             totalPages && +page < totalPages) {
             return this._getMergedPullRequests(since, page + 1).then(prsResults => prsResults.concat(filterPrs));
         }

diff --git a/lib/src/_utils.js b/lib/src/_utils.js
@@ -160,7 +160,7 @@ function convertStringToArray(arrayLike) {
 * @return {string}
 */
 function formatDate(date) {
-    return ('0' + date.getDate()).slice(-2) + '/' + ('0' + (date.getMonth() + 1)).slice(-2) + '/' + date.getFullYear();
+    return ('0' + date.getUTCDate()).slice(-2) + '/' + ('0' + (date.getUTCMonth() + 1)).slice(-2) + '/' + date.getUTCFullYear();
 }
 
 /**

diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
     "description": "Create a release from a tag and uses issues or commits to creating the release notes. It also can generate a CHANGELOG.md file based on the release notes (or generate a brand new).",
     "main": "./github-release-notes.js",
     "scripts": {
+        "build": "gulp build",
         "start": "node github-release-notes.js",
         "test": "./node_modules/.bin/nyc mocha --reporter=nyan --compilers=js:babel-register",
         "coverage": "nyc --reporter=lcov --reporter=text mocha --compilers=js:babel-register",

diff --git a/test/Gren.spec.js b/test/Gren.spec.js
@@ -220,12 +220,10 @@ describe('Gren', () => {
                     'Others:': ['closed']
                 };
 
-                gren.options.groupPostProcessor = (groupContent) => {
-                    return groupContent.replace(0, groupContent.indexOf(':\n') + 3);
-                }
+                gren.options.groupPostProcessor = (groupContent) => groupContent.replace(0, groupContent.indexOf(':\n') + 3);
 
-                assert.deepEqual(gren._groupBy(normal), [`Test:`], 'Passing one heading for one issue');
-                assert.deepEqual(gren._groupBy(noLabel), [`Others:`], 'Group option is "label" with no labels');
+                assert.deepEqual(gren._groupBy(normal), [`Test:\nIssue with one label and milestone`], 'Passing one heading for one issue');
+                assert.deepEqual(gren._groupBy(noLabel), [`Others:\nIssue with no milestone and no labels`], 'Group option is "label" with no labels');
             });
         });