Merge pull request #3146 from trufflesuite/update-mocha

Dependency update: Update Mocha to version 8
trufflesuite · Jul 8, 2020 · 53f037e · 53f037e
2 parents 6db3b6a + 078ea1e
commit 53f037e
Show file tree

Hide file tree

Showing 27 changed files with 450 additions and 308 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        node-version: [8.x, 10.x, 12.x]
+        node-version: [10.x, 12.x]
         env: [GETH=true, QUORUM=true, PACKAGES=true, INTEGRATION=true]
     runs-on: ${{ matrix.platform }}
 

diff --git a/.travis.yml b/.travis.yml
@@ -24,6 +24,8 @@ matrix:
     - node_js: 8
       env: COVERAGE=true
   allow_failures:
+    - node_js: 8
+      env: FABRICEVM=true
     - node_js: 8
       env: COVERAGE=true
 

diff --git a/packages/artifactor/package.json b/packages/artifactor/package.json
@@ -7,12 +7,12 @@
   "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/artifactor",
   "version": "4.0.66",
   "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
     "prepare": "yarn build",
     "test": "mocha"
   },
+  "types": "dist/index.d.ts",
   "dependencies": {
     "@truffle/contract-schema": "^3.2.1",
     "fs-extra": "^8.1.0",
@@ -29,7 +29,7 @@
     "chai": "4.2.0",
     "debug": "^4.1.1",
     "ganache-core": "2.10.2",
-    "mocha": "5.2.0",
+    "mocha": "8.0.1",
     "require-nocache": "^1.0.0",
     "temp": "^0.8.3",
     "ts-node": "^8.3.0",

diff --git a/packages/blockchain-utils/package.json b/packages/blockchain-utils/package.json
@@ -16,12 +16,15 @@
     "test": "mocha --exit -r ts-node/register test/**/*.test.ts"
   },
   "types": "./typings/index.d.ts",
+  "dependencies": {
+    "source-map-support": "^0.5.19"
+  },
   "devDependencies": {
     "@types/assert": "^1.4.2",
     "@types/mocha": "^5.2.7",
     "@types/node": "^12.12.5",
     "@types/web3": "1.0.19",
-    "mocha": "5.2.0",
+    "mocha": "8.0.1",
     "ts-node": "^8.3.0",
     "typescript": "^3.6.3"
   },
@@ -32,8 +35,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "dependencies": {
-    "source-map-support": "^0.5.19"
   }
 }
diff --git a/packages/box/package.json b/packages/box/package.json
@@ -28,7 +28,7 @@
     "@types/inquirer": "6.0.3",
     "@types/request-promise-native": "^1.0.16",
     "@types/tmp": "^0.1.0",
-    "mocha": "5.2.0",
+    "mocha": "8.0.1",
     "sinon": "^6.3.4",
     "ts-node": "^8.3.0",
     "typescript": "^3.6.3"

diff --git a/packages/code-utils/package.json b/packages/code-utils/package.json
@@ -12,17 +12,17 @@
     "test": "mocha --exit -r ts-node/register test/**/*.test.ts"
   },
   "types": "./typings/index.d.ts",
+  "dependencies": {
+    "source-map-support": "^0.5.19"
+  },
   "devDependencies": {
     "@types/mocha": "^5.2.7",
     "@types/node": "^12.6.8",
-    "mocha": "5.2.0",
+    "mocha": "8.0.1",
     "ts-node": "^8.3.0",
     "typescript": "^3.6.3"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "dependencies": {
-    "source-map-support": "^0.5.19"
   }
 }
diff --git a/packages/compile-solidity/package.json b/packages/compile-solidity/package.json
@@ -1,8 +1,18 @@
 {
   "name": "@truffle/compile-solidity",
   "description": "Compiler helper and artifact manager for Solidity files",
+  "license": "MIT",
+  "author": "Tim Coulter <tim@trufflesuite.com>",
+  "homepage": "https://github.com/trufflesuite/compile-solidity#readme",
+  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/compile-solidity",
+  "bugs": {
+    "url": "https://github.com/trufflesuite/truffle/issues"
+  },
   "version": "4.3.11",
   "main": "index.js",
+  "scripts": {
+    "test": "./scripts/test.sh"
+  },
   "dependencies": {
     "@truffle/config": "^1.2.20",
     "@truffle/contract-sources": "^0.1.7",
@@ -24,32 +34,22 @@
     "babel-core": "^6.26.0",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.1",
-    "mocha": "5.2.0",
+    "mocha": "8.0.1",
     "sinon": "^7.2.2",
     "tmp": "0.0.33"
   },
-  "babel": {
-    "presets": [
-      "env"
-    ]
-  },
-  "scripts": {
-    "test": "./scripts/test.sh"
-  },
-  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/compile-solidity",
   "keywords": [
-    "ethereum",
-    "truffle",
     "compile",
-    "solidity"
+    "ethereum",
+    "solidity",
+    "truffle"
   ],
-  "author": "Tim Coulter <tim@trufflesuite.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/trufflesuite/truffle/issues"
-  },
-  "homepage": "https://github.com/trufflesuite/compile-solidity#readme",
   "publishConfig": {
     "access": "public"
+  },
+  "babel": {
+    "presets": [
+      "env"
+    ]
   }
 }
diff --git a/packages/compile-vyper/package.json b/packages/compile-vyper/package.json
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@truffle/config": "^1.2.20",
-    "mocha": "5.2.0"
+    "mocha": "8.0.1"
   },
   "keywords": [
     "compile",

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,38 +1,21 @@
 {
   "name": "@truffle/config",
-  "version": "1.2.20",
   "description": "Utility for interacting with truffle-config.js files",
+  "license": "MIT",
+  "author": "Tim Coulter <tim@trufflesuite.com>",
+  "homepage": "https://github.com/trufflesuite/truffle/tree/master/packages/config#readme",
+  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/config",
+  "bugs": {
+    "url": "https://github.com/trufflesuite/truffle/issues"
+  },
+  "version": "1.2.20",
   "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
     "prepare": "yarn build",
     "test": "yarn build && mocha --exit -r ts-node/register test/**/*.test.ts"
   },
-  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/config",
-  "keywords": [
-    "ethereum",
-    "truffle",
-    "config"
-  ],
-  "author": "Tim Coulter <tim@trufflesuite.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/trufflesuite/truffle/issues"
-  },
-  "homepage": "https://github.com/trufflesuite/truffle/tree/master/packages/config#readme",
-  "devDependencies": {
-    "@types/configstore": "^4.0.0",
-    "@types/find-up": "^2.1.0",
-    "@types/lodash.assignin": "^4.2.6",
-    "@types/lodash.merge": "^4.6.6",
-    "@types/node": "^12.12.9",
-    "@types/sinon": "^7.0.13",
-    "mocha": "6.2.0",
-    "sinon": "^7.5.0",
-    "ts-node": "^8.4.1",
-    "typescript": "^3.6.3"
-  },
+  "types": "dist/index.d.ts",
   "dependencies": {
     "@truffle/error": "^0.0.8",
     "@truffle/events": "^0.0.5",
@@ -45,6 +28,23 @@
     "original-require": "1.0.1",
     "source-map-support": "^0.5.19"
   },
+  "devDependencies": {
+    "@types/configstore": "^4.0.0",
+    "@types/find-up": "^2.1.0",
+    "@types/lodash.assignin": "^4.2.6",
+    "@types/lodash.merge": "^4.6.6",
+    "@types/node": "^12.12.9",
+    "@types/sinon": "^7.0.13",
+    "mocha": "8.0.1",
+    "sinon": "^7.5.0",
+    "ts-node": "^8.4.1",
+    "typescript": "^3.6.3"
+  },
+  "keywords": [
+    "config",
+    "ethereum",
+    "truffle"
+  ],
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/contract-schema/package.json b/packages/contract-schema/package.json
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "json-schema-to-typescript": "^5.5.0",
-    "mocha": "5.2.0",
+    "mocha": "8.0.1",
     "solc": "0.5.16"
   },
   "keywords": [

diff --git a/packages/contract/package.json b/packages/contract/package.json
@@ -42,7 +42,7 @@
     "debug": "^4.1.0",
     "exorcist": "^1.0.1",
     "ganache-core": "2.10.2",
-    "mocha": "5.2.0",
+    "mocha": "8.0.1",
     "sinon": "^7.3.2",
     "temp": "^0.8.3",
     "uglify-es": "^3.3.9"

diff --git a/packages/core/lib/test.js b/packages/core/lib/test.js
@@ -171,11 +171,16 @@ const Test = {
     mochaConfig.bail = config.bail;
 
     // If the command line overrides color usage, use that.
-    if (config.colors != null) mochaConfig.useColors = config.colors;
+    if (config.color != null) {
+      mochaConfig.color = config.color;
+    } else if (config.colors != null) {
+      // --colors is a mocha alias for --color
+      mochaConfig.color = config.colors;
+    }
 
     // Default to true if configuration isn't set anywhere.
-    if (mochaConfig.useColors == null) {
-      mochaConfig.useColors = true;
+    if (mochaConfig.color == null) {
+      mochaConfig.color = true;
     }
 
     Mocha = mochaConfig.package || require("mocha");

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -54,7 +54,7 @@
     "ganache-core": "2.10.2",
     "glob": "^7.1.4",
     "hdkey": "^1.1.0",
-    "mocha": "5.1.1",
+    "mocha": "8.0.1",
     "node-emoji": "^1.8.1",
     "node-ipc": "^9.1.1",
     "ora": "^3.4.0",

diff --git a/packages/debug-utils/package.json b/packages/debug-utils/package.json
@@ -1,7 +1,18 @@
 {
   "name": "@truffle/debug-utils",
-  "version": "4.1.8",
   "description": "Integration utils for truffle/debugger",
+  "license": "MIT",
+  "author": "Truffle Suite <inquiry@trufflesuite.com>",
+  "homepage": "https://github.com/trufflesuite/truffle/tree/master/packages/debug-utils#readme",
+  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/debug-utils",
+  "bugs": {
+    "url": "https://github.com/trufflesuite/truffle/issues"
+  },
+  "version": "4.1.8",
+  "main": "index.js",
+  "scripts": {
+    "test": "mocha"
+  },
   "dependencies": {
     "@truffle/codec": "^0.5.6",
     "@trufflesuite/chromafi": "^2.1.2",
@@ -11,23 +22,12 @@
     "highlightjs-solidity": "^1.0.16",
     "node-dir": "0.1.17"
   },
-  "main": "index.js",
-  "scripts": {
-    "test": "mocha"
-  },
-  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/debug-utils",
-  "author": "Truffle Suite <inquiry@trufflesuite.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/trufflesuite/truffle/issues"
-  },
-  "homepage": "https://github.com/trufflesuite/truffle/tree/master/packages/debug-utils#readme",
-  "publishConfig": {
-    "access": "public"
-  },
   "devDependencies": {
     "chai": "^4.2.0",
-    "mocha": "^6.1.4",
+    "mocha": "8.0.1",
     "safe-eval": "^0.4.1"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }
diff --git a/packages/deployer/package.json b/packages/deployer/package.json
@@ -27,7 +27,7 @@
     "@truffle/reporters": "^1.1.0",
     "@truffle/workflow-compile": "^2.1.40",
     "ganache-core": "2.10.2",
-    "mocha": "5.2.0",
+    "mocha": "8.0.1",
     "sinon": "^7.3.2",
     "web3": "1.2.1"
   },

diff --git a/packages/expect/package.json b/packages/expect/package.json
@@ -1,27 +1,27 @@
 {
   "name": "@truffle/expect",
-  "version": "0.0.13",
   "description": "Simple module for ensuring specific options are passed to a function",
+  "license": "MIT",
+  "author": "Tim Coulter <tim@trufflesuite.com>",
+  "homepage": "https://github.com/trufflesuite/truffle/blob/master/packages/expect#readme",
+  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/expect",
+  "bugs": {
+    "url": "https://github.com/trufflesuite/truffle/issues"
+  },
+  "version": "0.0.13",
   "main": "index.js",
   "scripts": {
     "test": "mocha"
   },
-  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/expect",
+  "devDependencies": {
+    "mocha": "8.0.1"
+  },
   "keywords": [
-    "truffle",
     "ethereum",
-    "expect"
+    "expect",
+    "truffle"
   ],
-  "author": "Tim Coulter <tim@trufflesuite.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/trufflesuite/truffle/issues"
-  },
-  "homepage": "https://github.com/trufflesuite/truffle/blob/master/packages/expect#readme",
   "publishConfig": {
     "access": "public"
-  },
-  "devDependencies": {
-    "mocha": "5.2.0"
   }
 }
diff --git a/packages/external-compile/package.json b/packages/external-compile/package.json
@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "chai": "4.2.0",
-    "mocha": "5.2.0",
+    "mocha": "8.0.1",
     "temp": "^0.8.3"
   },
   "keywords": [