pay-ui

Merge lp:~dobey/pay-ui/fix-card-cancel into lp:pay-ui

  1. fix-card-cancel
  2. Merge into first-branch
Proposed by dobey on 2015-01-12
Status: Merged
Approved by: dobey on 2015-01-13
Approved revision: 96
Merged at revision: 96
Proposed branch: lp:~dobey/pay-ui/fix-card-cancel
Merge into: lp:pay-ui
Diff against target: 29 lines (+3/-3)
2 files modified
app/payui.qml (+1/-1)
manifest.json (+2/-2)
To merge this branch: bzr merge lp:~dobey/pay-ui/fix-card-cancel
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-01-12
Alejandro J. Cura (community) 2015-01-12 Approve on 2015-01-12
Review via email: mp+246223@code.launchpad.net

Commit Message

Move the pop inside the if to avoid hitting the current page changed handler.

Description of the Change

This bug was caught by an autopilot test, so this fix should make that test past now, as well as there is a condition in the manual test plan for it. I'm not sure how this slipped through, but it did. The code could use more cleanup but this is the smallest possible change to fix it, that I can see right now.

To post a comment you must log in.
Alejandro J. Cura (alecu) wrote :

Looks good, and makes the autopilot tests pass in lp:~alecu/pay-ui/increase-coverage

review: Approve
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/pay-ui-autolanding/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-autolanding/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-autolanding/8
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-autolanding/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-autolanding/8

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/payui.qml'
2--- app/payui.qml 2015-01-07 03:46:02 +0000
3+++ app/payui.qml 2015-01-12 21:25:14 +0000
4@@ -416,10 +416,10 @@
5 }
6
7 onPurchaseCancelled: {
8- pageStack.pop();
9 hideLoading();
10 if (mainView.state == "add-payment") {
11 mainView.state = "checkout";
12+ pageStack.pop();
13 } else {
14 purchase.quitCancel();
15 }
16
17=== modified file 'manifest.json'
18--- manifest.json 2014-12-05 18:47:49 +0000
19+++ manifest.json 2015-01-12 21:25:14 +0000
20@@ -11,6 +11,6 @@
21 "pay-ui": "payui_payui.desktop"
22 }
23 },
24- "version": "0.4.3",
25+ "version": "0.4.4",
26 "maintainer": "Ubuntu Appstore Developers <ubuntu-appstore-developers@lists.launchpad.net>"
27-}
28\ No newline at end of file
29+}

Subscribers

People subscribed via source and target branches

to all changes: