Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

webui: the encryption password screen is not subpage anymore #4939

Merged
merged 1 commit into from
Jul 21, 2023
Merged

webui: the encryption password screen is not subpage anymore #4939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ui/webui/test/check-storage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,16 +179,12 @@ class TestStorage(anacondalib.VirtInstallMachineCase):
s.set_partitioning("use-free-space")

i.next()
# Disk Encryption
# Disk Encryption / password screen

encrypt = True
s.set_encryption_selected(encrypt)
s.check_encryption_selected(encrypt)

# Encryption password is on the same page
i.next(subpage=encrypt)
# Disk Encryption / password screen

# Set valid password
pw = "abcdefgh"
s.set_password_confirm(pw)
Expand Down
2 changes: 0 additions & 2 deletions ui/webui/test/end2end/storage_encryption.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ def configure_storage_encryption(self):
self._storage.set_encryption_selected(True)
self._storage.check_encryption_selected(True)

self._installer.next(subpage=True)

self._storage.set_password(self.luks_pass)
self._storage.check_password(self.luks_pass)
self._storage.set_password_confirm(self.luks_pass)
Expand Down
8 changes: 4 additions & 4 deletions ui/webui/test/helpers/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def reach(self, target_page):
self.next(next_page=next_page)

@log_step()
def next(self, should_fail=False, subpage=False, next_page=""):
def next(self, should_fail=False, next_page=""):
current_page = self.get_current_page()
# If not explicitly specified, get the first item for next page from the steps dict
if not next_page:
Expand All @@ -89,7 +89,7 @@ def next(self, should_fail=False, subpage=False, next_page=""):
sleep(2)

self.browser.click("button:contains(Next)")
expected_page = current_page if should_fail or subpage else next_page
expected_page = current_page if should_fail else next_page
self.wait_current_page(expected_page)
return expected_page

Expand All @@ -104,12 +104,12 @@ def check_next_disabled(self, disabled=True):
self.browser.wait_visible(f"#installation-next-btn:not([aria-disabled={value}]")

@log_step(snapshot_before=True)
def back(self, should_fail=False, subpage=False):
def back(self, should_fail=False):
current_page = self.get_current_page()

self.browser.click("button:contains(Back)")

if should_fail or subpage:
if should_fail:
self.wait_current_page(current_page)
else:
prev = [k for k, v in self.steps._steps_jump.items() if current_page in v][0]
Expand Down