Merge lp:~alecu/unity-scope-click/cosmetic-fixes into lp:unity-scope-click/devel

[Alejandro J. Cura]

- Apps category must be expanded (and can't be collapsed).
- Search results category must be expanded.
- Change top 6 apps: phone, messages, contacts, camera, browser, clock.
- Remove "Apps" category title in searches.
- Use art not mascot for app icons in store searches.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'libclickscope/click/configuration.h'
--- libclickscope/click/configuration.h	2014-07-31 19:15:59 +0000
+++ libclickscope/click/configuration.h	2014-08-01 05:17:22 +0000
@@ -70,10 +70,10 @@
         static std::vector<std::string> default_apps {
             "dialer-app",
             "messaging-app",
-            "com.ubuntu.calculator_calculator",
-            "com.ubuntu.clock_clock",
+            "address-book-app",
             "com.ubuntu.camera_camera",
-            "com.ubuntu.calendar_calendar"
+            "webbrowser-app",
+            "com.ubuntu.clock_clock"
         };
         return default_apps;
     }

=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2014-07-31 20:54:02 +0000
+++ scope/clickapps/apps-query.cpp	2014-08-01 05:17:22 +0000
@@ -53,6 +53,7 @@
         "schema-version" : 1,
         "template" : {
             "category-layout" : "grid",
+            "collapsed-rows": 0,
             "card-size": "small"
         },
         "components" : {
@@ -357,7 +358,7 @@
         pusher.push_top_results(localResults, categoryTemplate);
     }
 
-    const bool show_cat_title = current_dept.empty();
+    const bool show_cat_title = current_dept.empty() && querystr.empty();
     pusher.push_local_results(
         localResults,
         categoryTemplate,

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-07-31 19:25:30 +0000
+++ scope/clickstore/store-query.cpp	2014-08-01 05:17:22 +0000
@@ -100,12 +100,14 @@
         "template" : {
             "category-layout" : "grid",
             "card-layout" : "horizontal",
+            "collapsed-rows": 0,
             "card-size": "large"
         },
         "components" : {
             "title" : "title",
-            "mascot" : {
-                "field": "art"
+            "art" : {
+                "field": "art",
+                "aspect-ratio": 1.13
             },
             "subtitle": "subtitle"
         }

=== modified file 'scope/tests/test_apps_query.cpp'
--- scope/tests/test_apps_query.cpp	2014-07-22 20:07:28 +0000
+++ scope/tests/test_apps_query.cpp	2014-08-01 05:17:22 +0000
@@ -271,3 +271,28 @@
     }
 }
 
+TEST_F(DepartmentsTest, testNoDepartmentSearch)
+{
+    auto clickif = std::make_shared<MockClickInterface>();
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+    auto depts_db = std::make_shared<MockDepartmentsDb>(":memory:", true);
+
+    // query for department-less search
+    {
+        const unity::scopes::CannedQuery query("foo.scope", "App", "");
+
+        MockAppsQuery q(query, depts_db, metadata, clickif);
+
+        scopes::testing::MockSearchReply mock_reply;
+        scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+
+        EXPECT_CALL(*clickif, find_installed_apps(_, _, _)).WillOnce(Return(installed_apps));
+        EXPECT_CALL(mock_reply, register_category("local", StrEq(""), _, _)).WillOnce(Return(ptrCat));
+        EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
+
+        EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(2).WillRepeatedly(Return(true));
+
+        q.run(reply);
+    }
+}
+