Remove vm2 from Danger

Author: orta

CHANGELOG.md

@@ -15,6 +15,7 @@
 
 <!-- Your comment below this -->
 
+- Removed `vm2` from Danger, it's not being used in Peril now - [@orta][]
 - `danger pr` with `--json` or --js` now don't require a Dangerfile to be present - [@orta][]
 
 # 7.0.5

package.json

@@ -50,6 +50,7 @@
   "scripts": {
     "release": "release-it",
     "test": "jest",
+    "test:fixtures": "node ./scripts/run-fixtures.js",
     "test:watch": "jest --watch",
     "lint": "tslint \"source/**/*.ts\"",
     "lint:fix": "tslint \"source/**/*.ts\" --fix",
@@ -66,7 +67,7 @@
     "docs:cp_defs": "mkdir docs/docs_generate; cp source/danger.d.ts docs/docs_generate; cp node_modules/@octokit/rest/index.d.ts docs/docs_generate/github.d.ts",
     "docs": "yarn run docs:cp_defs; yarn typedoc --ignoreCompilerErrors --mode modules --json docs/js_ref_dsl_docs.json --includeDeclarations source",
     "dts-lint": "yarn run declarations && yarn dtslint types",
-    "danger:prepush": "yarn build:fast; node distribution/commands/danger.js local --dangerfile dangerfile.lite.ts"
+    "danger:prepush": "yarn build:fast; yarn test:fixtures; node distribution/commands/danger.js local --dangerfile dangerfile.lite.ts"
   },
   "repository": {
     "type": "git",
@@ -92,7 +93,7 @@
     "@types/debug": "0.0.30",
     "@types/get-stdin": "^5.0.1",
     "@types/http-proxy-agent": "^2.0.1",
-    "@types/jest": "^23.3.2",
+    "@types/jest": "^24.0.0",
     "@types/json5": "^0.0.30",
     "@types/jsonwebtoken": "^7.2.8",
     "@types/lodash.includes": "^4.3.4",
@@ -106,7 +107,7 @@
     "date-fns": "^1.29.0",
     "flow-bin": "^0.77.0",
     "husky": "^1.0.1",
-    "jest": "^23.6.0",
+    "jest": "^24.0.0",
     "jest-json-reporter": "^1.2.2",
     "lint-staged": "^7.3.0",
     "madge": "^3.2.0",
@@ -153,8 +154,7 @@
     "readline-sync": "^1.4.9",
     "require-from-string": "^2.0.2",
     "rfc6902": "^3.0.1",
-    "supports-hyperlinks": "^1.0.1",
-    "vm2": "^3.6.3"
+    "supports-hyperlinks": "^1.0.1"
   },
   "optionalDependencies": {},
   "husky": {

scripts/run-fixtures.js

@@ -1,20 +1,21 @@
 // Note: Keep this ES6 only, want to be able to run this directly via node
 // to ensure that something like ts-node doesn't mess up paths etc
 
-// yarn build; cat source/_tests/fixtures/danger-js-pr-395.json | env DANGER_FAKE_CI="YEP" DANGER_TEST_REPO='danger/danger-js' DANGER_TEST_PR='395' node --inspect distribution/commands/danger-runner.js --text-only --dangerfile /Users/orta/dev/projects/danger/danger-js/source/runner/_tests/fixtures/__DangerfileAsync.js
+// yarn test:fixtures
+
+// Toggle this on to update the JSON files for each run
+const writeResults = false
 
 const fs = require("fs")
 const child_process = require("child_process")
 const { resolve } = require("path")
+const { basename } = require("path")
 const chalk = require("chalk")
 const expect = require("expect")
 
-// Toggle this on to update the JSON files for each run
-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"
 
-// Get all the fixtures
+// Use a DSL fixture, and emulate being the `danger ci` host process
 const dangerDSLFixture = resolve(__dirname, "../source/_tests/fixtures/danger-js-pr-395.json")
 const dslJSON = fs.readFileSync(dangerDSLFixture, "utf8")
 
@@ -28,14 +29,18 @@ const fixtures = fs
   .filter(f => !f.includes("Throws"))
   .filter(f => !f.includes("BadSyntax"))
 
+let runCount = 0
+
+console.log("Running Fixures for Danger JS. This uses the built version of danger.\n")
+
 // Runs the danger runner over a fixture, then compares it to the
 // fixtured JSON data
 const runDangerfile = fixture => {
   let allLogs = ""
   const dangerfile = `${dangerFileFixtures}/${fixture}`
   const dangerfileResults = `${dangerFileResultsFixtures}/${fixture}.json`
 
-  console.log("Running fixture for " + chalk.bold(dangerfile))
+  process.stdout.write(chalk.bold(basename(dangerfile)))
 
   // Setup the command
   const commandArgs = ["node", runnerFileJS, "--text-only", "--dangerfile", dangerfile]
@@ -58,31 +63,48 @@ const runDangerfile = fixture => {
 
   child.stdout.on("data", data => {
     data = data.toString()
+    // console.log(`stdout: ${data}`)
+
     const trimmed = data.trim()
-    if (trimmed.startsWith("{") && trimmed.endsWith("}") && trimmed.includes("markdowns")) {
-      const runtimeResults = JSON.parse(trimmed)
+    const maybeJSON = getJSONURLFromSTDOUT(data)
+    const url = maybeJSON.replace("danger-results:/", "")
+    const runtimeResults = JSON.parse(fs.readFileSync(url, "utf8"))
+    if (writeResults) {
+      fs.writeFileSync(dangerfileResults, trimmed)
+    }
 
-      if (writeResults) {
-        fs.writeFileSync(dangerfileResults, trimmed)
-      }
+    const fixturedResults = JSON.parse(fs.readFileSync(dangerfileResults, "utf8"))
+    // Fails include traces etc
+    expect(runtimeResults).toEqual(fixturedResults)
 
-      const fixturedResults = JSON.parse(fs.readFileSync(dangerfileResults, "utf8"))
-      // Fails include traces etc
-      expect(runtimeResults).toEqual(fixturedResults)
+    const tick = chalk.bold.greenBright("✓")
+    process.stdout.write(" " + tick)
 
-      next()
-    } else {
-      allLogs += data
-    }
+    runCount++
+    next()
   })
 }
 
+/** Pulls out a URL that's from the STDOUT */
+const getJSONURLFromSTDOUT = stdout => {
+  const match = stdout.match(/danger-results:\/\/*.+json/)
+  if (!match) {
+    return undefined
+  }
+  return match[0]
+}
+
 // Keep an index and loop through the fixtures
 var index = 0
 const next = () => {
   const nextFixture = fixtures[index++]
   if (nextFixture) {
+    if (index > 1) {
+      process.stdout.write(", ")
+    }
     runDangerfile(nextFixture)
+  } else {
+    expect(runCount).toEqual(fixtures.length)
   }
 }