diff --git a/needles/kde/desktop_package_tool_update-kde-20210327.json b/needles/kde/desktop_package_tool_update-kde-20210327.json new file mode 100644 index 00000000..8a155d1e --- /dev/null +++ b/needles/kde/desktop_package_tool_update-kde-20210327.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "ypos": 520, + "width": 19, + "xpos": 18, + "type": "match", + "height": 18 + } + ], + "properties": [], + "tags": [ + "DESKTOP-kde", + "desktop_package_tool_update" + ] +} \ No newline at end of file diff --git a/needles/kde/desktop_package_tool_update-kde-20210327.png b/needles/kde/desktop_package_tool_update-kde-20210327.png new file mode 100644 index 00000000..f0489411 Binary files /dev/null and b/needles/kde/desktop_package_tool_update-kde-20210327.png differ diff --git a/needles/kde/kde_offline_update_reboot-20210327.json b/needles/kde/kde_offline_update_reboot-20210327.json new file mode 100644 index 00000000..b0e73db8 --- /dev/null +++ b/needles/kde/kde_offline_update_reboot-20210327.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "xpos": 477, + "width": 48, + "ypos": 332, + "height": 15, + "type": "match" + } + ], + "properties": [], + "tags": [ + "DESKTOP-kde", + "kde_offline_update_reboot" + ] +} diff --git a/needles/kde/kde_offline_update_reboot-20210327.png b/needles/kde/kde_offline_update_reboot-20210327.png new file mode 100644 index 00000000..635ec0a4 Binary files /dev/null and b/needles/kde/kde_offline_update_reboot-20210327.png differ diff --git a/tests/desktop_update_graphical.pm b/tests/desktop_update_graphical.pm index 02e8f9f0..57953d85 100644 --- a/tests/desktop_update_graphical.pm +++ b/tests/desktop_update_graphical.pm @@ -17,12 +17,18 @@ sub run { # run the updater if ($desktop eq 'kde') { - # get rid of notifications which get in the way of the things - # we need to click - click_unwanted_notifications; - # KDE team tells me the 'preferred' update method is the - # systray applet - assert_and_click 'desktop_expand_systray'; + # KDE team tells me until F34 the 'preferred' update method + # was the systray applet... + if ($relnum < 34) { + # get rid of notifications which get in the way of the things + # we need to click + click_unwanted_notifications; + assert_and_click 'desktop_expand_systray'; + } + else { + # ...from F34 onwards, it's Plasma Discover app + menu_launch_type('discover'); + } } else { # this launches GNOME Software on GNOME, dunno for any other @@ -35,9 +41,10 @@ sub run { if ($desktop eq 'gnome' && check_screen 'gnome_software_welcome', 10) { send_key 'ret'; } - # go to the 'update' interface. For GNOME, we may be waiting - # some time at a 'Software catalog is being loaded' screen. - if ($desktop eq 'gnome') { + # go to the 'update' interface. For GNOME or KDE on F34+, we + # may be waiting some time at a 'Software catalog is being + # loaded' screen. + if ($desktop eq 'gnome' || ($desktop eq 'kde' && $relnum > 33)) { for my $n (1..5) { last if (check_screen 'desktop_package_tool_update', 120); mouse_set 10, 10;