unity-scope-click

Merge lp:~alecu/unity-scope-click/no-store into lp:unity-scope-click

  1. no-store
  2. Merge into trunk
Proposed by Alejandro J. Cura
Status: Merged
Approved by: dobey
Approved revision: 477
Merged at revision: 479
Proposed branch: lp:~alecu/unity-scope-click/no-store
Merge into: lp:unity-scope-click
Diff against target: 93 lines (+6/-20)
3 files modified
scope/clickapps/apps-query.cpp (+2/-1)
scope/clickstore/CMakeLists.txt (+0/-11)
scope/tests/test_apps_query.cpp (+4/-8)
To merge this branch: bzr merge lp:~alecu/unity-scope-click/no-store
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+306397@code.launchpad.net

Commit message

Do not show the link to the store scope from the apps scope

Description of the change

Do not show the link to the store scope from the apps scope

To post a comment you must log in.
Revision history for this message
dobey (dobey) wrote :

Looks ok.

review: Approve
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scope/clickapps/apps-query.cpp'
2--- scope/clickapps/apps-query.cpp 2016-06-22 20:46:28 +0000
3+++ scope/clickapps/apps-query.cpp 2016-09-21 21:27:20 +0000
4@@ -438,5 +438,6 @@
5 categoryTemplate,
6 show_cat_title);
7
8- add_fake_store_app(searchReply);
9+ // Do not show the link to the store until the store uses snapd
10+ //add_fake_store_app(searchReply);
11 }
12
13=== modified file 'scope/clickstore/CMakeLists.txt'
14--- scope/clickstore/CMakeLists.txt 2015-05-15 19:07:20 +0000
15+++ scope/clickstore/CMakeLists.txt 2016-09-21 21:27:20 +0000
16@@ -31,11 +31,6 @@
17 ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
18 )
19
20-install(
21- TARGETS ${STORE_LIB_UNVERSIONED}
22- LIBRARY DESTINATION "${STORE_LIB_DIR}"
23- )
24-
25 set(STORE_INI_TARGET com.canonical.scopes.clickstore.ini)
26 configure_file(
27 ${STORE_INI_TARGET}.in.in
28@@ -46,9 +41,3 @@
29 COMMENT "Merging translations into ${STORE_INI_TARGET}"
30 COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${STORE_INI_TARGET}.in ${STORE_INI_TARGET} >/dev/null
31 )
32-
33-install(
34- FILES "${CMAKE_CURRENT_BINARY_DIR}/${STORE_INI_TARGET}"
35- DESTINATION "${STORE_LIB_DIR}"
36-)
37-
38
39=== modified file 'scope/tests/test_apps_query.cpp'
40--- scope/tests/test_apps_query.cpp 2016-03-09 13:08:13 +0000
41+++ scope/tests/test_apps_query.cpp 2016-09-21 21:27:20 +0000
42@@ -218,10 +218,9 @@
43 EXPECT_CALL(*clickif, find_installed_apps(_, _, _, _)).WillOnce(Return(installed_apps));
44 EXPECT_CALL(mock_reply, register_category("predefined", _, _, _)).WillOnce(Return(ptrCat));
45 EXPECT_CALL(mock_reply, register_category("local", StrNe(""), _, _)).WillOnce(Return(ptrCat));
46- EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
47 EXPECT_CALL(mock_reply, register_departments(MatchesDepartments(expected_departments)));
48
49- EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(3).WillRepeatedly(Return(true));
50+ EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(2).WillRepeatedly(Return(true));
51
52 ON_CALL(*depts_db, is_descendant_of_department(_, _)).WillByDefault(Return(false));
53 ON_CALL(*depts_db, is_descendant_of_department("games", "")).WillByDefault(Return(true));
54@@ -266,10 +265,9 @@
55
56 EXPECT_CALL(*clickif, find_installed_apps(_, _, _, _)).WillOnce(Return(installed_apps));
57 EXPECT_CALL(mock_reply, register_category("local", StrEq(""), _, _)).WillOnce(Return(ptrCat));
58- EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
59 EXPECT_CALL(mock_reply, register_departments(MatchesDepartments(expected_departments)));
60
61- EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(3).WillRepeatedly(Return(true));
62+ EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(2).WillRepeatedly(Return(true));
63
64 EXPECT_CALL(*depts_db, get_parent_department_id("games")).WillOnce(Return(""));
65 EXPECT_CALL(*depts_db, get_department_name("games", expected_locales)).WillOnce(Return("Games"));
66@@ -298,9 +296,8 @@
67
68 EXPECT_CALL(*clickif, find_installed_apps(_, _, _, _)).WillOnce(Return(installed_apps));
69 EXPECT_CALL(mock_reply, register_category("local", StrEq(""), _, _)).WillOnce(Return(ptrCat));
70- EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
71
72- EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(3).WillRepeatedly(Return(true));
73+ EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(2).WillRepeatedly(Return(true));
74
75 q.run(reply);
76 }
77@@ -325,7 +322,6 @@
78
79 EXPECT_CALL(*clickif, find_installed_apps("Fooo", _, "games", _)).WillOnce(Return(installed_apps));
80 EXPECT_CALL(mock_reply, register_category("local", StrEq(""), _, _)).WillOnce(Return(ptrCat));
81- EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
82 EXPECT_CALL(*depts_db, get_department_name("games", expected_locales)).WillOnce(Return("Games"));
83 EXPECT_CALL(*depts_db, get_children_departments("games")).WillOnce(Return(
84 std::list<click::DepartmentsDb::DepartmentInfo>({})
85@@ -333,7 +329,7 @@
86
87 EXPECT_CALL(mock_reply, register_departments(MatchesDepartments(expected_departments)));
88
89- EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(3).WillRepeatedly(Return(true));
90+ EXPECT_CALL(mock_reply, push(Matcher<unity::scopes::CategorisedResult const&>(_))).Times(2).WillRepeatedly(Return(true));
91
92 q.run(reply);
93 }

Subscribers

People subscribed via source and target branches