From f81dab6739a923ddfb924649ede8e0906df86b92 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 30 Jun 2022 13:56:29 -0700 Subject: [PATCH] Clocks: handle auth, check we actually launched the app Clocks' aaa_setup did not ever actually check the app launched properly. It also doesn't handle granting permissions if necessary, which the apps_startstop test for Clocks does do. This makes the permission check in the apps_startstop test more efficient, and adds it to the Clocks app aaa_setup test too. Signed-off-by: Adam Williamson --- tests/applications/clocks/aaa_setup.pm | 8 +++++++- tests/apps_startstop/gnome/clocks.pm | 7 ++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/applications/clocks/aaa_setup.pm b/tests/applications/clocks/aaa_setup.pm index 4c31f749..58e49647 100644 --- a/tests/applications/clocks/aaa_setup.pm +++ b/tests/applications/clocks/aaa_setup.pm @@ -22,7 +22,13 @@ sub run { # Start the Application menu_launch_type("clocks"); - wait_still_screen(2); + assert_screen ["apps_run_clocks", "apps_run_access"]; + # give access rights if asked + if (match_has_tag 'apps_run_access') { + click_lastmatch; + assert_screen 'apps_run_clocks'; + } + # Make it fill the entire window. send_key("super-up"); wait_still_screen(2); diff --git a/tests/apps_startstop/gnome/clocks.pm b/tests/apps_startstop/gnome/clocks.pm index 72cef280..e3250332 100644 --- a/tests/apps_startstop/gnome/clocks.pm +++ b/tests/apps_startstop/gnome/clocks.pm @@ -9,11 +9,12 @@ sub run { my $self = shift; # Start the application start_with_launcher('apps_menu_clocks'); + assert_screen ["apps_run_clocks", "apps_run_access"]; # give access rights if asked - if (check_screen('apps_run_access', 1)) { - assert_and_click 'apps_run_access'; + if (match_has_tag 'apps_run_access') { + click_lastmatch; + assert_screen 'apps_run_clocks'; } - assert_screen 'apps_run_clocks'; # Register application register_application("gnome-clocks"); # close the application