From 158f338106b73b574164a203f5d59a4e893b0527 Mon Sep 17 00:00:00 2001 From: Marek Stastny Date: Wed, 18 Sep 2024 14:03:50 +0200 Subject: [PATCH] fix ui tests fix for tests: test_api_key_autocomplete, test_api_multiple_specs, test_tls_terminology_policy_via_ui, test_tls_terminology_policy_content --- testsuite/tests/ui/oas/test_api_key_autocomplete.py | 2 +- testsuite/tests/ui/oas/test_multiple_oas_docs.py | 2 +- .../ui/policies/test_tls_termination_policy_in_ui.py | 4 ++-- testsuite/ui/views/admin/product/integration/policies.py | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testsuite/tests/ui/oas/test_api_key_autocomplete.py b/testsuite/tests/ui/oas/test_api_key_autocomplete.py index 0a04a66b..3c6e00a6 100644 --- a/testsuite/tests/ui/oas/test_api_key_autocomplete.py +++ b/testsuite/tests/ui/oas/test_api_key_autocomplete.py @@ -42,7 +42,7 @@ def api_doc_page(login, navigator, ui_active_doc, request, custom_admin_login): """Custom doc page for developer portal""" view = navigator.navigate(CMSNewPageView) page_name = blame(request, "CustomDocumentation") - page_path = blame(request, "apidocs") + page_path = blame(request, "/apidocs") view.create( page_name, diff --git a/testsuite/tests/ui/oas/test_multiple_oas_docs.py b/testsuite/tests/ui/oas/test_multiple_oas_docs.py index fefebf4d..dafe8b79 100644 --- a/testsuite/tests/ui/oas/test_multiple_oas_docs.py +++ b/testsuite/tests/ui/oas/test_multiple_oas_docs.py @@ -65,7 +65,7 @@ def multiple_api_doc_page(login, navigator, oas3_one_spec, oas3_two_spec, reques """Custom doc page for developer portal""" view = navigator.navigate(CMSNewPageView) page_name = blame(request, "Multiple OAS docs") - page_path = blame(request, "multiple_oas") + page_path = blame(request, "/multiple_oas") view.create( page_name, diff --git a/testsuite/tests/ui/policies/test_tls_termination_policy_in_ui.py b/testsuite/tests/ui/policies/test_tls_termination_policy_in_ui.py index 9ca6f72e..a5f160d2 100644 --- a/testsuite/tests/ui/policies/test_tls_termination_policy_in_ui.py +++ b/testsuite/tests/ui/policies/test_tls_termination_policy_in_ui.py @@ -143,8 +143,8 @@ def test_tls_terminology_policy_content(navigator, policy_service): assert tls_policy_view.local_cert_key.is_displayed tls_policy_view.cert_type_select.select_by_value("1") - assert tls_policy_view.embedded_cert_path.is_displayed - assert tls_policy_view.embedded_cert_key_path.is_displayed + assert tls_policy_view.embedded_cert.is_displayed + assert tls_policy_view.embedded_cert_key.is_displayed tls_policy_view.cert_type_select.select_by_value("0") assert tls_policy_view.local_cert_key.is_displayed diff --git a/testsuite/ui/views/admin/product/integration/policies.py b/testsuite/ui/views/admin/product/integration/policies.py index 11b59ce4..0084eb92 100644 --- a/testsuite/ui/views/admin/product/integration/policies.py +++ b/testsuite/ui/views/admin/product/integration/policies.py @@ -50,8 +50,8 @@ class TlsTerminationPolicyView(View): add_cert_btn = Button(locator=".//button[contains(@class, 'btn-add')]") local_cert_key = FileInput(id="root_certificate_key_path") local_cert = FileInput(id="root_certificate_path") - embedded_cert_path = TextInput(id="root_certificate") - embedded_cert_key_path = TextInput(id="root_certificate_key") + embedded_cert = FileInput(id="root_certificate") + embedded_cert_key = FileInput(id="root_certificate_key") update_policy_btn = Button(locator=".//button[text()='Update Policy']") cert_type_select = ThreescaleDropdown('//*[@id="root_certificates_0_anyof_select"]') @@ -67,8 +67,8 @@ def add_embedded_certs(self, certificate: Certificate): """Adds certs from filesystem""" self.add_cert_btn.click() self.cert_type_select.select_by_value("1") - self.embedded_cert_path.fill(certificate.files["certificate"]) - self.embedded_cert_key_path.fill(certificate.files["key"]) + self.embedded_cert.fill(certificate.files["certificate"]) + self.embedded_cert_key.fill(certificate.files["key"]) self.update_policy_btn.click() @property