Merge branch '1.0.0' into 1002-fix-register-delegate-integration-tests

LiskHQ · Jul 19, 2018 · 42b58d8 · 42b58d8
2 parents ccde1b7 + e73c7cc
commit 42b58d8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/src/components/login/login.js b/src/components/login/login.js
@@ -124,7 +124,9 @@ class Login extends React.Component {
       ...validator(value, error),
     });
 
-    this.props.settingsUpdated({ [name]: value });
+    if (name === 'network') {
+      this.props.settingsUpdated({ network: value });
+    }
   }
 
   onFormSubmit(event) {

diff --git a/src/testFiles.js b/src/testFiles.js
@@ -192,7 +192,7 @@ export const integrationTestsDict = [
   // './login.test.js',
   // './register.test.js',
   // './registerDelegate.test.js',
-  './transactionID.test.js',
+  // './transactionID.test.js',
   // './voting.test.js',
   './wallet.test.js',
 ];
diff --git a/test/integration/transactionID.test.js b/test/integration/transactionID.test.js
@@ -4,8 +4,8 @@ import { expect } from 'chai';
 import { mount } from 'enzyme';
 import { stub, match } from 'sinon';
 
-import * as peers from '../../src/utils/api/peers';
 import * as accountAPI from '../../src/utils/api/account';
+import * as transactionsAPI from '../../src/utils/api/transactions';
 import { prepareStore, renderWithRouter } from '../utils/applicationInit';
 import accountReducer from '../../src/store/reducers/account';
 import transactionReducer from '../../src/store/reducers/transaction';
@@ -24,43 +24,51 @@ import GenericStepDefinition from '../utils/genericStepDefinition';
 
 class Helper extends GenericStepDefinition {
   checkTxDetails() {
-    expect(this.wrapper.find('.transaction-id').first().text()).to.contain('123456789');
-    expect(this.wrapper.find('#sender-address').first().text()).to.contain('123l');
+    expect(this.wrapper).to.have.descendants('.transaction-id');
+    expect(this.wrapper.find('.transaction-id').first()).to.include.text('123456789');
+    expect(this.wrapper).to.have.descendants('#sender-address');
+    expect(this.wrapper.find('#sender-address').first()).to.include.text('123l');
   }
 }
 
 describe('@integration: Single Transaction', () => {
   let store;
   let helper;
   let wrapper;
-  let requestToActivePeerStub;
   let accountAPIStub;
-  let transactionAPIStub;
+  let getTransactionsAPIStub;
+  let getSingleTransactionAPIStub;
 
   beforeEach(() => {
-    requestToActivePeerStub = stub(peers, 'requestToActivePeer');
-    transactionAPIStub = stub(accountAPI, 'transaction');
+    getTransactionsAPIStub = stub(transactionsAPI, 'getTransactions');
+    getSingleTransactionAPIStub = stub(transactionsAPI, 'getSingleTransaction');
     accountAPIStub = stub(accountAPI, 'getAccount');
 
-    transactionAPIStub
+    getTransactionsAPIStub
       .returnsPromise()
       .resolves({
-        transaction: {
-          id: '123456789', senderId: '123l', recipientId: '456l', votes: { added: [], deleted: [] },
-        },
+        data: [{
+          id: '123456789',
+          senderId: '123l',
+          recipientId: '456l',
+          asset: {
+            votes: { added: [], deleted: [] },
+          },
+        }],
       });
 
-    requestToActivePeerStub.withArgs(match.any, 'transactions/get', { id: '123456789' })
+    getSingleTransactionAPIStub
       .returnsPromise()
       .resolves({
-        success: true,
-        transaction: { id: '123456789', senderId: '123l', recipientId: '456l' },
+        data: [{
+          id: '123456789', senderId: '123l', recipientId: '456l', asset: {},
+        }],
       });
   });
 
   afterEach(() => {
-    requestToActivePeerStub.restore();
-    transactionAPIStub.restore();
+    getTransactionsAPIStub.restore();
+    getSingleTransactionAPIStub.restore();
     accountAPIStub.restore();
     wrapper.update();
   });