Merge pull request #17 from erichbehrens/fix/rendering-error

Fix rendering error for repositories without tests

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## v1.5.3
+
+- Bugfix for repositories without tests
+- Updated extension icon
+
 ## v1.5.2
 
 - Bugfix

package.json

@@ -3,7 +3,7 @@
     "displayName": "GitHub Pull Request Monitor",
     "description": "Monitors the status of GitHub pull requests. Checks for conflicts, status reports, reviews and whether the branch is  up to date.",
     "icon": "icon.png",
-    "version": "1.5.2",
+    "version": "1.5.3",
     "publisher": "erichbehrens",
     "author": "Erich Behrens <[email protected]>",
     "license": "MIT",

src/utils.js

@@ -40,9 +40,24 @@ exports.getMergeableState = (pr, reviews) => {
 	// https://developer.github.com/v4/reference/enum/mergeablestate/
 	const commit = pr.commits.nodes[0].commit.status;
 	const { potentialMergeCommit } = pr;
-	if (['MERGED', 'CLOSED'].includes(pr.state)) return pr.state;
-	if (pr.mergeable === 'MERGEABLE' && reviews && (commit === null /* no tests defined */ || commit.state === 'SUCCESS') && potentialMergeCommit && potentialMergeCommit.status === null) return 'MERGEABLE';
-	if (!reviews || commit.state === 'FAILURE' || pr.mergeable === 'CONFLICTING') return 'FAILURE';
+	if (['MERGED', 'CLOSED'].includes(pr.state)) {
+		return pr.state;
+	}
+	if (
+		pr.mergeable === 'MERGEABLE' &&
+		reviews &&
+		(commit === null /* no tests defined */ || commit.state === 'SUCCESS') &&
+		potentialMergeCommit && potentialMergeCommit.status === null
+	) {
+		return 'MERGEABLE';
+	}
+	if (
+		pr.mergeable === 'CONFLICTING' ||
+		!reviews ||
+		(commit !== null /* tests definied */ && commit.state === 'FAILURE')
+	) {
+		return 'FAILURE';
+	}
 	return 'OPEN';
 };