aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Browne <stephenalexbrowne@gmail.com>2018-06-08 02:55:47 +0800
committerGitHub <noreply@github.com>2018-06-08 02:55:47 +0800
commit05fe8792eae64257286e628ae2b437c7e3c041d0 (patch)
treed6f7e4bbc610a2f4997b25b5d9e5353f15f03b79
parente0bc01eea1c20e0afda296f331c6a475e062b59c (diff)
parentd299458084c46e635d217c777ebc51c47c26a247 (diff)
downloaddexon-0x-contracts-05fe8792eae64257286e628ae2b437c7e3c041d0.tar
dexon-0x-contracts-05fe8792eae64257286e628ae2b437c7e3c041d0.tar.gz
dexon-0x-contracts-05fe8792eae64257286e628ae2b437c7e3c041d0.tar.bz2
dexon-0x-contracts-05fe8792eae64257286e628ae2b437c7e3c041d0.tar.lz
dexon-0x-contracts-05fe8792eae64257286e628ae2b437c7e3c041d0.tar.xz
dexon-0x-contracts-05fe8792eae64257286e628ae2b437c7e3c041d0.tar.zst
dexon-0x-contracts-05fe8792eae64257286e628ae2b437c7e3c041d0.zip
Merge pull request #676 from 0xProject/feature/mocha-source-maps
Use source-map-support package to include correct line numbers in mocha
-rw-r--r--package.json3
-rw-r--r--packages/0x.js/package.json2
-rw-r--r--packages/assert/package.json2
-rw-r--r--packages/base-contract/package.json2
-rw-r--r--packages/connect/package.json2
-rw-r--r--packages/contract-wrappers/package.json2
-rw-r--r--packages/contracts/package.json2
-rw-r--r--packages/dev-utils/package.json2
-rw-r--r--packages/json-schemas/package.json2
-rw-r--r--packages/metacoin/package.json2
-rw-r--r--packages/order-utils/package.json2
-rw-r--r--packages/order-watcher/package.json2
-rw-r--r--packages/sol-compiler/package.json2
-rw-r--r--packages/sol-cov/package.json2
-rw-r--r--packages/sra-report/package.json2
-rw-r--r--packages/subproviders/package.json4
-rw-r--r--packages/web3-wrapper/package.json2
-rw-r--r--yarn.lock7
18 files changed, 26 insertions, 18 deletions
diff --git a/package.json b/package.json
index f25438224..11444d16d 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,8 @@
"lerna": "^2.5.1",
"npm-run-all": "^4.1.2",
"prettier": "^1.11.1",
- "wsrun": "^2.2.0"
+ "wsrun": "^2.2.0",
+ "source-map-support": "^0.5.6"
},
"resolutions": {
"ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default",
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index d18960b5d..b7a167c55 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -30,7 +30,7 @@
"clean": "shx rm -rf _bundles lib test_temp scripts src/contract_wrappers/generated",
"build:umd:prod": "NODE_ENV=production webpack",
"build:commonjs": "tsc && copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
- "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
"manual:postpublish": "yarn build; node ./scripts/postpublish.js",
"docs:stage": "node scripts/stage_docs.js",
"docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
diff --git a/packages/assert/package.json b/packages/assert/package.json
index 9e4fcbbf0..e9e3bec32 100644
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -12,7 +12,7 @@
"build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
"clean": "shx rm -rf lib test_temp scripts",
"lint": "tslint --project .",
- "run_mocha": "mocha lib/test/**/*_test.js --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js --exit",
"prepublishOnly": "run-p build",
"test": "yarn run_mocha",
"rebuild_and_test": "run-s clean build test",
diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json
index cb27e9efa..595bca3a9 100644
--- a/packages/base-contract/package.json
+++ b/packages/base-contract/package.json
@@ -14,7 +14,7 @@
"test": "yarn run_mocha",
"rebuild_and_test": "run-s clean build test",
"test:circleci": "yarn test:coverage",
- "run_mocha": "mocha lib/test/**/*_test.js --bail --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js --bail --exit",
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
"lint": "tslint --project . --exclude **/src/contract_wrappers/**/*",
diff --git a/packages/connect/package.json b/packages/connect/package.json
index 5079467e4..6b5a5a7b0 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -20,7 +20,7 @@
"clean": "shx rm -rf lib test_temp scripts",
"copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
"lint": "tslint --project .",
- "run_mocha": "mocha lib/test/**/*_test.js --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js --exit",
"test": "run-s copy_test_fixtures run_mocha",
"rebuild_and_test": "run-s clean build test",
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index 71c2ee780..d5d4bfbc8 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -24,7 +24,7 @@
"update_compact_artifacts": "copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts",
"update_test_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/1.0.0/$i.json test/artifacts; done;",
"clean": "shx rm -rf _bundles lib test_temp scripts test/artifacts src/contract_wrappers/generated",
- "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
"manual:postpublish": "yarn build; node ./scripts/postpublish.js"
},
"config": {
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 3f9160fa7..084c9df01 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -18,7 +18,7 @@
"test": "yarn run_mocha",
"rebuild_and_test": "run-s build test",
"test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
- "run_mocha": "mocha 'lib/test/**/*.js' --timeout 100000 --bail --exit",
+ "run_mocha": "mocha --require source-map-support/register 'lib/test/**/*.js' --timeout 100000 --bail --exit",
"compile": "sol-compiler",
"clean": "shx rm -rf lib src/contract_wrappers/generated",
"generate_contract_wrappers":
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index e4beacd15..cac3863a6 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -13,7 +13,7 @@
"test": "yarn run_mocha",
"rebuild_and_test": "run-s clean build test",
"test:circleci": "yarn test:coverage",
- "run_mocha": "mocha lib/test/**/*_test.js --bail --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js --bail --exit",
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
"clean": "shx rm -rf lib scripts",
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index cb4b998f4..c6ab369b3 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -15,7 +15,7 @@
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
"test:circleci": "yarn test:coverage",
- "run_mocha": "mocha lib/test/**/*_test.js --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js --exit",
"clean": "shx rm -rf lib test_temp scripts",
"build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
"manual:postpublish": "yarn build; node ./scripts/postpublish.js",
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json
index 35e54314a..74b55b592 100644
--- a/packages/metacoin/package.json
+++ b/packages/metacoin/package.json
@@ -17,7 +17,7 @@
"test": "yarn run_mocha",
"rebuild_and_test": "run-s build test",
"test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
- "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --bail --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js lib/test/global_hooks.js --bail --exit",
"generate_contract_wrappers": "abi-gen --abis 'artifacts/Metacoin.json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers --backend ethers",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index 3a97b99e3..6c5ad6780 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -18,7 +18,7 @@
"test": "yarn run_mocha",
"rebuild_and_test": "run-s build test",
"test:circleci": "yarn test:coverage",
- "run_mocha": "mocha lib/test/**/*_test.js --bail --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js --bail --exit",
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
"clean": "shx rm -rf lib scripts lib/src/artifacts src/generated_contract_wrappers",
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index b67df2e4c..2e5dfb094 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -25,7 +25,7 @@
"update_compact_artifacts": "copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts",
"update_test_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/1.0.0/$i.json test/artifacts; done;",
"clean": "shx rm -rf _bundles lib test_temp scripts test/artifacts src/generated_contract_wrappers",
- "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
"manual:postpublish": "yarn build; node ./scripts/postpublish.js"
},
"config": {
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index 0bd51972d..14eba283f 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -14,7 +14,7 @@
"update_contract_fixtures": "copyfiles 'test/fixtures/contracts/**/*' ./lib",
"test": "yarn run_mocha",
"rebuild_and_test": "run-s build test",
- "run_mocha": "mocha lib/test/*_test.js --bail --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/*_test.js --bail --exit",
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
"clean": "shx rm -rf lib scripts",
diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json
index 616b30912..2b4c1db40 100644
--- a/packages/sol-cov/package.json
+++ b/packages/sol-cov/package.json
@@ -17,7 +17,7 @@
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
"test:circleci": "yarn test:coverage",
- "run_mocha": "mocha lib/test/**/*_test.js --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js --exit",
"clean": "shx rm -rf lib scripts test/fixtures/artifacts src/artifacts",
"copy_test_fixtures": "copyfiles 'test/fixtures/**/*' ./lib",
"compile_test": "sol-compiler compile",
diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json
index d2cc7f32a..2e120d661 100644
--- a/packages/sra-report/package.json
+++ b/packages/sra-report/package.json
@@ -16,7 +16,7 @@
"rebuild_and_test": "run-s clean build test",
"copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
"copy_test_environments": "copyfiles -u 2 './test/environments/**/*.json' ./lib/test/environments",
- "run_mocha": "mocha lib/test/**/*_test.js --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js --exit",
"manual:postpublish": "yarn build; node ./scripts/postpublish.js"
},
"bin": {
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 743bd6669..b222ace3b 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -12,8 +12,8 @@
"build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
"clean": "shx rm -rf lib scripts",
"lint": "tslint --project .",
- "run_mocha_unit": "mocha lib/test/unit/**/*_test.js --timeout 10000 --bail --exit",
- "run_mocha_integration": "mocha lib/test/integration/**/*_test.js --timeout 10000 --bail --exit",
+ "run_mocha_unit": "mocha --require source-map-support/register lib/test/unit/**/*_test.js --timeout 10000 --bail --exit",
+ "run_mocha_integration": "mocha --require source-map-support/register lib/test/integration/**/*_test.js --timeout 10000 --bail --exit",
"test": "npm run test:unit",
"test:unit:coverage": "nyc npm run test:unit --all && yarn coverage:report:lcov",
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 694f07e45..de2b72ac6 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -15,7 +15,7 @@
"test": "yarn run_mocha",
"rebuild_and_test": "run-s clean build test",
"test:circleci": "yarn test:coverage",
- "run_mocha": "mocha lib/test/**/*_test.js --bail --exit",
+ "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js --bail --exit",
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
"manual:postpublish": "yarn build; node ./scripts/postpublish.js",
diff --git a/yarn.lock b/yarn.lock
index 4fdd5ddbe..b1ac2493c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10802,6 +10802,13 @@ source-map-support@^0.5.0, source-map-support@^0.5.3:
dependencies:
source-map "^0.6.0"
+source-map-support@^0.5.6:
+ version "0.5.6"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
+ dependencies:
+ buffer-from "^1.0.0"
+ source-map "^0.6.0"
+
source-map-url@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"