Merge pull request rhinstaller#4930 from velezd/webui_e2etest_fix

webui: tests: Fix WebUI end2end tests
M4rtinK · Jul 26, 2023 · 93b074b · 93b074b
2 parents cecefc8 + 63e60d8
commit 93b074b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/ui/webui/test/end2end/wizard_navigation.py b/ui/webui/test/end2end/wizard_navigation.py
@@ -35,19 +35,14 @@ def test_wizard_navigation(self):
  self._installer.next()
  self.configure_storage_disks()
  self._installer.next()
- self.configure_storage_partitioning()
- self._installer.next()
  self.configure_storage_encryption()
  self._installer.next()
  # Get Back to disk selection
  self._installer.back()
  self._installer.back()
- self._installer.back()
  # Redo storage configuration
  self.configure_storage_disks()
  self._installer.next()
- self.configure_storage_partitioning()
- self._installer.next()
  self.configure_storage_encryption()
  self._installer.next()
  # Finish installation

diff --git a/ui/webui/test/helpers/end2end.py b/ui/webui/test/helpers/end2end.py
@@ -76,10 +76,6 @@ def configure_language(self):
  pass
 
  def configure_storage_disks(self):
- disks = list(self._storage.get_disks())
- self._storage.select_disk(disks[0])
-
- def configure_storage_partitioning(self):
  pass
 
  def configure_storage_encryption(self):
@@ -112,8 +108,6 @@ def run_integration_test(self):
  self._installer.next()
  self.configure_storage_disks()
  self._installer.next()
- self.configure_storage_partitioning()
- self._installer.next()
  self.configure_storage_encryption()
  self._installer.next()
  self.check_review_screen()

diff --git a/ui/webui/test/helpers/progress.py b/ui/webui/test/helpers/progress.py
@@ -30,7 +30,7 @@ class Progress():
  def __init__(self, browser):
  self.browser = browser
  self.steps = InstallerSteps()
- self._reboot_selector = "button:contains(Reboot)"
+ self._reboot_selector = ".installation-progress-status-success button:contains('Reboot')"
 
  @log_step(snapshot_after=True)
  def wait_done(self, timeout=1200):