Merge lp:~charlesk/indicator-datetime/convergence into lp:~lukas-kde/indicator-datetime/convergence

[Charles Kerr]

Fixes tests to understand that calendar and location sections will be visible in the Phone profile.

Fixes tests to understand that calendar and location sections will be visible in the Phone profile.

[Lukáš Tinkl (lukas-kde)]

LGTM, makes sense

(sorry, I forgot about them in my initial MP)

review: Approve

Unmerged revisions

429. By Charles Kerr on 2016-01-29

sync unit tests with calendar, locations being visible in phone profile

=== modified file 'tests/test-menus.cpp'
--- tests/test-menus.cpp	2015-03-15 02:31:42 +0000
+++ tests/test-menus.cpp	2016-01-29 15:53:01 +0000
@@ -102,7 +102,7 @@
         else
             expected_action = nullptr;
 
-        const auto calendar_expected = ((profile == Menu::Desktop) || (profile == Menu::DesktopGreeter))
+        const auto calendar_expected = ((profile == Menu::Desktop) || (profile == Menu::DesktopGreeter) || (profile == Menu::Phone))
                                     && (m_state->settings->show_calendar.get());
 
         // get the calendar section
@@ -420,7 +420,7 @@
 
     void InspectLocations(GMenuModel* menu_model, Menu::Profile profile)
     {
-        const bool locations_expected = profile == Menu::Desktop;
+        const bool locations_expected = (profile == Menu::Desktop) || (profile == Menu::Phone);
 
         // when there aren't any locations, confirm the menu is empty
         const std::vector<Location> empty;