From 092cefab3bb52f430f88fdbd10605cba76cf5233 Mon Sep 17 00:00:00 2001 From: Cockpit Project Date: Mon, 22 May 2023 02:36:57 +0000 Subject: [PATCH] package.json: Update @patternfly/patternfly, @patternfly/react-core, @patternfly/react-icons, @patternfly/react-styles Bump Cockpit commit to pick up the necessary adjustments for latest PF, and adjust test for the new "-v5" namespace prefix. Closes #654 --- Makefile | 2 +- package.json | 8 ++++---- test/check-application | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 6723ca6..aa4f227 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ COCKPIT_REPO_FILES = \ $(NULL) COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git -COCKPIT_REPO_COMMIT = 355c0aa59e3991243e10a61183e62ea129d3261a # 292 + 8 commits +COCKPIT_REPO_COMMIT = 3796031af41bdf58602f9c6561300969db22cb99 # 292 + latest PF5 adjustments $(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP) COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}' diff --git a/package.json b/package.json index 9f11890..0781678 100644 --- a/package.json +++ b/package.json @@ -43,10 +43,10 @@ "stylelint-formatter-pretty": "^3.2.0" }, "dependencies": { - "@patternfly/patternfly": "5.0.0-alpha.40", - "@patternfly/react-core": "5.0.0-alpha.72", - "@patternfly/react-styles": "5.0.0-alpha.7", - "@patternfly/react-icons": "5.0.0-alpha.10", + "@patternfly/patternfly": "5.0.0-alpha.64", + "@patternfly/react-core": "5.0.0-alpha.115", + "@patternfly/react-styles": "5.0.0-alpha.16", + "@patternfly/react-icons": "5.0.0-alpha.19", "react": "17.0.2", "react-dom": "17.0.2" } diff --git a/test/check-application b/test/check-application index 4dd87f1..b5503c5 100755 --- a/test/check-application +++ b/test/check-application @@ -22,16 +22,16 @@ class TestApplication(testlib.MachineCase): self.login_and_go("/starter-kit") # verify expected heading - b.wait_text(".pf-c-card__title", "Starter Kit") + b.wait_text(".pf-v5-c-card__title", "Starter Kit") # verify expected host name hostname = m.execute("cat /etc/hostname").strip() - b.wait_in_text(".pf-c-alert__title", "Running on " + hostname) + b.wait_in_text(".pf-v5-c-alert__title", "Running on " + hostname) # change current hostname self.write_file("/etc/hostname", "new-" + hostname) # verify new hostname name - b.wait_in_text(".pf-c-alert__title", "Running on new-" + hostname) + b.wait_in_text(".pf-v5-c-alert__title", "Running on new-" + hostname) # change language to German b.switch_to_top() @@ -50,7 +50,7 @@ class TestApplication(testlib.MachineCase): b.go("/starter-kit") b.enter_page("/starter-kit") # page label (from js) should be translated - b.wait_in_text(".pf-c-alert__title", "Läuft auf") + b.wait_in_text(".pf-v5-c-alert__title", "Läuft auf") if __name__ == '__main__':