Merge pull request 3scale-qe#938 from mastastny/test-ui-policy-list-complete

Author: mdujava

testsuite/tests/ui/policies/test_policies.py

@@ -1,13 +1,23 @@
 """Rewrite of spec/ui_specs/policies_spec.rb"""
 
-import pytest
+from collections import Counter
 
+import pytest
 from testsuite.ui.views.admin.product.integration.configuration import ProductConfigurationView
 from testsuite.ui.views.admin.product.integration.policies import ProductPoliciesView, Policies
 
 pytestmark = pytest.mark.usefixtures("login")
 
 
+@pytest.fixture()
+def policy_list():
+    """generate list of all policies"""
+    policies = [policy.value for policy in list(Policies)]
+    policies.remove("3scale APIcast")  # default policy is not in the policy registry
+    policies.remove("fapi")
+    return policies
+
+
 def test_add_policy(navigator, policy_service):
     """
     Test:
@@ -158,3 +168,13 @@ def test_edit_policy_widgets(navigator, policy_service, api_client, policy_appli
 
     response = api_client(app=policy_application).get("/hello")
     assert response.json()["path"] == "/get"
+
+
+@pytest.mark.issue("https://issues.redhat.com/browse/THREESCALE-11620")
+def test_policy_list(navigator, policy_service, policy_list):
+    """Test:
+    - Create service via API
+    - Navigate to Policies page and check, that policy registry displays all policies from policy_list"""
+    policies_page = navigator.navigate(ProductPoliciesView, product=policy_service)
+    registry_policies = policies_page.policy_section.registry_items
+    assert Counter(policy_list) == Counter(registry_policies)

testsuite/ui/views/admin/product/integration/policies.py

@@ -16,9 +16,50 @@ class Policies(enum.Enum):
     """Policies enum"""
 
     THREESCALE_APICAST = "3scale APIcast"
-    ECHO = "Echo"
+
     THREESCALE_REFERRER = "3scale Referrer"
+    THREESCALE_AUTH_CACHING = "3scale Auth Caching"
+    HTTP_STATUS_CODE_OVERWRITE = "HTTP Status Code Overwrite"
+    CAMEL_SERVICE = "Camel Service"
+    # tbd
+    # CONDITIONAL_POLICY = "Conditional Policy [Tech preview]"
+    CONTENT_CACHING = "Content caching"
+    PROXY_SERVICE = "Proxy Service"
+    CORS_REQUEST_HANDLING = "CORS Request Handling"
+    CUSTOM_METRICS = "Custom Metrics"
+    ANONYMOUS_ACCESS = "Anonymous Access"
+    RATE_LIMITS_HEADERS = "Rate Limits Headers"
+    ECHO = "Echo"
+    EDGE_LIMITING = "Edge Limiting"
+    HTTP2_ENDPOINT = "HTTP2 Endpoint"
+    RETRY = "Retry"
+    ROUTING = "Routing"
+    SOAP = "SOAP"
+    RH_SSO_KEYCLOAK_ROLE_CHECK = "RH-SSO/Keycloak Role Check"
+    LIQUID_CONTEXT_DEBUG = "Liquid Context Debug"
+    LOGGING = "Logging"
+    MAINTENANCE_MODE = "Maintenance Mode"
+    OAUTH_TWO_TOKEN_INTROSPECTION = "OAuth 2.0 Token Introspection"
+    UPSTREAM = "Upstream"
+    UPSTREAM_CONNECTION = "Upstream Connection"
+    NGINX_FILTER = "Nginx Filter"
+    UPSTREAM_MUTUAL_TLS = "Upstream Mutual TLS"
     URL_REWRITING = "URL Rewriting"
+    WEBSOCKET = "Websocket"
+    TLS_CLIENT_CERTIFICATE_VALIDATION = "TLS Client Certificate Validation"
+    TLS_TERMINATION = "TLS Termination"
+    RESPONSE_REQUEST_CONTENT_LIMITS = "Response/Request content limits"
+    OAUTH_TWO_MUTUAL_TLS_CLIENT_AUTHENTICATION = "OAuth 2.0 Mutual TLS Client Authentication"
+    HEADER_MODIFICATION = "Header Modification"
+    JWT_CLAIM_CHECK = "JWT Claim Check"
+    IP_CHECK = "IP Check"
+    THREESCALE_BATCHER = "3scale Batcher"
+    ON_FAIL = "On fail"
+    REQUEST_UNBUFFERED = "Request Unbuffered"
+    FAPI = "fapi"
+    URL_REWRITING_WITH_CAPTURES = "URL Rewriting with Captures"
+    THE_FINANCIAL_GRADE_API = "The Financial-grade API (FAPI)"
+    JWT_PARSER = "JWT Parser"
 
 
 class EchoPolicyView(View):

testsuite/ui/widgets/__init__.py

@@ -5,10 +5,10 @@
 from selenium.webdriver.common.by import By
 from widgetastic.exceptions import NoSuchElementException
 from widgetastic.utils import ParametrizedLocator
-from widgetastic.widget import GenericLocatorWidget, Widget
+from widgetastic.widget import GenericLocatorWidget, Widget, View
 from widgetastic.widget import TextInput
 from widgetastic.xpath import quote
-from widgetastic_patternfly4 import Select
+from widgetastic_patternfly4 import Select, Modal
 
 from testsuite.ui.exception import ItemNotPresentException
 
@@ -254,36 +254,44 @@ def is_checked(self):
         return self.__element__().get_attribute("checked") == "true"
 
 
-class PolicySection(Widget):
+class PolicySection(View):
     """Widget representing Policies table section"""
 
     ROOT = "//div[@class='PoliciesWidget']/section"
     POLICY_LIST = ".//ul/li"
     REGISTRY_ITEMS_LOCATOR = "//ul/li/article/h3"
     REGISTRY_ITEM_LOCATOR = "//ul/li/article/h3[text()='{}']"
     CHAIN_ITEMS_LOCATOR = ".//ul/li//article/h3"
-    CHAIN_ITEM_LOCATOR = "//ul/li//article/h3[text()='{}']"
-    ADD_POLICY_LOC = ".//button[normalize-space(.)='Add policy']"
+    CHAIN_ITEM_LOCATOR = ".//ul/li//article/h3[text()='{}']"
+    ADD_POLICY_LOCATOR = ".//button[normalize-space(.)='Add policy']"
+    add_policy_modal = Modal(locator="//div[contains(@class, 'pf-c-modal-box')]")
 
+    # pylint: disable=super-init-not-called, non-parent-init-called
     def __init__(self, parent=None, logger=None):
         Widget.__init__(self, parent, logger=logger)
 
     @property
     def items(self):
-        """Returns a list of all policy registry items as strings."""
+        """Returns a list of all policy registry items from policy chain as strings."""
         return [self.browser.text(el) for el in self.browser.elements(self.CHAIN_ITEMS_LOCATOR, parent=self)]
 
     @property
     def registry_items(self):
         """Returns a list of all policy registry items as strings."""
-        return [self.browser.text(el) for el in self.browser.elements(self.REGISTRY_ITEMS_LOCATOR)]
+        displayed = self.add_policy_modal.is_displayed
+        if not displayed:
+            self.open_policy_registry()
+        result = [self.browser.text(el) for el in self.browser.elements(self.REGISTRY_ITEMS_LOCATOR)]
+        if not displayed:
+            self.close_policy_registry()
+        return result
 
     @property
     def is_policy_registry_displayed(self):
         """Check if policy registry list is displayed.
         :return: True if displayed, False otherwise.
         """
-        return self.browser.is_displayed(self.ADD_POLICY_LOC)
+        return self.add_policy_modal.is_displayed
 
     @property
     def first_policy(self):
@@ -297,15 +305,15 @@ def add_policy(self, policy_name):
         """Opens the Policy registry list and adds a policy by its name.
         :param policy_name: Name of the policy to be added
         """
-        self.browser.click(self.ADD_POLICY_LOC, parent=self)
+        self.browser.click(self.ADD_POLICY_LOCATOR, parent=self)
         self.add_item(policy_name)
 
     def edit_policy(self, policy_name):
         """
         :param policy_name:
         """
         if self.has_item(policy_name):
-            self.item_select(policy_name)
+            self.browser.click(self.item_element(policy_name))
         else:
             raise ItemNotPresentException("Item {!r} not found.".format(policy_name))
 
@@ -323,7 +331,7 @@ def drag_and_drop_policy(self, source, destination):
         ac.perform()
 
     def has_item(self, item):
-        """Returns whether the items exists.
+        """Returns whether the items exist in policy chain.
         :param
             item: item name
         :return:
@@ -333,31 +341,53 @@ def has_item(self, item):
 
     # pylint: disable=raise-missing-from
     def item_element(self, item):
-        """Returns a WebElement for given item name.
+        """Returns a WebElement for given item name from policy chain.
         :return WebElement
         """
         try:
             return self.browser.element(self.CHAIN_ITEM_LOCATOR.format(item), parent=self)
         except NoSuchElementException:
             raise ItemNotPresentException("Item {!r} not found.".format(item))
 
+    # pylint: disable=raise-missing-from
+    def registry_item_element(self, item):
+        """Returns a WebElement for given item name from policy registry.
+        :return WebElement
+        """
+        if not self.add_policy_modal.is_displayed:
+            self.open_policy_registry()
+        try:
+            return self.browser.element(self.REGISTRY_ITEM_LOCATOR.format(item), parent=self)
+        except NoSuchElementException:
+            raise ItemNotPresentException("Item {!r} not found.".format(item))
+
     # pylint: disable=raise-missing-from
     def add_item(self, item):
         """Add policy from policy registry"""
         self.logger.info("Selecting %r", item)
         if item not in self.registry_items:
             raise ItemNotPresentException('Item "{item}" of policy is not present'.format(item=item))
-        self.browser.click(self.item_element(item))
+        self.browser.click(self.registry_item_element(item))
 
     def item_select(self, item):
-        """Opens the Policy registry and selects the desired policy.
+        """Opens the policy registry and selects the desired policy.
         :param
             item: Item to be selected
         """
         self.logger.info("Selecting %r", item)
         if not self.has_item(item):
             raise ItemNotPresentException('Item "{item}" of policy is not present'.format(item=item))
-        self.browser.click(self.item_element(item))
+        self.browser.click(self.registry_item_element(item))
+
+    def open_policy_registry(self):
+        """Opens the policy registry if not already opened"""
+        if not self.is_policy_registry_displayed:
+            self.browser.click(self.ADD_POLICY_LOCATOR, parent=self)
+
+    def close_policy_registry(self):
+        """Closes the policy registry if not already closed"""
+        if self.is_policy_registry_displayed:
+            self.add_policy_modal.close()
 
 
 class APIDocsSelect(Select):