Some bug fixes for the iterate on an issue DSL

danger · Jun 9, 2018 · eb0fc73 · eb0fc73
1 parent 79d1881
commit eb0fc73
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,10 @@
 
 ## Master
 
+# 3.7.16
+
+* More work on `danger.github.utils.createUpdatedIssueWithID`. - [@orta][]
+
 # 3.7.15
 
 * Turns on the strict mode in the typescript compiler, this only gave build errors, so I was basically there anyway.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "danger",
-  "version": "3.7.15",
+  "version": "3.7.16",
   "description": "Unit tests for Team Culture",
   "main": "distribution/danger.js",
   "typings": "distribution/danger.d.ts",

diff --git a/source/platforms/github/GitHubUtils.ts b/source/platforms/github/GitHubUtils.ts
@@ -76,9 +76,9 @@ export const createUpdatedIssueWithIDGenerator = (api: GitHub) => async (
   // Could also scope:
   //   by author
   //   by label
-  //   by repo
-  const uniqueHeader = `Danger-ID: ${id.replace(/ /g, "_")}`
-  const { data: searchResults } = await api.search.issues({ q: uniqueHeader })
+  const uniqueHeader = `Danger-Issue-ID-${id.replace(/ /g, "_")}`
+  const q = `user:${settings.owner} repo:${settings.repo} ${uniqueHeader}`
+  const { data: searchResults } = await api.search.issues({ q })
   d(`Got ${searchResults.total_count} for ${uniqueHeader}`)
 
   const body = `${content}\n\n${uniqueHeader}`
@@ -87,6 +87,7 @@ export const createUpdatedIssueWithIDGenerator = (api: GitHub) => async (
 
   if (searchResults.total_count > 0 && searchResults.items[0]) {
     const issueToUpdate = searchResults.items[0]
+    d(`Found: ${issueToUpdate}`)
     const { data: issue } = await api.issues.edit({ body, owner, repo, title, number: issueToUpdate.number, state })
     return issue.html_url
   } else {

diff --git a/source/runner/runners/inline.ts b/source/runner/runners/inline.ts
@@ -108,7 +108,7 @@ export const runDangerfileEnvironment = async (
       // without the scheduler
       await runAllScheduledTasks(environment.results)
     } catch (error) {
-      console.error("Unable to evaluate the Dangerfile\n", error)
+      console.log("Unable to evaluate the Dangerfile\n", error)
       d("Got a parse error: ", error)
 
       // Call the internal functions to fail the build