Add a CHANGELOG entry about the fixes to danger.github.utils

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 // ### Master
 
+### 2.0.0-beta.2
+
+- Fixes a bug with `danger.github.utils` in that it didn't work as of b1, and now it does :+1: - [@orta][]
+
 ### 2.0.0-beta.1
 
 - Converts the command `danger` (and `danger run`) to use `danger process` under the hood. What does this do?

dangerfile.ts

@@ -2,10 +2,6 @@
 // This means we can re-use the type infra from the app, without having to
 // fake the import.
 
-// console.log(global)
-// console.log(require)
-// console.log(require.extensions)
-
 import { DangerDSLType } from "./source/dsl/DangerDSL"
 declare var danger: DangerDSLType
 // declare var results: any
@@ -21,7 +17,7 @@ import * as fs from "fs"
 
 schedule(async () => {
   // Request a CHANGELOG entry if not declared #trivial
-  const hasChangelog = danger.git.modified_files.includes("changelog.md")
+  const hasChangelog = danger.git.modified_files.includes("CHANGELOG.md")
   const isTrivial = (danger.github.pr.body + danger.github.pr.title).includes("#trivial")
   const isGreenkeeper = danger.github.pr.user.login === "greenkeeper"
 
@@ -72,10 +68,7 @@ if (missing.length) {
   warn(`These providers are missing from the README: ${sentence(missing)}`)
 }
 
-console.log("before")
 danger.github.utils.fileContents("scripts/run-fixtures.js").then(fixtures => {
-  console.log("after")
-  console.log(fixtures)
   if (fixtures.includes("const writeResults = true")) {
     fail("Fixtures test script is still in write mode, edit `scripts/run-fixtures.js`.")
   }

scripts/run-fixtures.js

@@ -10,7 +10,7 @@ const chalk = require("chalk")
 const expect = require("expect")
 
 // Toggle this on to update the JSON files for each run
-const writeResults = true
+const writeResults = false
 console.log("If this script fails, you probably want to update the fixtures - just edit script/run-fixtures.js")
 const runnerFileJS = "distribution/commands/danger-runner.js"
 

source/runner/runners/inline.ts

@@ -2,7 +2,7 @@ import * as fs from "fs"
 
 import * as _require from "require-from-string"
 
-import { DangerResults } from "../../dsl/DangerResults"
+import { DangerResults, DangerRuntimeContainer } from "../../dsl/DangerResults"
 import { DangerContext } from "../../runner/Dangerfile"
 
 import { DangerRunner } from "./runner"
@@ -66,6 +66,11 @@ export async function runDangerfileEnvironment(
 
     _require(compiled, filename, {})
 
+    // Don't stop all current async code from breaking,
+    // however new code (without Peril support) can run
+    // without the scheduler
+    await runAllScheduledTasks(environment.results)
+
     return environment.results
   } catch (error) {
     console.error("Unable to evaluate the Dangerfile")
@@ -74,6 +79,23 @@ export async function runDangerfileEnvironment(
   }
 }
 
+const runAllScheduledTasks = async (results: DangerRuntimeContainer) => {
+  if (results.scheduled) {
+    await Promise.all(
+      results.scheduled.map((fnOrPromise: any) => {
+        if (fnOrPromise instanceof Promise) {
+          return fnOrPromise
+        }
+        if (fnOrPromise.length === 1) {
+          // callback-based function
+          return new Promise(res => fnOrPromise(res))
+        }
+        return fnOrPromise()
+      })
+    )
+  }
+}
+
 const defaultExport: DangerRunner = {
   createDangerfileRuntimeEnvironment,
   runDangerfileEnvironment,