Merge lp:~dobey/unity-scope-click/avoid-isrefundable into lp:unity-scope-click

[dobey]

Don't check refundability if price in details is 0 (or unspecified).
Initialize the price and rating to 0.0f in package details.

Same changes have already landed in vivid+overlay.

[Charles Kerr (charlesk)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:359
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/666/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/68/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/666/rebuild

review: Approve (continuous-integration)

=== modified file 'libclickscope/click/package.h'
--- libclickscope/click/package.h	2015-01-20 03:40:54 +0000
+++ libclickscope/click/package.h	2015-08-06 21:26:56 +0000
@@ -98,12 +98,12 @@
 
     std::string name; // formerly app_id
     std::string title;
-    double price;
+    double price = 0.0f;
     std::string icon_url;
     std::string url;
     std::string version;
     std::string publisher;
-    double rating;
+    double rating = 0.0f;
     void matches (std::string query, std::function<bool> callback);
     std::string content;
     std::map<std::string, double> prices;

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2015-07-07 02:34:41 +0000
+++ libclickscope/click/preview.cpp	2015-08-06 21:26:56 +0000
@@ -796,7 +796,7 @@
     getApplicationUri(manifest, [this, reply, manifest, app_name, &review, userid](const std::string& uri) {
             populateDetails([this, reply, uri, manifest, app_name](const PackageDetails &details){
                 store_department(details);
-                pushPackagePreviewWidgets(reply, details, createButtons(uri, manifest));
+                pushPackagePreviewWidgets(reply, details, createButtons(uri, manifest, details));
             },
             [this, reply, &review, manifest, userid](const ReviewList& reviewlist,
                           click::Reviews::Error error) {
@@ -836,7 +836,8 @@
 }
 
 scopes::PreviewWidgetList InstalledPreview::createButtons(const std::string& uri,
-                                                          const Manifest& manifest)
+                                                          const Manifest& manifest,
+                                                          const PackageDetails& details)
 {
     scopes::PreviewWidgetList widgets;
     scopes::PreviewWidget buttons("buttons", "actions");
@@ -861,16 +862,16 @@
     }
     if (manifest.removable)
     {
-        if (!isRefundable()) {
+        if (details.package.price > 0.00f && isRefundable()) {
+            builder.add_tuple({
+                {"id", scopes::Variant(click::Preview::Actions::CANCEL_PURCHASE_INSTALLED)},
+                {"label", scopes::Variant(_("Cancel Purchase"))}
+            });
+        } else {
             builder.add_tuple({
                 {"id", scopes::Variant(click::Preview::Actions::UNINSTALL_CLICK)},
                 {"label", scopes::Variant(_("Uninstall"))}
             });
-        } else {
-            builder.add_tuple({
-                {"id", scopes::Variant(click::Preview::Actions::CANCEL_PURCHASE_INSTALLED)},
-                {"label", scopes::Variant(_("Cancel Purchase"))}
-            });
         }
     }
     if (!uri.empty() || manifest.removable) {

=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2015-07-07 02:34:41 +0000
+++ libclickscope/click/preview.h	2015-08-06 21:26:56 +0000
@@ -225,7 +225,8 @@
     void getApplicationUri(const Manifest& manifest, std::function<void(const std::string&)> callback);
     std::string get_consumer_key();
     scopes::PreviewWidgetList createButtons(const std::string& uri,
-                                            const click::Manifest& manifest);
+                                            const click::Manifest& manifest,
+                                            const PackageDetails& details);
 private:
     scopes::ActionMetadata metadata;
 };

=== modified file 'libclickscope/tests/test_preview.cpp'
--- libclickscope/tests/test_preview.cpp	2015-07-07 02:48:11 +0000
+++ libclickscope/tests/test_preview.cpp	2015-08-06 21:26:56 +0000
@@ -493,18 +493,20 @@
             .WillOnce(Return(true));
     click::Manifest manifest;
     manifest.removable = true;
-    auto widgets = preview.createButtons("fake uri", manifest);
+    click::PackageDetails details;
+    details.package.price = 0.99f;
+    auto widgets = preview.createButtons("fake uri", manifest, details);
     ASSERT_EQ(get_actions_from_widgets(widgets, 0).size(), 2);
     ASSERT_EQ(get_action_from_widgets(widgets, 0, 1), "cancel_purchase_installed");
 }
 
 TEST_F(InstalledPreviewTest, testIsRefundableButtonNotShown) {
     FakeInstalledRefundablePreview preview(result, metadata, client, pay_package, depts);
-    EXPECT_CALL(preview, isRefundable()).Times(1)
-            .WillOnce(Return(false));
+    EXPECT_CALL(preview, isRefundable()).Times(0);
     click::Manifest manifest;
     manifest.removable = true;
-    auto widgets = preview.createButtons("fake uri", manifest);
+    click::PackageDetails details;
+    auto widgets = preview.createButtons("fake uri", manifest, details);
     ASSERT_EQ(get_actions_from_widgets(widgets, 0).size(), 2);
     ASSERT_EQ(get_action_from_widgets(widgets, 0, 1), "uninstall_click");
 }