Merge pull request #623 from LiskHQ/583-account-switcher-integration-…

…test-fails-randomly Account switcher integration test fails randomly - Closes #583
LiskHQ · Mar 29, 2018 · b3ab308 · b3ab308
2 parents 74091cf + 4dc0a95
commit b3ab308
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/components/savedAccounts/accountCard.js b/src/components/savedAccounts/accountCard.js
@@ -49,7 +49,7 @@ const AccountCard = ({ account, t, isEditing, handleRemove, isSecureAppears,
       null
     }
     { isEditing ?
-      <PrimaryButton className='remove-button'
+      <PrimaryButton className={isSelectedForRemove(account) ? 'confirm-button' : 'remove-button'}
         theme={ isSelectedForRemove(account) ?
           {} :
           { button: styles.removeButton }

diff --git a/src/components/savedAccounts/savedAccounts.test.js b/src/components/savedAccounts/savedAccounts.test.js
@@ -89,7 +89,7 @@ describe('SavedAccounts', () => {
   it('should call props.accountRemoved on the second "remove button" click', () => {
     wrapper.find('button.edit-button').simulate('click');
     wrapper.find('button.remove-button').at(1).simulate('click');
-    wrapper.find('button.remove-button').at(1).simulate('click');
+    wrapper.find('button.confirm-button').at(0).simulate('click');
     expect(props.accountRemoved).to.have.been.calledWith(savedAccounts[1]);
   });
 

diff --git a/test/e2e/savedAccounts.feature b/test/e2e/savedAccounts.feature
@@ -42,7 +42,7 @@ Feature: Saved Accounts
     And I should see 2 instances of "saved account card"
     And I click "edit button"
     And I click "remove button"
-    And I click "remove button"
+    And I click "confirm button"
     And I click "edit button"
     Then I should see 1 instances of "saved account card"
 

diff --git a/test/integration/accountSwitch.test.js b/test/integration/accountSwitch.test.js
@@ -92,7 +92,7 @@ describe('@integration: Account switch', () => {
     step('Then I should see 3 instances of "saved account card"', () => helper.shouldSeeCountInstancesOf(3, '.saved-account-card'));
     step('When I click "edit button"', () => helper.clickOnElement('button.edit-button'));
     step('When I click "remove button"', () => helper.clickOnElement('button.remove-button'));
-    step('When I click "remove button"', () => helper.clickOnElement('button.remove-button'));
+    step('When I click "confirm button"', () => helper.clickOnElement('button.confirm-button'));
     step('Then I should see 2 instances of "saved account card"', () => helper.shouldSeeCountInstancesOf(2, '.saved-account-card'));
   });
 
@@ -105,7 +105,7 @@ describe('@integration: Account switch', () => {
     step('Then I should see 3 instances of "saved account card"', () => helper.shouldSeeCountInstancesOf(3, '.saved-account-card'));
     step('When I click "edit button"', () => helper.clickOnElement('button.edit-button'));
     step('When I click "remove button"', () => helper.clickOnElement('button.remove-button'));
-    step('When I click "remove button"', () => helper.clickOnElement('button.remove-button'));
+    step('When I click "confirm button"', () => helper.clickOnElement('button.confirm-button'));
     step('Then I should see 2 instances of "saved account card"', () => helper.shouldSeeCountInstancesOf(2, '.saved-account-card'));
   });
 

diff --git a/test/utils/genericStepDefinition.js b/test/utils/genericStepDefinition.js
@@ -87,6 +87,6 @@ export default class GenericStepDefinition {
    * @param {String} selector - Valid css selector 
    */
   shouldSeeCountInstancesOf(count, selector) {
-    expect(this.wrapper.find(selector)).to.have.lengthOf(count);
+    expect(this.wrapper).to.have.exactly(count).descendants(selector);
   }
 }