Merge lp:~stolowski/unity-scope-click/local-departments-store-link into lp:unity-scope-click/devel

[Paweł Stołowski]

Make "Ubuntu store'" orange card carry current department id when browsing Apps by department and change its category title to "Get more apps like this from the Store".

Make "Ubuntu store'" orange card carry current department id when browsing Apps by department and change its category title to "Get more apps like this from the Store". Clicking the card will open store scope in the target department.
This change has been discussed with design this morning.

Note: there is a shell plugin bug that breaks the expected behavior atm: https://bugs.launchpad.net/unity-scopes-shell/+bug/1343242

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/204/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/178
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/178

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:325
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/205/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/179
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/179

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

review: Approve (continuous-integration)

[lp:~stolowski/unity-scope-click/local-departments-store-link]

327. By Paweł Stołowski on 2014-07-18

Merged devel.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/221/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/195
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/195

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

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Please put the test for this new feature in a separate test case. Otherwise the branch looks goood.

review: Needs Fixing

[lp:~stolowski/unity-scope-click/local-departments-store-link]

328. By Paweł Stołowski on 2014-07-22

Merged devel

329. By Paweł Stołowski on 2014-07-22

Moved test for new functionality into a separate test case

[Paweł Stołowski (stolowski)]

> Please put the test for this new feature in a separate test case. Otherwise
> the branch looks goood.

Done

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:329
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/227/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/202
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/201
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/201/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/201

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

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good!

review: Approve

=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2014-07-17 20:05:57 +0000
+++ scope/clickapps/apps-query.cpp	2014-07-22 09:41:46 +0000
@@ -267,11 +267,15 @@
             cat_title = tmp;
         }
     }
+    else if (!query().department_id().empty())
+    {
+        cat_title = _("Get more apps like this from the Store");
+    }
 
     scopes::CategoryRenderer rdr(CATEGORY_STORE);
     auto cat = searchReply->register_category("store", cat_title, "", rdr);
 
-    const unity::scopes::CannedQuery store_scope("com.canonical.scopes.clickstore", querystr, "");
+    const unity::scopes::CannedQuery store_scope("com.canonical.scopes.clickstore", querystr, querystr.empty() ? query().department_id() : "");
 
     scopes::CategorisedResult res(cat);
     res.set_title(title);

=== modified file 'scope/tests/test_apps_query.cpp'
--- scope/tests/test_apps_query.cpp	2014-07-18 15:01:41 +0000
+++ scope/tests/test_apps_query.cpp	2014-07-22 09:41:46 +0000
@@ -151,6 +151,27 @@
     q2.add_fake_store_app(reply2);
 }
 
+TEST(Query, testUbuntuStoreFakeResultWithDepartment)
+{
+    const scopes::SearchMetadata metadata("en_EN", "phone");
+    const unity::scopes::CannedQuery query("foo.scope", "", "music-department");
+
+    click::apps::Query q(query, nullptr, metadata);
+
+    scopes::CategoryRenderer renderer("{}");
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+
+    scopes::testing::MockSearchReply mock_reply;
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+
+    const unity::scopes::CannedQuery target_query("com.canonical.scopes.clickstore", "", "music-department");
+
+    EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
+    EXPECT_CALL(mock_reply, push(Matcher<const unity::scopes::CategorisedResult&>(ResultUriMatchesCannedQuery(target_query))));
+
+    q.add_fake_store_app(reply);
+}
+
 // this matcher expects a list of department ids in depts:
 // first on the list is the root, followed by children ids.
 // the arg of the matcher is unity::scopes::Department ptr.