diff --git a/needles/gnome/desktop_update_notification_only-gnome-20170327.json b/needles/gnome/desktop_update_notification_only-gnome-20170327.json index acd70b18..56f96218 100644 --- a/needles/gnome/desktop_update_notification_only-gnome-20170327.json +++ b/needles/gnome/desktop_update_notification_only-gnome-20170327.json @@ -11,6 +11,7 @@ "properties": [], "tags": [ "desktop_update_notification_only", + "desktop_update_notification", "DESKTOP-gnome" ] -} \ No newline at end of file +} diff --git a/needles/kde/desktop_update_notification-kde-20190530.json b/needles/kde/desktop_update_notification-kde-20190530.json new file mode 100644 index 00000000..0d3415cc --- /dev/null +++ b/needles/kde/desktop_update_notification-kde-20190530.json @@ -0,0 +1,24 @@ +{ + "area": [ + { + "height": 40, + "type": "match", + "width": 38, + "xpos": 957, + "ypos": 666 + }, + { + "height": 13, + "type": "match", + "width": 13, + "xpos": 985, + "ypos": 643 + } + ], + "properties": [], + "tags": [ + "DESKTOP-kde", + "desktop_update_notification_popup", + "desktop_update_notification" + ] +} diff --git a/needles/kde/desktop_update_notification-kde-20190530.png b/needles/kde/desktop_update_notification-kde-20190530.png new file mode 100644 index 00000000..3fae9e5a Binary files /dev/null and b/needles/kde/desktop_update_notification-kde-20190530.png differ diff --git a/needles/kde/desktop_update_notification_only-kde.json b/needles/kde/desktop_update_notification_only-kde.json index d98d95b0..15e12e7e 100644 --- a/needles/kde/desktop_update_notification_only-kde.json +++ b/needles/kde/desktop_update_notification_only-kde.json @@ -17,6 +17,7 @@ ], "tags": [ "desktop_update_notification_only", + "desktop_update_notification", "DESKTOP-kde" ] } diff --git a/tests/desktop_notifications.pm b/tests/desktop_notifications.pm index 37c7828f..991fbf9e 100644 --- a/tests/desktop_notifications.pm +++ b/tests/desktop_notifications.pm @@ -79,8 +79,25 @@ sub run { # have to click where we know it is mouse_set 512, 10; mouse_click; + if (get_var("BOOTFROM")) { + # we should see an update notification and no others + assert_screen "desktop_update_notification_only"; + } + else { + # for the live case there should be *no* notifications + assert_screen "desktop_no_notifications"; + } } - elsif ($desktop eq 'kde' && !get_var("BOOTFROM")) { + elsif ($desktop eq 'kde') { + if (get_var("BOOTFROM")) { + assert_screen "desktop_update_notification"; + # this is the case from F30 and earlier where we know this + # was the *only* notification; at this point we've passed + return if match_has_tag "desktop_update_notification_only"; + # otherwise, we need to close the update notification then + # check there are no others + assert_and_click "desktop_update_notification"; + } # the order and number of systray icons varies in KDE, so we # can't really just use a systray 'no notifications' needle. # instead open up the 'extended systray' thingy and click on @@ -92,13 +109,9 @@ sub run { if (check_screen 'desktop_network_notification', 5) { assert_and_click 'desktop_notification_dismiss'; } - } - if (get_var("BOOTFROM")) { - # we should see an update notification and no others - assert_screen "desktop_update_notification_only"; - } - else { - # for the live case there should be *no* notifications + # on live path, we should not have got any other notification; + # on installed path, we saw an update notification and closed + # it, and now there should be no *other* notifications assert_screen "desktop_no_notifications"; } } diff --git a/tests/desktop_update_graphical.pm b/tests/desktop_update_graphical.pm index 6c43e3dc..522c0bd9 100644 --- a/tests/desktop_update_graphical.pm +++ b/tests/desktop_update_graphical.pm @@ -15,6 +15,11 @@ sub run { desktop_vt; # run the updater if ($desktop eq 'kde') { + # if the permanent pop-up notification appeared, get rid of + # it, as it blocks the refresh button... + if (check_screen "desktop_update_notification_popup", 10) { + assert_and_click "desktop_update_notification_popup"; + } # KDE team tells me the 'preferred' update method is the # systray applet assert_and_click 'desktop_expand_systray';