Merge pull request #132 from mozilla/sl/private-browsing-password-doorhanger

Fix to the selectors (using xpath)

Author: sarinali

modules/data/login_autofill.components.json

@@ -29,5 +29,23 @@
         "groups": [
             "doNotCache"
         ]
+    },
+
+    "username-login-field": {
+        "selectorData": "/html/body/div[1]/form[2]/input[1]",
+        "strategy": "xpath",
+        "groups": []
+    },
+
+    "password-login-field": {
+        "selectorData": "/html/body/div[1]/form[2]/input[2]",
+        "strategy": "xpath",
+        "groups": []
+    },
+
+    "submit-button-login": {
+        "selectorData": "/html/body/div[1]/form[2]/input[3]",
+        "strategy": "xpath",
+        "groups": []
     }
 }

modules/page_object_autofill_login.py

@@ -23,20 +23,15 @@ def __init__(self, parent: "LoginAutofill") -> None:
 
         def fill_username(self, username: str) -> None:
             if self.username_field is None:
-                username_fields = self.parent.get_elements("username-field")
-                self.username_field = username_fields[1]
+                self.username_field = self.parent.get_element("username-login-field")
             self.username_field.send_keys(username)
 
         def fill_password(self, password: str) -> None:
             if self.password_field is None:
-                password_fields = self.parent.get_elements(
-                    "input-field", labels=["current-password"]
-                )
-                self.password_field = password_fields[0]
+                self.password_field = self.parent.get_element("password-login-field")
             self.password_field.send_keys(password)
 
         def submit(self) -> None:
             if self.submit_button is None:
-                submit_buttons = self.parent.get_elements("submit-form")
-                self.submit_button = submit_buttons[0]
+                self.submit_button = self.parent.get_element("submit-button-login")
             self.submit_button.click()