diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-06-20 10:04:16 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-06-20 10:04:16 +0800 |
| commit | f6cc6c627109ee64f5ef13d2c3fbab2df0f98501 (patch) | |
| tree | 45a0d5953751a237a89a2ad2a3b8e7caa90cacf7 /test | |
| parent | 60855b05106899149824feecbd0f5d54907b0451 (diff) | |
| parent | 41d992cca960c9f1b17bbd4bac9793902a7d1716 (diff) | |
| download | tangerine-wallet-browser-f6cc6c627109ee64f5ef13d2c3fbab2df0f98501.tar tangerine-wallet-browser-f6cc6c627109ee64f5ef13d2c3fbab2df0f98501.tar.gz tangerine-wallet-browser-f6cc6c627109ee64f5ef13d2c3fbab2df0f98501.tar.bz2 tangerine-wallet-browser-f6cc6c627109ee64f5ef13d2c3fbab2df0f98501.tar.lz tangerine-wallet-browser-f6cc6c627109ee64f5ef13d2c3fbab2df0f98501.tar.xz tangerine-wallet-browser-f6cc6c627109ee64f5ef13d2c3fbab2df0f98501.tar.zst tangerine-wallet-browser-f6cc6c627109ee64f5ef13d2c3fbab2df0f98501.zip | |
Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/linting_test.js | 9 | ||||
| -rw-r--r-- | test/unit/tx-controller-test.js | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/test/unit/linting_test.js b/test/unit/linting_test.js deleted file mode 100644 index 45578fc36..000000000 --- a/test/unit/linting_test.js +++ /dev/null @@ -1,9 +0,0 @@ -// LINTING: -const lint = require('mocha-eslint') -const lintPaths = ['app/**/*.js', 'ui/**/*.js', 'test/**/*.js', '!node_modules/**', '!dist/**', '!docs/**', '!app/scripts/chromereload.js'] - -const lintOptions = { - strict: false, -} - -lint(lintPaths, lintOptions) diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js index f0d8a706e..0d35cd62c 100644 --- a/test/unit/tx-controller-test.js +++ b/test/unit/tx-controller-test.js @@ -19,6 +19,7 @@ describe('Transaction Controller', function () { txController = new TransactionController({ networkStore: new ObservableStore(currentNetworkId), txHistoryLimit: 10, + provider: { _blockTracker: new EventEmitter()}, blockTracker: new EventEmitter(), ethQuery: new EthQuery(new EventEmitter()), signTransaction: (ethTx) => new Promise((resolve) => { |