Contacts: handle menu changes in 44

Contacts now has two burger menus, which is awkward. We need
specific needles to identify each, we can't rely on the generic
needle any more as it won't always open the right menu. We also
need to still work with the old UI for the flatpak.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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.
+    # Open the left menu and click on order item.
-    assert_and_click("gnome_burger_menu");
+    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");

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);
 }
 

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");