Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/2178-e2e-cucumber' into 2178-e2e…
Browse files Browse the repository at this point in the history
…-cucumber

# Conflicts:
#	i18n/locales/en/common.json
#	package-lock.json
#	package.json
#	test/cypress/e2e/send.spec.js
#	test/cypress/features/login/login.js
#	test/cypress/features/send.feature
#	test/cypress/features/send/send.js
  • Loading branch information
andreiklimenok committed Jul 2, 2019
2 parents 9010bfa + 59beadf commit 489fe1e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion test/cypress/features/login.feature
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Feature: Login
Given showNetwork setting is true
Given I am on Login page
When I choose testnet
When I login as testnet guy
When I login as testnet_guy
Then I should be connected to testnet

Scenario: Log in to Devnet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Given(/^I confirm transaction$/, function () {
});

Given(/^I see the transaction in transaction list$/, function () {
cy.wait(1000);
cy.get(ss.transactionRow).eq(0).as('tx');
cy.get('@tx').find(ss.transactionAddress).should('have.text', 'Second passphrase registration');
});

0 comments on commit 489fe1e

Please sign in to comment.