Merge lp:~diegosarmentero/pay-ui/payment-methods into lp:pay-ui

[Diego Sarmentero]

- Update combo as requested by design
- Detect preferred payment method with backend (not only from choices)

[lp:~diegosarmentero/pay-ui/payment-methods]

22. By Diego Sarmentero on 2014-08-01

adding test for preferred backend

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:21
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/47

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/50/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:22
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/48

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/51/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'app/ui/CheckoutPage.qml'
--- app/ui/CheckoutPage.qml	2014-07-29 11:32:13 +0000
+++ app/ui/CheckoutPage.qml	2014-08-01 14:23:26 +0000
@@ -152,7 +152,9 @@
                 top: accountView.bottom
                 margins: units.gu(2)
             }
+            expanded: true
             delegate: OptionSelectorDelegate {
+                selected: modelData.preferred
                 Item {
                     anchors.fill: parent
                     Column {

=== modified file 'backend/modules/payui/network.cpp'
--- backend/modules/payui/network.cpp	2014-08-01 14:23:26 +0000
+++ backend/modules/payui/network.cpp	2014-08-01 14:23:26 +0000
@@ -134,13 +134,14 @@
                 QJsonObject object = array.at(i).toObject();
                 QString description = object.value("description").toString();
                 QString backend = object.value("id").toString();
+                bool preferredBackend = object.value("preferred").toBool();
                 QJsonArray choices = object.value("choices").toArray();
                 for (int j = 0; j < choices.size(); j++) {
                     QJsonObject choice = choices.at(j).toObject();
                     QString name = choice.value("description").toString();
                     QString paymentId = choice.value("id").toString();
                     bool requiresInteracion = choice.value("requires_interaction").toBool();
-                    bool preferred = choice.value("preferred").toBool();
+                    bool preferred = choice.value("preferred").toBool() && preferredBackend;
                     PayInfo* pay = new PayInfo();
                     pay->setPayData(name, description, paymentId, backend, requiresInteracion, preferred);
                     listPays.append(qVariantFromValue((QObject*)pay));

=== modified file 'backend/tests/mock_click_server.py'
--- backend/tests/mock_click_server.py	2014-07-29 12:29:10 +0000
+++ backend/tests/mock_click_server.py	2014-08-01 14:23:26 +0000
@@ -31,7 +31,7 @@
                         ],
                         "id": 532,
                         "requires_interaction": False,
-                        "preferred": True,
+                        "preferred": False,
                         "description": "PayPal Preapproved Payment (exp. 2014-04-12)"
                     }
                 ]
@@ -47,7 +47,7 @@
                         ],
                         "id": 1767,
                         "requires_interaction": False,
-                        "preferred": True,
+                        "preferred": False,
                         "description": "**** **** **** 1111 (Visa, exp. 02/2015)"
                     },
                     {
@@ -56,7 +56,7 @@
                         ],
                         "id": 1726,
                         "requires_interaction": False,
-                        "preferred": False,
+                        "preferred": True,
                         "description": "**** **** **** 1111 (Visa, exp. 03/2015)"
                     }
                 ]

=== modified file 'backend/tests/test_network.cpp'
--- backend/tests/test_network.cpp	2014-07-29 17:47:11 +0000
+++ backend/tests/test_network.cpp	2014-08-01 14:23:26 +0000
@@ -29,8 +29,11 @@
 #include <QTest>
 #include <QTimer>
 #include <QSignalSpy>
+#include <QVariant>
+#include <QVariantList>
 
 #include <modules/payui/network.h>
+#include <modules/payui/pay_info.h>
 
 using namespace UbuntuPurchase;
 
@@ -101,6 +104,16 @@
     QTRY_COMPARE(spy.count(), 1);
     QList<QVariant> arguments = spy.takeFirst();
     QVERIFY(arguments.at(0).toList().count() == 3);
+    QVariantList listPays = arguments.at(0).toList();
+    for (int i = 0; i < listPays.count(); i++) {
+        QVariant var = listPays.at(i);
+        PayInfo* info = var.value<PayInfo*>();
+        if (i == 2) {
+            QVERIFY(info->preferred() == true);
+        } else {
+            QVERIFY(info->preferred() == false);
+        }
+    }
 }
 
 void TestNetwork::testNetworkGetPaymentTypesFail()

=== modified file 'manifest.json'
--- manifest.json	2014-08-01 14:23:26 +0000
+++ manifest.json	2014-08-01 14:23:26 +0000
@@ -11,6 +11,6 @@
             "desktop": "payui.desktop"
         }
     },
-    "version": "0.3.7",
+    "version": "0.3.8",
     "maintainer": "Sarmentero Diego <[e-mail]>"
 }
\ No newline at end of file