aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-08-05 15:27:29 +0800
committerGitHub <noreply@github.com>2017-08-05 15:27:29 +0800
commit3f5b82f7efa713d4927856187108a0e61f5cfb75 (patch)
tree8c71175809fd019aec8762c5c1aaf9736d4a4e24
parentd811999090b412f84b8f9a7233de5a9bdb19e1f3 (diff)
parentf37f405d5273ce6387132e4e9887d6b578b74fea (diff)
downloadtangerine-wallet-browser-3f5b82f7efa713d4927856187108a0e61f5cfb75.tar.gz
tangerine-wallet-browser-3f5b82f7efa713d4927856187108a0e61f5cfb75.tar.zst
tangerine-wallet-browser-3f5b82f7efa713d4927856187108a0e61f5cfb75.zip
Merge pull request #1867 from sdtsui/NewUI
Fix integration tests for NewUI
-rw-r--r--test/integration/lib/first-time.js8
-rw-r--r--ui/app/app.js1
2 files changed, 7 insertions, 2 deletions
diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index 6c8cedbac..0e4b802da 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -90,7 +90,13 @@ QUnit.test('render init screen', function (assert) {
return wait()
}).then(function (){
- var qrButton = app.find('.fa.fa-qrcode')[0]
+ var qrButton = app.find('.fa.fa-ellipsis-h')[0] // open account settings dropdown
+ qrButton.click()
+
+ return wait(1000)
+ }).then(function (){
+
+ var qrButton = app.find('.dropdown-menu-item')[1] // qr code item
qrButton.click()
return wait(1000)
diff --git a/ui/app/app.js b/ui/app/app.js
index 620b4617a..4565bdd37 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -198,7 +198,6 @@ App.prototype.renderAppBar = function () {
isOpen: state.isMainMenuOpen,
color: 'rgb(247,146,30)',
onClick: () => {
- event.stopPropagation()
this.setState({
isMainMenuOpen: !state.isMainMenuOpen,
})