Merge pull request mozilla#727 from mozilla/philimon/rework_ensure_visible

Philimon/rework ensure visible

Author: philimon-reset

l10n_CM/Unified/test_demo_ad_4a_highlight_name_org_fields.py

@@ -38,7 +38,7 @@ def test_address_yellow_highlight_on_name_organization_fields(
         autofill_popup.ensure_autofill_dropdown_visible()
 
         # Click on the first element from the autocomplete dropdown
-        autofill_popup.select_nth_element(1)
+        autofill_popup.select_autofill_panel()
 
         field_to_test = ["given_name", "family_name", "name", "organization"]
         # Verify the name and organization fields are highlighted

l10n_CM/Unified/test_demo_ad_4b_highlight_address_fields.py

@@ -33,7 +33,7 @@ def test_address_yellow_highlight_address_fields(
         autofill_popup.ensure_autofill_dropdown_visible()
 
         # Click on the first element from the autocomplete dropdown
-        autofill_popup.select_nth_element(1)
+        autofill_popup.select_autofill_panel()
 
         field_to_test = [
             "street_address",

l10n_CM/Unified/test_demo_ad_4c_highlight_phone_email_fields.py

@@ -33,7 +33,7 @@ def test_address_yellow_highlight_address_fields(
         autofill_popup.ensure_autofill_dropdown_visible()
 
         # Click on the first element from the autocomplete dropdown
-        autofill_popup.select_nth_element(1)
+        autofill_popup.select_autofill_panel()
 
         field_to_test = ["email", "telephone"]
         # Verify the address fields are highlighted

modules/browser_object_autofill_popup.py

@@ -26,29 +26,32 @@ def verify_element_displayed(self, reference: Union[str, tuple, WebElement]):
     @BasePage.context_chrome
     def ensure_autofill_dropdown_not_visible(self):
         """
-        Verifies that the autofill dropdown does NOT appear
-        checks if the parent pop up component have children elements before explicit wait.
+        Verifies that the autofill dropdown does not appear
+        checks if the parent pop up component has hidden attribute.
         """
         self.element_exists("pop-up-component")
         popup_component = self.get_element("pop-up-component")
-        if popup_component and len(popup_component.get_attribute("innerHTML")) > 1:
-            self.element_not_visible("select-form-option")
+        if len(popup_component.get_attribute("innerHTML")) > 1:
+            self.expect_element_attribute_contains(
+                "pop-up-component-box", "style", "0px;"
+            )
+        else:
+            self.expect_element_attribute_contains("pop-up-component", "hidden", "true")
         return self
 
     @BasePage.context_chrome
-    def ensure_autofill_dropdown_visible(self, field_element: WebElement = None):
+    def ensure_autofill_dropdown_visible(self):
         """
         Verifies that the autofill dropdown appears
-        checks if the parent pop up component have children elements before explicit wait.
-
-        Arguments:
-            field_element: if field element is given.
-                check whether it is a select element. pass the check if it is.
+        checks if the parent pop up component has hidden attribute.
         """
-        self.element_exists("pop-up-component")
-        popup_component = self.get_element("pop-up-component")
-        if popup_component:
-            self.element_visible("select-form-option")
+        self.element_clickable("pop-up-component-box")
+        return self
+
+    @BasePage.context_chrome
+    def hover_over_autofill_panel(self):
+        self.element_visible("select-form-option")
+        self.hover("select-form-option")
         return self
 
     # Interaction with popup elements
@@ -103,12 +106,17 @@ def select_nth_element(self, index: int):
         Arguments:
             index (int): The index of the element to retrieve (1-based)
         """
-        self.wait.until(
-            EC.element_to_be_clickable(
-                self.get_element("select-form-option-by-index", labels=[str(index)])
-            )
-        )
-        self.get_element("select-form-option-by-index", labels=[str(index)]).click()
+        self.element_clickable("pop-up-component-box")
+        self.click_on("select-form-option-by-index", labels=[str(index)])
+
+    @BasePage.context_chrome
+    def select_autofill_panel(self):
+        """
+        Select the first autofill panel in the autocomplete list.
+        """
+        self.element_clickable("select-form-option-autofill")
+        self.click_on("select-form-option-autofill")
+        return self
 
     @BasePage.context_chrome
     def get_primary_value(self, element: WebElement) -> str: