Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Dependency update: Update Mocha to version 8 #3146

Merged
merged 9 commits into from Jul 8, 2020
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest]
node-version: [8.x, 10.x, 12.x]
CruzMolina marked this conversation as resolved.
Show resolved Hide resolved
node-version: [10.x, 12.x]
env: [GETH=true, QUORUM=true, PACKAGES=true, INTEGRATION=true]
runs-on: ${{ matrix.platform }}

Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions packages/artifactor/package.json
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions packages/blockchain-utils/package.json
Expand Up @@ -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"
},
Expand All @@ -32,8 +35,5 @@
],
"publishConfig": {
"access": "public"
},
"dependencies": {
"source-map-support": "^0.5.19"
}
}
2 changes: 1 addition & 1 deletion packages/box/package.json
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions packages/code-utils/package.json
Expand Up @@ -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"
}
}
38 changes: 19 additions & 19 deletions 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",
Expand All @@ -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"
]
}
}
2 changes: 1 addition & 1 deletion packages/compile-vyper/package.json
Expand Up @@ -17,7 +17,7 @@
},
"devDependencies": {
"@truffle/config": "^1.2.20",
"mocha": "5.2.0"
"mocha": "8.0.1"
},
"keywords": [
"compile",
Expand Down
52 changes: 26 additions & 26 deletions 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",
Expand All @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/contract-schema/package.json
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion packages/contract/package.json
Expand Up @@ -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"
Expand Down
8 changes: 0 additions & 8 deletions packages/core/lib/test.js
Expand Up @@ -170,14 +170,6 @@ const Test = {
// Propagate --bail option to mocha
mochaConfig.bail = config.bail;

// If the command line overrides color usage, use that.
if (config.colors != null) mochaConfig.useColors = config.colors;

// Default to true if configuration isn't set anywhere.
if (mochaConfig.useColors == null) {
mochaConfig.useColors = true;
eggplantzzz marked this conversation as resolved.
Show resolved Hide resolved
}

Mocha = mochaConfig.package || require("mocha");
delete mochaConfig.package;
const mocha = new Mocha(mochaConfig);
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This mocha (the one in core, the dependency, not the dev dependency) is exposed to the user... so isn't upgrading this one a breacking change? Should this one be left as is?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There could be some edge cases when doing customizable mocha-things (mocha-parallel tests?), but so far the core CLI functionality when running truffle test seems about the same.

I haven't checked the Library API we expose (truffle.test...), but last I checked it's undocumented and still considered experimental. 🤷‍♂️

Maybe we should dig in and outline what exactly the breaking changes are between v5.2.0 and v8.
FWIW, I don't think truffle has ever fully supported the complete features of mocha.

"node-emoji": "^1.8.1",
"node-ipc": "^9.1.1",
"ora": "^3.4.0",
Expand Down
32 changes: 16 additions & 16 deletions 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",
Expand All @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/deployer/package.json
Expand Up @@ -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"
},
Expand Down
26 changes: 13 additions & 13 deletions 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"
}
}
2 changes: 1 addition & 1 deletion packages/external-compile/package.json
Expand Up @@ -22,7 +22,7 @@
},
"devDependencies": {
"chai": "4.2.0",
"mocha": "5.2.0",
"mocha": "8.0.1",
"temp": "^0.8.3"
},
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/hdwallet-provider/package.json
Expand Up @@ -37,7 +37,7 @@
"@types/web3": "^1.0.20",
"@types/web3-provider-engine": "^14.0.0",
"ganache-core": "2.10.2",
"mocha": "6.2.0",
"mocha": "8.0.1",
"ts-node": "^8.4.1",
"typescript": "^3.6.3"
},
Expand Down