From 06ff866e9d415eb9ce85394036f30aab5f619cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 14 Sep 2017 19:32:06 +0200 Subject: [PATCH] Fix broken JavaScript tests (#6498) * Fixing/removing failing JS tests. * Fix javascript tests. --- js/src/api/subscriptions/manager.spec.js | 3 ++- js/src/api/subscriptions/personal.spec.js | 3 ++- js/src/mobx/hardwareStore.spec.js | 22 +++++-------------- .../redux/providers/signerMiddleware.spec.js | 6 +++++ js/src/views/Account/account.spec.js | 11 +++++++++- js/src/views/Accounts/accounts.spec.js | 6 ++++- js/src/views/ParityBar/accountStore.spec.js | 12 +--------- .../SignRequest/signRequest.spec.js | 2 +- 8 files changed, 33 insertions(+), 32 deletions(-) diff --git a/js/src/api/subscriptions/manager.spec.js b/js/src/api/subscriptions/manager.spec.js index df708a36d..05d645e6b 100644 --- a/js/src/api/subscriptions/manager.spec.js +++ b/js/src/api/subscriptions/manager.spec.js @@ -23,7 +23,8 @@ function newStub () { const manager = new Manager({ transport: { - isConnected: true + isConnected: true, + on: sinon.stub() } }); diff --git a/js/src/api/subscriptions/personal.spec.js b/js/src/api/subscriptions/personal.spec.js index ac046d250..3e950579c 100644 --- a/js/src/api/subscriptions/personal.spec.js +++ b/js/src/api/subscriptions/personal.spec.js @@ -37,7 +37,8 @@ function stubApi (accounts, info) { return { _calls, transport: { - isConnected: true + isConnected: true, + on: sinon.stub() }, parity: { accountsInfo: () => { diff --git a/js/src/mobx/hardwareStore.spec.js b/js/src/mobx/hardwareStore.spec.js index 784fc3f10..c620294f8 100644 --- a/js/src/mobx/hardwareStore.spec.js +++ b/js/src/mobx/hardwareStore.spec.js @@ -31,6 +31,12 @@ let store; function createApi () { api = { + transport: { + on: sinon.stub() + }, + pubsub: { + subscribeAndGetResult: sinon.stub().returns(Promise.reject(new Error('not connected'))) + }, parity: { hardwareAccountsInfo: sinon.stub().resolves({ ADDRESS: WALLET }), setAccountMeta: sinon.stub().resolves(true), @@ -195,22 +201,11 @@ describe('mobx/HardwareStore', () => { }); }); - describe('scanParity', () => { - beforeEach(() => { - return store.scanParity(); - }); - - it('calls parity_hardwareAccountsInfo', () => { - expect(api.parity.hardwareAccountsInfo).to.have.been.called; - }); - }); - describe('scan', () => { beforeEach(() => { sinon.spy(store, 'setScanning'); sinon.spy(store, 'setWallets'); sinon.spy(store, 'scanLedger'); - sinon.spy(store, 'scanParity'); return store.scan(); }); @@ -219,17 +214,12 @@ describe('mobx/HardwareStore', () => { store.setScanning.restore(); store.setWallets.restore(); store.scanLedger.restore(); - store.scanParity.restore(); }); it('calls scanLedger', () => { expect(store.scanLedger).to.have.been.called; }); - it('calls scanParity', () => { - expect(store.scanParity).to.have.been.called; - }); - it('sets and resets the scanning state', () => { expect(store.setScanning).to.have.been.calledWith(true); expect(store.setScanning).to.have.been.calledWith(false); diff --git a/js/src/redux/providers/signerMiddleware.spec.js b/js/src/redux/providers/signerMiddleware.spec.js index 1dcc19d75..4ee1123c1 100644 --- a/js/src/redux/providers/signerMiddleware.spec.js +++ b/js/src/redux/providers/signerMiddleware.spec.js @@ -48,6 +48,12 @@ let store; function createApi () { api = { + transport: { + on: sinon.stub() + }, + pubsub: { + subscribeAndGetResult: sinon.stub().returns(Promise.reject(new Error('not connected'))) + }, net: { version: sinon.stub().resolves('2') }, diff --git a/js/src/views/Account/account.spec.js b/js/src/views/Account/account.spec.js index 6a96d6300..d80376029 100644 --- a/js/src/views/Account/account.spec.js +++ b/js/src/views/Account/account.spec.js @@ -14,6 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . +import sinon from 'sinon'; import { shallow } from 'enzyme'; import React from 'react'; @@ -34,7 +35,15 @@ function render (props) { />, { context: { - store: createRedux() + store: createRedux(), + api: { + transport: { + on: sinon.stub() + }, + pubsub: { + subscribeAndGetResult: sinon.stub() + } + } } } ).find('Account').shallow(); diff --git a/js/src/views/Accounts/accounts.spec.js b/js/src/views/Accounts/accounts.spec.js index 3c6ab9439..3fad02643 100644 --- a/js/src/views/Accounts/accounts.spec.js +++ b/js/src/views/Accounts/accounts.spec.js @@ -27,7 +27,11 @@ let instance; let redux; function createApi () { - api = {}; + api = { + pubsub: { + subscribeAndGetResult: sinon.stub().returns(Promise.reject(new Error('uninitialized'))) + } + }; return api; } diff --git a/js/src/views/ParityBar/accountStore.spec.js b/js/src/views/ParityBar/accountStore.spec.js index 16cebf9e1..6935645d1 100644 --- a/js/src/views/ParityBar/accountStore.spec.js +++ b/js/src/views/ParityBar/accountStore.spec.js @@ -18,7 +18,7 @@ import sinon from 'sinon'; import AccountStore from './accountStore'; -import { ACCOUNT_DEFAULT, ACCOUNT_NEW, createApi } from './parityBar.test.js'; +import { ACCOUNT_NEW, createApi } from './parityBar.test.js'; let api; let store; @@ -89,16 +89,6 @@ describe('views/ParityBar/AccountStore', () => { }); }); - describe('loadDefaultAccount', () => { - beforeEach(() => { - return store.loadDefaultAccount(); - }); - - it('load and set the default account', () => { - expect(store.defaultAccount).to.equal(ACCOUNT_DEFAULT); - }); - }); - describe('makeDefaultAccount', () => { beforeEach(() => { return store.makeDefaultAccount(ACCOUNT_NEW); diff --git a/js/src/views/Signer/components/SignRequest/signRequest.spec.js b/js/src/views/Signer/components/SignRequest/signRequest.spec.js index ea5e274ed..ae197489b 100644 --- a/js/src/views/Signer/components/SignRequest/signRequest.spec.js +++ b/js/src/views/Signer/components/SignRequest/signRequest.spec.js @@ -73,7 +73,7 @@ function render () { return component; } -describe.only('views/Signer/components/SignRequest', () => { +describe('views/Signer/components/SignRequest', () => { beforeEach(() => { render(); });