diff --git a/needles/gnome/apps/contacts/contacts_contact_delete-20230222.json b/needles/gnome/apps/contacts/contacts_contact_delete-20230222.json new file mode 100644 index 00000000..b596efc5 --- /dev/null +++ b/needles/gnome/apps/contacts/contacts_contact_delete-20230222.json @@ -0,0 +1,15 @@ +{ + "area": [ + { + "xpos": 889, + "ypos": 176, + "width": 98, + "height": 18, + "type": "match" + } + ], + "properties": [], + "tags": [ + "contacts_contact_delete" + ] +} diff --git a/needles/gnome/apps/contacts/contacts_contact_delete-20230222.png b/needles/gnome/apps/contacts/contacts_contact_delete-20230222.png new file mode 100644 index 00000000..50aef3d2 Binary files /dev/null and b/needles/gnome/apps/contacts/contacts_contact_delete-20230222.png differ diff --git a/needles/gnome/apps/contacts/contacts_left_menu-20230222.json b/needles/gnome/apps/contacts/contacts_left_menu-20230222.json new file mode 100644 index 00000000..fe52b5e0 --- /dev/null +++ b/needles/gnome/apps/contacts/contacts_left_menu-20230222.json @@ -0,0 +1,19 @@ +{ + "area": [ + { + "width": 60, + "ypos": 45, + "height": 21, + "xpos": 227, + "type": "match", + "click_point": { + "xpos": 50, + "ypos": 10.5 + } + } + ], + "properties": [], + "tags": [ + "contacts_left_menu" + ] +} \ No newline at end of file diff --git a/needles/gnome/apps/contacts/contacts_left_menu-20230222.png b/needles/gnome/apps/contacts/contacts_left_menu-20230222.png new file mode 100644 index 00000000..2d23f7ce Binary files /dev/null and b/needles/gnome/apps/contacts/contacts_left_menu-20230222.png differ diff --git a/needles/gnome/apps/contacts/contacts_right_menu-20230222.json b/needles/gnome/apps/contacts/contacts_right_menu-20230222.json new file mode 100644 index 00000000..5e6298db --- /dev/null +++ b/needles/gnome/apps/contacts/contacts_right_menu-20230222.json @@ -0,0 +1,19 @@ +{ + "area": [ + { + "xpos": 910, + "ypos": 45, + "width": 61, + "height": 21, + "type": "match", + "click_point": { + "xpos": 50.5, + "ypos": 10.5 + } + } + ], + "properties": [], + "tags": [ + "contacts_right_menu" + ] +} \ No newline at end of file diff --git a/needles/gnome/apps/contacts/contacts_right_menu-20230222.png b/needles/gnome/apps/contacts/contacts_right_menu-20230222.png new file mode 100644 index 00000000..2d23f7ce Binary files /dev/null and b/needles/gnome/apps/contacts/contacts_right_menu-20230222.png differ diff --git a/tests/applications/contacts/change_order.pm b/tests/applications/contacts/change_order.pm index 23937a01..68a511c8 100644 --- a/tests/applications/contacts/change_order.pm +++ b/tests/applications/contacts/change_order.pm @@ -15,13 +15,13 @@ sub run { mouse_set(1, 1); # Check the original ordering of contacts assert_screen("contacts_contacts_ordered_name"); - # Open the Menu and click on order item. - assert_and_click("gnome_burger_menu"); + # Open the left menu and click on order item. + assert_and_click("contacts_left_menu"); assert_and_click("contacts_menu_order_surname"); # Check that the order of contacts changed. assert_screen("contacts_contacts_ordered_surname"); # Repeat the action - assert_and_click("gnome_burger_menu"); + assert_and_click("contacts_left_menu"); assert_and_click("contacts_menu_order_name"); # Check that the contacts' order changed again. assert_screen("contacts_contacts_ordered_name"); diff --git a/tests/applications/contacts/delete_contacts.pm b/tests/applications/contacts/delete_contacts.pm index 074cf28c..6ccf254d 100644 --- a/tests/applications/contacts/delete_contacts.pm +++ b/tests/applications/contacts/delete_contacts.pm @@ -12,7 +12,14 @@ sub remove_contact { my $identity = hashed_string($name); assert_and_click("contacts_contact_listed_$identity"); wait_still_screen(2); - assert_and_click(["gnome_button_delete", "contacts_contact_remove"]); + # in older versions there's just a delete button on the right + # side of the screen, in newer versions there's a burger menu + # with a "Delete contact" entry, so we need to open the menu + # then click the entry. The other path is selecting multiple + # contacts; when we do that we get a red "Remove" button at + # bottom left + assert_and_click(["gnome_button_delete", "contacts_contact_remove", "contacts_right_menu"]); + assert_and_click("contacts_contact_delete") if (match_has_tag "contacts_right_menu"); wait_still_screen(2); } diff --git a/tests/applications/contacts/shortcuts.pm b/tests/applications/contacts/shortcuts.pm index 31a7c344..7eb6221a 100644 --- a/tests/applications/contacts/shortcuts.pm +++ b/tests/applications/contacts/shortcuts.pm @@ -11,7 +11,7 @@ sub run { # Wait some time to settle down. sleep(5); # Go to the menu and click on shortcuts item - assert_and_click("gnome_burger_menu"); + assert_and_click("contacts_left_menu"); assert_and_click("contacts_menu_shortcuts"); # Check that the the correct window has shown. assert_screen("contacts_shortcuts_shown");