From d5b6485ae8f17525ddc6e2beacb4f7a5dce73bfa Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 19 Mar 2014 17:35:47 +0000 Subject: Re-add the feature to hide the user list if com.canonical.indicator.session user-show-menu is false --- tests/com.canonical.indicator.session.gschema.xml | 7 ++++++- tests/test-service.cc | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/com.canonical.indicator.session.gschema.xml b/tests/com.canonical.indicator.session.gschema.xml index 76b2be3..60e680b 100644 --- a/tests/com.canonical.indicator.session.gschema.xml +++ b/tests/com.canonical.indicator.session.gschema.xml @@ -26,7 +26,12 @@ Determine the visibility of the User's real name on the panel Allow for the Removal of the users name from the panel + + true + Show the list of users + Allow for the user menu to be hidden by the user. + - \ No newline at end of file + diff --git a/tests/test-service.cc b/tests/test-service.cc index f14fe61..1f3272f 100644 --- a/tests/test-service.cc +++ b/tests/test-service.cc @@ -812,6 +812,16 @@ TEST_F (ServiceTest, User) check_label ("Third Doctor", switch_menu, 8); g_clear_object (&switch_menu); + /* Hide the user list */ + g_settings_set_boolean (indicator_settings, "user-show-menu", FALSE); + wait_for_menu_resync (); + // now there should be 7 menuitems: greeter + guest + the five doctors + ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", &switch_menu, &pos)); + ASSERT_EQ (0, pos); + ASSERT_EQ (2, g_menu_model_get_n_items (switch_menu)); + g_clear_object (&switch_menu); + g_settings_set_boolean (indicator_settings, "user-show-menu", TRUE); + // now switch to one of the doctors g_action_group_activate_action (G_ACTION_GROUP(action_group), "switch-to-user", -- cgit v1.2.3 From 3453ded59cf41640373b48c098d2222e69bacf6f Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 19 Mar 2014 17:40:24 +0000 Subject: Update some strings --- tests/test-service.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test-service.cc b/tests/test-service.cc index 1f3272f..20c70f5 100644 --- a/tests/test-service.cc +++ b/tests/test-service.cc @@ -815,7 +815,7 @@ TEST_F (ServiceTest, User) /* Hide the user list */ g_settings_set_boolean (indicator_settings, "user-show-menu", FALSE); wait_for_menu_resync (); - // now there should be 7 menuitems: greeter + guest + the five doctors + // now there should be 2 menuitems: greeter + guest ASSERT_TRUE (find_menu_item_for_action ("indicator.switch-to-screensaver", &switch_menu, &pos)); ASSERT_EQ (0, pos); ASSERT_EQ (2, g_menu_model_get_n_items (switch_menu)); -- cgit v1.2.3