Merge empty comment fix changes pull #564

CHANGELOG.md

@@ -13,6 +13,7 @@
 
 ## Master
 
+* Fixed a bug where Danger posts empty main comment when it have one or more inline comments to post [@codestergit][]
 * fix bug when commiting .png files on BitBucket [@Mifi][]
 * Adds support for inline comments for bitbucket server. [@codestergit][]
 

source/dsl/DangerResults.ts

@@ -208,6 +208,10 @@ export function sortResults(results: DangerResults): DangerResults {
   }
 }
 
+export function isEmptyResults(results: DangerResults): boolean {
+  return [...results.fails, ...results.warnings, ...results.messages, ...results.markdowns].length === 0
+}
+
 export function resultsIntoInlineResults(results: DangerResults): DangerInlineResults[] {
   // Here we iterate through all keys ("fails", "warnings", "messages", "markdowns") and for each violation
   // in given kind we produce new DangerInlineResult or append a violation to existing result. This is all

source/dsl/_tests/DangerResults.test.ts

@@ -7,6 +7,7 @@ import {
   regularResults,
   sortInlineResults,
   validateResults,
+  isEmptyResults,
 } from "../DangerResults"
 import {
   singleViolationSingleFileResults,
@@ -89,6 +90,18 @@ describe("DangerResults operations", () => {
 
     expect(results).toMatchSnapshot()
   })
+
+  it("find empty results", () => {
+    const result = isEmptyResults(emptyDangerResults)
+
+    expect(result).toEqual(true)
+  })
+
+  it("find empty results", () => {
+    const result = isEmptyResults(multipleViolationSingleFileResults)
+
+    expect(result).toEqual(false)
+  })
 })
 
 describe("validation", () => {

source/dsl/_tests/fixtures/ExampleDangerResults.ts

@@ -53,6 +53,13 @@ export const multipleViolationsMultipleFilesResults: DangerResults = {
   ],
 }
 
+export const emptyDangerResults: DangerResults = {
+  fails: [],
+  warnings: [],
+  messages: [],
+  markdowns: [],
+}
+
 export const emptyDangerInlineResults: DangerInlineResults = {
   file: "",
   line: 0,

source/runner/Executor.ts

@@ -13,6 +13,7 @@ import {
   sortResults,
   sortInlineResults,
   validateResults,
+  isEmptyResults,
 } from "../dsl/DangerResults"
 import {
   template as githubResultsTemplate,
@@ -233,11 +234,16 @@ export class Executor {
       const inlineLeftovers = await this.sendInlineComments(inline, git, previousComments)
       const regular = regularResults(results)
       const mergedResults = sortResults(mergeResults(regular, inlineLeftovers))
-      const comment = process.env["DANGER_BITBUCKETSERVER_HOST"]
-        ? bitbucketServerTemplate(dangerID, mergedResults)
-        : githubResultsTemplate(dangerID, mergedResults)
 
-      await this.platform.updateOrCreateComment(dangerID, comment)
+      // If danger have no comments other than inline to update. Just delete previous main comment.
+      if (isEmptyResults(mergedResults)) {
+        this.platform.deleteMainComment(dangerID)
+      } else {
+        const comment = process.env["DANGER_BITBUCKETSERVER_HOST"]
+          ? bitbucketServerTemplate(dangerID, mergedResults)
+          : githubResultsTemplate(dangerID, mergedResults)
+        await this.platform.updateOrCreateComment(dangerID, comment)
+      }
     }
 
     // More info, is more info.