Merge branch '1.0' into 1.0

.eslintignore

@@ -9,4 +9,5 @@ jest.config.js
 jest.preprocessor.js
 W3cWebsocket.js
 packages/**/rollup.config.js
+packages/**/node_modules
 angular-patch.js

.travis.yml

@@ -12,9 +12,6 @@ addons:
     - ubuntu-toolchain-r-test
     packages:
     - g++-4.8
-env:
-  matrix:
-    - CXX=g++-4.8 TEST_SUITE=test
 before_script:
     - export DISPLAY=:99.0
     - sh -e /etc/init.d/xvfb start

docs/web3-utils.rst

@@ -214,7 +214,7 @@ Example
     > "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
 
     web3.utils.sha3(234);
-    > null // can't calculate the has of a number
+    > null // can't calculate the hash of a number
 
     web3.utils.sha3(0xea); // same as above, just the HEX representation of the number
     > null

jest.config.js

@@ -1,6 +1,15 @@
+// TODO: Improve tests and add the branch property to the coverageThreshold config.
 const config = {
-    verbose: true,
     notifyMode: 'success-change',
+    collectCoverage: true,
+    coverageDirectory: './coverage/',
+    coverageThreshold: {
+        global: {
+            functions: 80,
+            lines: 80,
+            statements: 80
+        }
+    },
     notify: true,
     clearMocks: true,
     resetMocks: true,
@@ -9,7 +18,6 @@ const config = {
     transform: {
         '^.+\\.js$': '<rootDir>/../../jest.preprocessor.js'
     },
-    transformIgnorePatterns: ['node_modules/(?!(underscore-es)/)'],
     bail: true
 };
 

jest.preprocessor.js

@@ -5,7 +5,12 @@ module.exports = require('babel-jest').createTransformer({
             plugins: [
                 '@babel/plugin-proposal-export-default-from',
                 '@babel/plugin-proposal-export-namespace-from',
-                '@babel/plugin-transform-runtime'
+                '@babel/plugin-transform-runtime',
+                ['istanbul', {
+                    'exclude': [
+                        'dist'
+                    ]
+                }]
             ]
         }
     }

package.json

@@ -1,24 +1,25 @@
 {
     "name": "web3",
     "namespace": "ethereum",
-    "version": "1.0.0-beta.46",
+    "version": "1.0.0-beta.48",
     "description": "Ethereum JavaScript API wrapper repository",
     "license": "LGPL-3.0",
     "main": "./packages/web3/src/index.js",
     "directories": {
-        "doc": "./doc",
-        "test": "./test"
+        "doc": "./doc"
     },
     "scripts": {
         "clean": "lerna clean",
         "link": "lerna link",
         "bootstrap": "lerna bootstrap",
         "install:all": "lerna add",
         "remove:all": "lerna exec npm uninstall",
+        "install:dev:all": "lerna exec npm install --save-dev",
         "publish": "npm run clean && npm run bootstrap && npm run travis && lerna publish",
         "build": "lerna run build",
         "test": "lerna run test",
-        "test:coverage": "lerna run test -- -- --coverage && istanbul-combine -d coverage -r lcov -r html ./packages/**/coverage-final.json",
+        "test:coverage": "lerna run test -- --coverage && npm run istanbulCombine",
+        "istanbulCombine": "istanbul-combine -d coverage -r lcov -r html ./packages/**/coverage-final.json",
         "dtslint": "lerna run dtslint",
         "docs": "cd docs; make html;",
         "lint": "eslint --cache --fix .",
@@ -83,7 +84,7 @@
         "@types/node": "^10.12.30",
         "babel-core": "^7.0.0-bridge.0",
         "babel-eslint": "^10.0.1",
-        "babel-jest": "23.6.0",
+        "babel-jest": "^23.6.0",
         "coveralls": "^3.0.3",
         "eslint": "^5.15.1",
         "eslint-config-prettier": "^3.6.0",
@@ -96,9 +97,8 @@
         "eslint-plugin-standard": "^4.0.0",
         "eslint-plugin-unicorn": "^6.0.1",
         "istanbul-combine": "^0.3.0",
-        "jest": "23.6.0",
+        "jest": "^23.6.0",
         "lerna": "^3.13.1",
-        "parsimmon": "^1.12.0",
         "prettier": "1.14.3",
         "regenerator-runtime": "^0.13.1",
         "rollup": "^0.67.4",