Merge lp:~stolowski/unity-scope-click/apps-new-search-semantics into lp:unity-scope-click

[Paweł Stołowski]

Always push departments (departments should be available also in search mode) and allow searching inside departments.

Always push departments (departments should be available also in search mode) and allow searching inside departments.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:398
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/720/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/124/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/120/console

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

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

Looks ok to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:400
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/725/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/129/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/125/console

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

review: Needs Fixing (continuous-integration)

[lp:~stolowski/unity-scope-click/apps-new-search-semantics]

401. By Paweł Stołowski on 2016-03-09

Merged trunk

402. By Paweł Stołowski on 2016-03-09

Fix test

=== modified file 'libclickscope/click/index.cpp'
--- libclickscope/click/index.cpp	2016-01-21 23:25:38 +0000
+++ libclickscope/click/index.cpp	2016-03-09 13:08:23 +0000
@@ -147,11 +147,11 @@
     return std::pair<Packages, Packages>(pl, recommends);
 }
 
-click::web::Cancellable Index::search (const std::string& query,
+click::web::Cancellable Index::search (const std::string& query, const std::string& department,
                                        std::function<void(click::Packages search_results, click::Packages recommendations)> callback)
 {
     click::web::CallParams params;
-    const std::string built_query(build_index_query(query, ""));
+    const std::string built_query(build_index_query(query, department));
     params.add(click::QUERY_ARGNAME, built_query.c_str());
     QSharedPointer<click::web::Response> response(client->call(
         get_base_url() + click::SEARCH_PATH, "GET", true, build_headers(), "", params));
 
=== modified file 'libclickscope/click/index.h'
--- libclickscope/click/index.h	2015-11-24 18:23:23 +0000
+++ libclickscope/click/index.h	2016-03-09 13:08:23 +0000
@@ -79,7 +79,7 @@
     Index(const QSharedPointer<click::web::Client>& client,
           const QSharedPointer<Configuration> configuration=QSharedPointer<Configuration>(new Configuration()));
     virtual std::pair<Packages, Packages> package_lists_from_json(const std::string& json);
-    virtual click::web::Cancellable search (const std::string& query, std::function<void(Packages, Packages)> callback);
+    virtual click::web::Cancellable search (const std::string& query, const std::string& department, std::function<void(Packages, Packages)> callback);
     virtual click::web::Cancellable get_details(const std::string& package_name, std::function<void(PackageDetails, Error)> callback);
     virtual click::web::Cancellable bootstrap(std::function<void(const DepartmentList&, const HighlightList&, Error, int)> callback);
     virtual click::web::Cancellable departments(const std::string& department_href, std::function<void(const DepartmentList&, const HighlightList&, Error, int)> callback);
 
=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2016-03-07 14:10:22 +0000
+++ libclickscope/click/interface.cpp	2016-03-09 13:08:23 +0000
@@ -274,7 +274,7 @@
 {
     //
     // only apply department filtering if not in root of all departments.
-    bool apply_department_filter = (search_query.empty() && !current_department.empty());
+    bool apply_department_filter = !current_department.empty();
 
     // get the set of packages that belong to current deparment;
     std::unordered_set<std::string> packages_in_department;
 
=== modified file 'libclickscope/tests/integration/webclient_integration.cpp'
--- libclickscope/tests/integration/webclient_integration.cpp	2014-06-24 17:18:53 +0000
+++ libclickscope/tests/integration/webclient_integration.cpp	2016-03-09 13:08:23 +0000
@@ -103,7 +103,7 @@
                 new click::web::Client(namPtr));
     click::Index index(clientPtr);
     click::Packages packages;
-    index.search("qr", [&, this](click::Packages found_packages,
+    index.search("qr", "", [&, this](click::Packages found_packages,
                                  click::Packages){
         packages = found_packages;
         Quit();
 
=== modified file 'libclickscope/tests/test_index.cpp'
--- libclickscope/tests/test_index.cpp	2016-01-21 23:25:38 +0000
+++ libclickscope/tests/test_index.cpp	2016-03-09 13:08:23 +0000
@@ -109,7 +109,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    indexPtr->search("", [](click::Packages, click::Packages) {});
+    indexPtr->search("", "", [](click::Packages, click::Packages) {});
 }
 
 MATCHER_P(QueryContains, query, "")
@@ -132,7 +132,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    indexPtr->search("FooBar", [](click::Packages, click::Packages) {});
+    indexPtr->search("FooBar", "", [](click::Packages, click::Packages) {});
 }
 
 
@@ -151,7 +151,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    indexPtr->search("", [](click::Packages, click::Packages) {});
+    indexPtr->search("", "", [](click::Packages, click::Packages) {});
 }
 
 TEST_F(IndexTest, testBootstrapSignsCall)
@@ -206,7 +206,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    indexPtr->search("", [](click::Packages, click::Packages) {});
+    indexPtr->search("", "", [](click::Packages, click::Packages) {});
 }
 
 TEST_F(IndexTest, testSearchCallbackIsCalled)
@@ -229,7 +229,7 @@
             .WillOnce(Return(response));
     EXPECT_CALL(*this, search_callback(_, _)).Times(1);
 
-    indexPtr->search("", [this](click::Packages packages,
+    indexPtr->search("", "", [this](click::Packages packages,
                                 click::Packages recommends){
                          search_callback(packages, recommends);
     });
@@ -257,7 +257,7 @@
     click::Packages empty_package_list;
     EXPECT_CALL(*this, search_callback(empty_package_list, _)).Times(1);
 
-    indexPtr->search("", [this](click::Packages packages,
+    indexPtr->search("", "", [this](click::Packages packages,
                                 click::Packages recommends){
                          search_callback(packages, recommends);
     });
@@ -293,7 +293,7 @@
     };
     EXPECT_CALL(*this, search_callback(single_package_list, _)).Times(1);
 
-    indexPtr->search("", [this](click::Packages packages,
+    indexPtr->search("", "", [this](click::Packages packages,
                                 click::Packages recommends){
                          search_callback(packages, recommends);
     });
@@ -315,7 +315,7 @@
             .Times(1)
             .WillOnce(Return(response));
 
-    auto search_operation = indexPtr->search("", [](click::Packages,
+    auto search_operation = indexPtr->search("", "", [](click::Packages,
                                                     click::Packages) {});
     EXPECT_CALL(reply.instance, abort()).Times(1);
     search_operation.cancel();
@@ -341,7 +341,7 @@
             .Times(1)
             .WillOnce(Return(response));
     EXPECT_CALL(reply.instance, errorString()).Times(1).WillOnce(Return("fake error"));
-    indexPtr->search("", [this](click::Packages packages,
+    indexPtr->search("", "", [this](click::Packages packages,
                                 click::Packages recommends){
                          search_callback(packages, recommends);
     });
 
=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2016-02-19 03:35:43 +0000
+++ scope/clickapps/apps-query.cpp	2016-03-09 13:08:23 +0000
@@ -412,11 +412,9 @@
     auto const ignoredApps = impl->configuration.get_ignored_apps();
     auto const localResults = clickInterfaceInstance().find_installed_apps(querystr, ignoredApps, current_dept, impl->depts_db);
 
-    if (querystr.empty()) {
-        if (impl->depts_db)
-        {
-            push_local_departments(searchReply, localResults);
-        }
+    if (impl->depts_db)
+    {
+        push_local_departments(searchReply, localResults);
     }
 
     if (show_top_apps)
 
=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2016-01-06 18:08:33 +0000
+++ scope/clickstore/store-query.cpp	2016-03-09 13:08:23 +0000
@@ -429,6 +429,20 @@
     }
 }
 
+void click::Query::push_departments(scopes::SearchReplyProxy const& searchReply)
+{
+    auto rootdep = impl->department_lookup.get_department_info("");
+    if (!rootdep)
+    {
+        qWarning() << "No department information available";
+        return;
+    }
+
+    auto subdepts = rootdep->sub_departments();
+    auto root = populate_departments(subdepts, "");
+    push_departments(searchReply, root);
+}
+
 //
 // push highlights and departments
 // use cached highlights for root department, otherwise run an async job for highlights of current department.
@@ -559,7 +573,8 @@
                     else
                     {
                         qDebug() << "starting search of" << QString::fromStdString(query().query_string());
-                        impl->search_operation = impl->index.search(query().query_string(), search_cb);
+                        push_departments(searchReply);
+                        impl->search_operation = impl->index.search(query().query_string(), query().department_id(), search_cb);
                     }
                 }
             });
@@ -573,7 +588,8 @@
             else // normal search
             {
                 qDebug() << "starting search of" << QString::fromStdString(query().query_string());
-                impl->search_operation = impl->index.search(query().query_string(), search_cb);
+                push_departments(searchReply);
+                impl->search_operation = impl->index.search(query().query_string(), query().department_id(), search_cb);
             }
         }
     });
 
=== modified file 'scope/clickstore/store-query.h'
--- scope/clickstore/store-query.h	2015-11-24 18:23:23 +0000
+++ scope/clickstore/store-query.h	2016-03-09 13:08:23 +0000
@@ -88,6 +88,7 @@
     virtual unity::scopes::Department::SPtr populate_departments(const click::DepartmentList& depts, const std::string& current_department_id);
     virtual void store_departments(const click::DepartmentList& depts);
     virtual void push_departments(const scopes::SearchReplyProxy& searchReply, const scopes::Department::SCPtr& root);
+    virtual void push_departments(scopes::SearchReplyProxy const& searchReply);
     virtual void add_highlights(scopes::SearchReplyProxy const& searchReply, const PackageSet& installedPackages);
     virtual void add_available_apps(const scopes::SearchReplyProxy &searchReply, const PackageSet &installedPackages, const std::string &category);
     virtual click::Interface& clickInterfaceInstance();
 
=== modified file 'scope/tests/test_apps_query.cpp'
--- scope/tests/test_apps_query.cpp	2016-02-19 03:35:43 +0000
+++ scope/tests/test_apps_query.cpp	2016-03-09 13:08:23 +0000
@@ -172,24 +172,6 @@
     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.
-MATCHER_P(MatchesDepartments, depts, "") {
-    auto it = depts.begin();
-    if (arg->id() != *it)
-        return false;
-    auto const subdeps = arg->subdepartments();
-    if (subdeps.size() != depts.size() - 1)
-        return false;
-    for (auto const& sub: subdeps)
-    {
-        if (sub->id() != *(++it))
-            return false;
-    }
-    return true;
-}
-
 class DepartmentsTest : public ::testing::Test {
 protected:
     virtual void SetUp() override
@@ -323,3 +305,37 @@
         q.run(reply);
     }
 }
+
+TEST_F(DepartmentsTest, testSearchInDepartment)
+{
+    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 a leaf department
+    {
+        const unity::scopes::CannedQuery query("foo.scope", "Fooo", "games");
+
+        MockAppsQuery q(query, depts_db, metadata, clickif);
+
+        scopes::testing::MockSearchReply mock_reply;
+        scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+
+        std::list<std::string> expected_departments({"", "games"});
+
+        EXPECT_CALL(*clickif, find_installed_apps("Fooo", _, "games", _)).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(*depts_db, get_department_name("games", expected_locales)).WillOnce(Return("Games"));
+        EXPECT_CALL(*depts_db, get_children_departments("games")).WillOnce(Return(
+                    std::list<click::DepartmentsDb::DepartmentInfo>({})
+                    ));
+
+        EXPECT_CALL(mock_reply, register_departments(MatchesDepartments(expected_departments)));
+
+        EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(3).WillRepeatedly(Return(true));
+
+        q.run(reply);
+    }
+
+}
 
=== modified file 'scope/tests/test_helpers.h'
--- scope/tests/test_helpers.h	2014-08-07 15:34:47 +0000
+++ scope/tests/test_helpers.h	2016-03-09 13:08:23 +0000
@@ -6,6 +6,7 @@
 #include "click/index.h"
 #include <click/interface.h>
 #include <click/package.h>
+#include <gtest/gtest.h>
 
 namespace click
 {
@@ -16,6 +17,23 @@
 static const std::string FAKE_QUERY {"FAKE_QUERY"};
 static const std::string FAKE_CATEGORY_TEMPLATE {"{}"};
 
+// 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.
+MATCHER_P(MatchesDepartments, depts, "") {
+    auto it = depts.begin();
+    if (arg->id() != *it)
+        return false;
+    auto const subdeps = arg->subdepartments();
+    if (subdeps.size() != depts.size() - 1)
+        return false;
+    for (auto const& sub: subdeps)
+    {
+        if (sub->id() != *(++it))
+            return false;
+    }
+    return true;
+}
 
 class MockIndex : public click::Index {
     click::Packages packages;
@@ -35,9 +53,9 @@
 
     }
 
-    click::web::Cancellable search(const std::string &query, std::function<void (click::Packages, click::Packages)> callback) override
+    click::web::Cancellable search(const std::string &query, const std::string &department, std::function<void (click::Packages, click::Packages)> callback) override
     {
-        do_search(query, callback);
+        do_search(query, department, callback);
         callback(packages, recommends);
         return click::web::Cancellable();
     }
@@ -48,8 +66,8 @@
         return click::web::Cancellable();
     }
 
-    MOCK_METHOD2(do_search,
-                 void(const std::string&,
+    MOCK_METHOD3(do_search,
+                 void(const std::string&, const std::string&,
                       std::function<void(click::Packages, click::Packages)>));
 };
 
 
=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2015-07-31 20:06:49 +0000
+++ scope/tests/test_query.cpp	2016-03-09 13:08:23 +0000
@@ -141,7 +141,7 @@
     PackageSet no_installed_packages;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)).Times(1);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _)).Times(1);
 
     scopes::testing::MockSearchReply mock_reply;
     scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
@@ -168,7 +168,7 @@
     PackageSet no_installed_packages;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -199,7 +199,7 @@
     PackageSet no_installed_packages;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -254,7 +254,7 @@
     MockPayPackage pay_pkg;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -286,7 +286,7 @@
     MockPayPackage pay_pkg;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -325,7 +325,7 @@
     MockPayPackage pay_pkg;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, depts_db, highlights, metadata, pay_pkg);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -337,6 +337,34 @@
     q.wrap_add_available_apps(reply, one_installed_package, FAKE_CATEGORY_TEMPLATE);
 }
 
+TEST(QueryTest, testSearchInDepartment)
+{
+    auto dept1 = std::make_shared<click::Department>("1", "Department one", "http://one.com", true);
+    DepartmentList init_departments({dept1});
+    auto depts_db = std::make_shared<MockDepartmentsDb>(":memory:", true);
+
+    MockIndex mock_index(click::Packages(), click::DepartmentList(), init_departments);
+    scopes::SearchMetadata metadata("en_EN", "phone");
+
+    click::DepartmentLookup dept_lookup;
+    click::HighlightList highlights;
+    MockPayPackage pay_pkg;
+    const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "1");
+    MockQuery q(query, mock_index, dept_lookup, depts_db, highlights, metadata, pay_pkg);
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, "1", _));
+
+    scopes::CategoryRenderer renderer("{}");
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+    EXPECT_CALL(q, register_category(_, _, _, _, _)).Times(2).WillRepeatedly(Return(ptrCat));
+
+    std::list<std::string> expected_departments({"", "1"});
+    scopes::testing::MockSearchReply mock_reply;
+    EXPECT_CALL(mock_reply, register_departments(MatchesDepartments(expected_departments)));
+    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
+    EXPECT_CALL(q, finished(_)).Times(1);
+    q.wrap_add_available_apps(reply, PackageSet(), FAKE_CATEGORY_TEMPLATE);
+}
+
 class FakeInterface : public click::Interface
 {
 public:
@@ -385,7 +413,7 @@
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
     q.purchased_apps.insert({"name"});
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -421,7 +449,7 @@
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
     q.purchased_apps.insert({"name"});
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -456,7 +484,7 @@
     MockPayPackage pay_pkg;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -488,7 +516,7 @@
     MockPayPackage pay_pkg;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -521,7 +549,7 @@
     MockPayPackage pay_pkg;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
@@ -617,7 +645,7 @@
     MockPayPackage pay_pkg;
     const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
     MockQuery q(query, mock_index, dept_lookup, nullptr, highlights, metadata, pay_pkg);
-    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
+    EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _, _));
 
     scopes::CategoryRenderer renderer("{}");
     auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
 
=== modified file 'tests/scope-harness/tests/test_apps.py'
--- tests/scope-harness/tests/test_apps.py	2015-06-22 17:05:41 +0000
+++ tests/scope-harness/tests/test_apps.py	2016-03-09 13:08:23 +0000
@@ -107,7 +107,6 @@
         departments = self.view.browse_department('')
 
         self.assertTrue(self.view.has_departments)
-        self.assertFalse(self.view.has_alt_departments)
 
         # TODO: list all expected departments (depending on installed apps)
         match = DepartmentMatcher() \
 
=== modified file 'tests/scope-harness/tests/test_store.py'
--- tests/scope-harness/tests/test_store.py	2015-04-03 18:33:10 +0000
+++ tests/scope-harness/tests/test_store.py	2016-03-09 13:08:23 +0000
@@ -111,7 +111,6 @@
         departments = self.view.browse_department('')
 
         self.assertTrue(self.view.has_departments)
-        self.assertFalse(self.view.has_alt_departments)
 
         match = DepartmentMatcher() \
             .mode(DepartmentMatcherMode.STARTS_WITH) \