Fix a problem with a big comment for the same file/line

danger · Apr 1, 2018 · 672d573 · 672d573
1 parent 40ebf98
commit 672d573
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 6 deletions.
diff --git a/source/runner/_tests/fixtures/ExampleDangerResults.ts b/source/runner/_tests/fixtures/ExampleDangerResults.ts
@@ -49,6 +49,25 @@ export const inlineRegularResults: DangerResults = {
   markdowns: [],
 }
 
+export const inlineRegularResultsForTheSameLine: DangerResults = {
+  messages: [
+    { message: "Test message", file: "File.swift", line: 10 },
+    { message: "Warning message", file: "File.swift", line: 10 },
+  ],
+  warnings: [
+    { message: "Test message", file: "File.swift", line: 10 },
+    { message: "Warning message", file: "File.swift", line: 10 },
+  ],
+  fails: [
+    { message: "Test message", file: "File.swift", line: 10 },
+    { message: "Warning message", file: "File.swift", line: 10 },
+  ],
+  markdowns: [
+    { message: "Test message", file: "File.swift", line: 10 },
+    { message: "Warning message", file: "File.swift", line: 10 },
+  ],
+}
+
 export const failsResults: DangerResults = {
   fails: [{ message: "Failing message" }],
   warnings: [],

diff --git a/source/runner/templates/_tests/__snapshots__/_githubIssueTemplates.test.ts.snap b/source/runner/templates/_tests/__snapshots__/_githubIssueTemplates.test.ts.snap
@@ -1,5 +1,28 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`generating inline messages Shows correct message for multiple inline violations for the same file and line 1`] = `
+"
+<!--
+  2 failure:  Test message, Warning message
+  2 warning:  Test message, Warning message
+  2 messages
+  2 markdown notices
+  DangerID: danger-id-blankID;
+  File: File.swift;
+  Line: 10;
+-->  
+- :no_entry_sign: Test message
+- :no_entry_sign: Warning message
+- :warning: Test message
+- :warning: Warning message
+- :book: Test message
+- :book: Warning message
+Test message
+
+Warning message
+  "
+`;
+
 exports[`generating inline messages Shows correct messages for inline/regular violations 1`] = `
 "
 <!--

diff --git a/source/runner/templates/_tests/_githubIssueTemplates.test.ts b/source/runner/templates/_tests/_githubIssueTemplates.test.ts
@@ -7,6 +7,7 @@ import {
   messagesResults,
   markdownResults,
   inlineRegularResults,
+  inlineRegularResultsForTheSameLine,
 } from "../../_tests/fixtures/ExampleDangerResults"
 import {
   template as githubResultsTemplate,
@@ -124,4 +125,10 @@ describe("generating inline messages", () => {
 
     expect(issues).toMatchSnapshot()
   })
+
+  it("Shows correct message for multiple inline violations for the same file and line", () => {
+    const issues = githubResultsInlineTemplate("blankID", inlineRegularResultsForTheSameLine, "File.swift", 10)
+
+    expect(issues).toMatchSnapshot()
+  })
 })
diff --git a/source/runner/templates/bitbucketServerTemplate.ts b/source/runner/templates/bitbucketServerTemplate.ts
@@ -70,9 +70,9 @@ export function inlineTemplate(results: DangerResults): string {
   }
 
   return `
-${results.fails.map(printViolation("no_entry_sign"))}
-${results.warnings.map(printViolation("warning"))}
-${results.messages.map(printViolation("book"))}
+${results.fails.map(printViolation("no_entry_sign")).join("\n")}
+${results.warnings.map(printViolation("warning")).join("\n")}
+${results.messages.map(printViolation("book")).join("\n")}
 ${results.markdowns.map(v => v.message).join("\n\n")}
   `
 }
diff --git a/source/runner/templates/githubIssueTemplate.ts b/source/runner/templates/githubIssueTemplate.ts
@@ -99,9 +99,9 @@ export function inlineTemplate(dangerID: string, results: DangerResults, file: s
 ${buildSummaryMessage(dangerID, results)}
 ${fileLineToString(file, line)}
 -->  
-${results.fails.map(printViolation("no_entry_sign"))}
-${results.warnings.map(printViolation("warning"))}
-${results.messages.map(printViolation("book"))}
+${results.fails.map(printViolation("no_entry_sign")).join("\n")}
+${results.warnings.map(printViolation("warning")).join("\n")}
+${results.messages.map(printViolation("book")).join("\n")}
 ${results.markdowns.map(v => v.message).join("\n\n")}
   `
 }