Merge pull request #5275 from KKoukiou/bump-testlib

webui: bump Cockpit version of testlib
rhinstaller · Oct 26, 2023 · a8a3b36 · a8a3b36
2 parents 8acd3a9 + 6c71daf
commit a8a3b36
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 16 deletions.
diff --git a/ui/webui/Makefile.am b/ui/webui/Makefile.am
@@ -76,7 +76,7 @@ COCKPIT_REPO_FILES = \
 	$(NULL)
 
 COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
-COCKPIT_REPO_COMMIT = 4133eb93dc20f00db996d1fefdd5fcbfd1d6b320 # 298
+COCKPIT_REPO_COMMIT = 7baca286c10dc50884fcda02c45f338dd18f5e24 # 303 + inherit_machine_class
 
 $(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP)
 COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'

diff --git a/ui/webui/package.json b/ui/webui/package.json
@@ -19,7 +19,7 @@
     "deep-equal": "2.2.2",
     "esbuild": "0.19.5",
     "esbuild-plugin-copy": "^2.0.2",
-    "esbuild-plugin-replace": "^1.3.0",
+    "esbuild-plugin-replace": "1.4.0",
     "esbuild-sass-plugin": "2.16.0",
     "eslint": "^8.38.0",
     "eslint-config-standard": "^17.0.0",
@@ -30,9 +30,9 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
+    "gettext-parser": "7.0.1",
     "htmlparser": "^1.7.7",
     "jed": "^1.1.1",
-    "po2json": "^1.0.0-alpha",
     "qunit": "^2.19.0",
     "sass": "^1.59.3",
     "sizzle": "^2.3.6",

diff --git a/ui/webui/src/helpers/exit.js b/ui/webui/src/helpers/exit.js
@@ -25,6 +25,6 @@ export const exitGui = () => {
                 console.log("Killing WebUI process, PID: ", pid);
                 return cockpit.spawn(["kill", pid]);
             })
-            .catch(() => console.error("Failed to kill WebUI process, PID: ", pid))
+            .catch(exc => console.error("Failed to kill WebUI process, PID: ", pid, exc.message))
             .finally(pidFile.close);
 };
diff --git a/ui/webui/test/check-basic b/ui/webui/test/check-basic
@@ -131,7 +131,6 @@ class TestBasic(anacondalib.VirtInstallMachineCase):
             ".pf-v5-c-about-modal-box",
             "about-modal",
             ignore=["#about-modal-versions dd"],
-            wait_animations=False,
         )
 
         #Close about modal
@@ -229,10 +228,10 @@ class TestBasic(anacondalib.VirtInstallMachineCase):
                 b.wait_in_text("#critical-error-bz-report-modal-details", "Error: Unexpected JS error")
                 time.sleep(2)
 
+        b.wait_visible("a:contains('Report issue'):not([disabled])")
         b.assert_pixels(
             "#critical-error-bz-report-modal.pf-v5-c-modal-box",
             "js-error-modal",
-            wait_animations=False,
             ignore=["#critical-error-bz-report-modal-review-log"]
         )
 

diff --git a/ui/webui/test/check-language b/ui/webui/test/check-language
@@ -96,7 +96,6 @@ class TestLanguage(anacondalib.VirtInstallMachineCase):
             # HACK pf-v5-c-menu__item-text is ignored because some of our CI infrastructure is
             # missing CJK and Cyrillic fonts..
             ignore=["#betanag-icon", ".pf-v5-c-menu__item-text"],
-            wait_animations=False,
         )
 
         b.wait_in_text("h2 + h3", "Wählen Sie eine Sprache aus")

diff --git a/ui/webui/test/check-progress b/ui/webui/test/check-progress
@@ -29,6 +29,8 @@ class TestInstallationProgress(anacondalib.VirtInstallMachineCase):
     def testBasic(self):
         # HACK Ignore some selinux errors
         self.allow_journal_messages(".*denied.*comm=\"tar\" name=\"/\".*")
+        self.allow_browser_errors(".*client closed.*")
+        self.allow_browser_errors(".*Server has closed the connection.*")
 
         b = self.browser
         m = self.machine
@@ -51,7 +53,6 @@ class TestInstallationProgress(anacondalib.VirtInstallMachineCase):
             "#app",
             "installation-progress-complete",
             ignore=["#betanag-icon"],
-            wait_animations=False,
         )
 
         p.wait_done()

diff --git a/ui/webui/test/check-review b/ui/webui/test/check-review
@@ -59,7 +59,6 @@ class TestReview(anacondalib.VirtInstallMachineCase):
             "#app",
             "review-step-basic",
             ignore=["#betanag-icon"],
-            wait_animations=False,
         )
 
     def testNoConfirmation(self):

diff --git a/ui/webui/test/check-storage b/ui/webui/test/check-storage
@@ -51,7 +51,6 @@ class TestStorage(anacondalib.VirtInstallMachineCase, StorageHelpers):
             "#app",
             "storage-step-basic",
             ignore=["#betanag-icon"],
-            wait_animations=False,
         )
 
         # This attaches a disk to the running VM
@@ -102,7 +101,6 @@ class TestStorage(anacondalib.VirtInstallMachineCase, StorageHelpers):
             "#app",
             "storage-step-basic-live",
             ignore=["#betanag-icon"],
-            wait_animations=False,
         )
 
         s.modify_storage()
@@ -153,7 +151,6 @@ class TestStorage(anacondalib.VirtInstallMachineCase, StorageHelpers):
             "#app",
             "storage-step-encrypt",
             ignore=["#betanag-icon"],
-            wait_animations=False,
         )
 
         s.check_encryption_selected(False)
@@ -165,7 +162,6 @@ class TestStorage(anacondalib.VirtInstallMachineCase, StorageHelpers):
             "#app",
             "storage-step-password",
             ignore=["#betanag-icon"],
-            wait_animations=False,
         )
 
         # No password set
@@ -412,7 +408,6 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers)
         b.assert_pixels(
             "#app",
             "mount-point-mapping-table",
-            wait_animations=False,
         )
 
         i.reach(i.steps.REVIEW)
@@ -554,7 +549,6 @@ class TestStorageMountPoints(anacondalib.VirtInstallMachineCase, StorageHelpers)
         b.assert_pixels(
             "#app",
             "review-multiple-disks",
-            wait_animations=False,
         )
 
     @nondestructive

diff --git a/ui/webui/test/reference b/ui/webui/test/reference