Adjust tests to support new features

Author: cjbarth

lib/src/Gren.js

@@ -1114,7 +1114,7 @@ class Gren {
 
         const tags = await this._getAllTags(releases.length ? releases : false);
         const branchCommitShas = (await this._getAllCommitsForBranch(this.options.head)).map(commit => commit.sha);
-        const filteredTags = tags.filter(tag => branchCommitShas.includes(tag.commit.sha));
+        const filteredTags = tags.filter(tag => branchCommitShas.includes(tag.commit?.sha || tag.tag.commit?.sha));
 
         this._validateRequiredTagsExists(filteredTags, this.options.tags);
 

package.json

@@ -6,6 +6,8 @@
     "scripts": {
         "changelog": "node bin/gren.js changelog --override --generate --head master",
         "build": "gulp build",
+        "prerelease": "git clean -xfd && npm ci && npm test && npm run build",
+        "release": "release-it",
         "start": "node github-release-notes.js",
         "test": "./node_modules/.bin/nyc mocha --reporter=nyan --require @babel/register",
         "coverage": "nyc --reporter=lcov --reporter=text mocha --require @babel/register",

test/Gren.spec.js

@@ -72,7 +72,7 @@ describe('Gren', () => {
             });
         });
 
-        it('Should return ranges of Objects', () => {
+        it('Should return ranges of Objects', async () => {
             const rangedBlocks = [
                 [
                     {
@@ -100,10 +100,10 @@ describe('Gren', () => {
                 ]
             ];
 
-            assert.deepEqual(gren._createReleaseRanges(blocks), rangedBlocks, 'Given release blocks');
-
+            assert.deepEqual(await gren._createReleaseRanges(blocks), rangedBlocks, 'Given release blocks');
+          
             gren.options.tags = 'all';
-            assert.deepEqual(gren._createReleaseRanges(blocks), rangedBlocks.concat([[
+            assert.deepEqual(await gren._createReleaseRanges(blocks), rangedBlocks.concat([[
                 {
                     date: '2016-09-01T23:00:00.000Z'
                 },
@@ -639,32 +639,28 @@ describe('Gren', () => {
         });
 
         describe('_getReleaseBlocks', () => {
-            it('more than one tag', done => {
+            it('more than one tag', async () => {
                 gren.options.tags = ['0.17.2', '0.17.1'];
                 gren.options.dataSource = 'commits';
-                gren._getReleaseBlocks()
+                await gren._getReleaseBlocks()
                     .then(releaseBlocks => {
                         assert.isArray(releaseBlocks, 'The releaseBlocks is an Array');
                         releaseBlocks.forEach(block => {
                             assert.hasAllKeys(block, ['id', 'release', 'name', 'published_at', 'body']);
                         });
-                        done();
                     })
-                    .catch(err => done(err));
             }).timeout(10000);
 
-            it('just one tag', done => {
+            it('just one tag', async () => {
                 gren.options.tags = ['0.17.2'];
                 gren.options.dataSource = 'commits';
-                gren._getReleaseBlocks()
+                await gren._getReleaseBlocks()
                     .then(releaseBlocks => {
                         assert.isArray(releaseBlocks, 'The releaseBlocks is an Array');
                         releaseBlocks.forEach(block => {
                             assert.hasAllKeys(block, ['id', 'release', 'name', 'published_at', 'body']);
                         });
-                        done();
                     })
-                    .catch(err => done(err));
             }).timeout(10000);
         });
     });