From 649fcc51f175d010e94de220ba06bf2af41f85f8 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Nov 11 2020 20:55:42 +0000
Subject: Cockpit 232 fixes


Update a needle with slightly different text rendering, and add
a workaround to hit tab three times rather than once on entering
the "Join a domain" screen, see
https://github.com/cockpit-project/cockpit/issues/14895 .

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

---

diff --git a/needles/cockpit/join_domain-20201111.json b/needles/cockpit/join_domain-20201111.json
new file mode 100644
index 0000000..4cf775f
--- /dev/null
+++ b/needles/cockpit/join_domain-20201111.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 201,
+      "xpos": 255,
+      "width": 156,
+      "type": "match",
+      "height": 24
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_join_domain"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/join_domain-20201111.png b/needles/cockpit/join_domain-20201111.png
new file mode 100644
index 0000000..73cfc7c
Binary files /dev/null and b/needles/cockpit/join_domain-20201111.png differ
diff --git a/tests/realmd_join_cockpit.pm b/tests/realmd_join_cockpit.pm
index c46c32e..29920bc 100644
--- a/tests/realmd_join_cockpit.pm
+++ b/tests/realmd_join_cockpit.pm
@@ -27,13 +27,13 @@ sub run {
     # optional as it's not really part of the test
     script_run "dnf -y install sssd-tools", 220;
     script_run "sss_debuglevel 9";
+    my $cockpitver = script_output 'rpm -q cockpit --queryformat "%{VERSION}\n"';
     # run firefox and login to cockpit
     # note: we can't use wait_screen_change, wait_still_screen or
     # check_type_string in cockpit because of that fucking constantly
     # scrolling graph
     start_cockpit(1);
-    # on cockpit 209+ we have to scroll down before the button is
-    # visible
+    # we may have to scroll down before the button is visible
     if (check_screen "cockpit_join_domain_button", 5) {
         click_lastmatch;
     }
@@ -46,8 +46,10 @@ sub run {
         assert_and_click "cockpit_join_domain_button", 5;
     }
     assert_screen "cockpit_join_domain";
-    send_key "tab";
-    sleep 3;
+    # we need to hit tab three times to reach 'Domain address' in
+    # cockpit 232: https://github.com/cockpit-project/cockpit/issues/14895
+    my $tabs = $cockpitver eq "232" ? "\t\t\t" : "\t";
+    type_string($tabs, 4);
     type_string("ipa001.domain.local", 4);
     type_string("\t\t", 4);
     type_string("admin", 4);