diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-11-21 06:44:28 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-11-21 06:44:28 +0800 |
commit | 9b1df386de908ae14e0ce169f1231a0d6de77972 (patch) | |
tree | d7fc663343b7ba3c28dff0022ca018a01bea451c /test/unit/ui | |
parent | c0557b43e2c493de73c8bf74cfa9e5740c8cfd3f (diff) | |
parent | 5956f8d260270d41f1e5be53f3c058782a1ae7f4 (diff) | |
download | tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.gz tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.bz2 tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.lz tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.xz tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.zst tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.zip |
fix merge conflicts
Diffstat (limited to 'test/unit/ui')
-rw-r--r-- | test/unit/ui/app/reducers/metamask.spec.js | 2 | ||||
-rw-r--r-- | test/unit/ui/app/selectors.spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/unit/ui/app/reducers/metamask.spec.js b/test/unit/ui/app/reducers/metamask.spec.js index e1a50eef2..502e7ef33 100644 --- a/test/unit/ui/app/reducers/metamask.spec.js +++ b/test/unit/ui/app/reducers/metamask.spec.js @@ -5,7 +5,7 @@ import * as actions from '../../../../../ui/app/actions' describe('MetaMask Reducers', () => { it('init state', () => { - const initState = reduceMetamask({metamask:{}}, {}) + const initState = reduceMetamask({metamask: {}}, {}) assert(initState) }) diff --git a/test/unit/ui/app/selectors.spec.js b/test/unit/ui/app/selectors.spec.js index 78c4267ee..e2b198abf 100644 --- a/test/unit/ui/app/selectors.spec.js +++ b/test/unit/ui/app/selectors.spec.js @@ -148,7 +148,7 @@ describe('Selectors', function () { it('#getSelectedTokenToFiatRate', () => { const selectedTokenToFiatRate = selectors.getSelectedTokenToFiatRate(mockState) - assert.equal(selectedTokenToFiatRate, '0.21880988420033493') + assert.equal(selectedTokenToFiatRate, '0.21880988420033492152') }) describe('#getSelectedTokenContract', () => { |