fix selenium helper calls in field handler

Author: abooker

.gitignore

@@ -53,3 +53,7 @@ docs/_build/
 
 # PyBuilder
 target/
+
+# OS generated files
+.DS_Store
+.DS_Store?

tests/test_field_handler.py

@@ -226,14 +226,14 @@ def test_dispatch_general_exception_with_name(self, text_method):
     #--- Handle Text
     def test_handle_text_without_confirm(self):
         self.fh.handle_text("selector", "input text")
-        self.sh.fill_an_element.assert_called_once_with("selector", "input text")
+        self.sh.fill_an_element.assert_called_once_with(css_selector="selector", fill_text="input text")
 
     def test_handle_text_with_confirm(self):
         css_selector = "selector"
         input_text = "input text"
         confirm_css_selector = "confirm"
         self.fh.handle_text(css_selector, input_text, confirm_css_selector)
-        self.sh.fill_an_element.assert_called_with(confirm_css_selector, input_text)
+        self.sh.fill_an_element.assert_called_with(css_selector=confirm_css_selector, fill_text=input_text)
 
     def test_handle_text_selenium_exception(self):
         self.sh.fill_an_element.side_effect = selenium_helpers.SeleniumHelperExceptions("message text",
@@ -251,7 +251,7 @@ def test_handle_text_general_exception(self):
     def test_handle_check_box(self):
         enum = [{"css_selector": "selector.1"}, {"css_selector": "selector.2"}]
         self.fh.handle_check_box(enum, [0, 1])
-        self.sh.click_an_element.assert_called_with(enum[1]["css_selector"])
+        self.sh.click_an_element.assert_called_with(css_selector=enum[1]["css_selector"])
 
     def test_handle_check_box_key_error(self):
         enum = [{"bad_key": "selector.1"}, {"css_selector": "selector.2"}]
@@ -277,7 +277,7 @@ def test_handle_check_box_general_exception(self):
     def test_handle_radio_button(self):
         enum = [{"css_selector": "selector.1"}, {"css_selector": "selector.2"}]
         self.fh.handle_radio_button(enum, 1)
-        self.sh.click_an_element.assert_called_with(enum[1]["css_selector"])
+        self.sh.click_an_element.assert_called_with(css_selector=enum[1]["css_selector"])
 
     def test_handle_radio_button_key_error(self):
         enum = [{"bad_key": "selector.1"}, {"css_selector": "selector.1"}]
@@ -303,12 +303,12 @@ def test_handle_radio_button_general_exception(self):
     def test_handle_select_with_first_invalid(self):
         selector = "select.1"
         self.fh.handle_select(selector, 1)
-        self.sh.click_an_element.assert_called_once_with("{0} option:nth-child({1})".format(selector, 3))
+        self.sh.click_an_element.assert_called_once_with(css_selector="{0} option:nth-child({1})".format(selector, 3))
 
     def test_handle_select_with_first_valid(self):
         selector = "select.1"
         self.fh.handle_select(selector, 1, True)
-        self.sh.click_an_element.assert_called_once_with("{0} option:nth-child({1})".format(selector, 2))
+        self.sh.click_an_element.assert_called_once_with(css_selector="{0} option:nth-child({1})".format(selector, 2))
 
     def test_handle_select_selenium_exception(self):
         self.sh.click_an_element.side_effect = selenium_helpers.SeleniumHelperExceptions("message text",
@@ -328,7 +328,7 @@ def test_handle_drop_down(self):
         css_selector = "selector.1"
         enum = [{"css_selector": "selector.1"}, {"css_selector": "selector.2"}]
         self.fh.handle_drop_down(css_selector, enum, 1)
-        self.sh.click_an_element.assert_called_with(enum[1]["css_selector"])
+        self.sh.click_an_element.assert_called_with(css_selector=enum[1]["css_selector"])
 
     def test_handle_drop_down_key_error(self):
         css_selector = "selector.1"
@@ -355,7 +355,7 @@ def test_handle_drop_down_general_exception(self):
     def test_handle_button(self):
         css_selector = "selector.1"
         self.fh.handle_button(css_selector)
-        self.sh.click_an_element.assert_called_with(css_selector)
+        self.sh.click_an_element.assert_called_with(css_selector=css_selector)
 
     def test_handle_button_selenium_exception(self):
         css_selector = "selector.1"

the_ark/field_handlers.py

@@ -108,10 +108,10 @@ def handle_text(self, css_selector="", input_text="", confirm_css_selector=None)
         """
         try:
             #--- Handle the field
-            self.sh.fill_an_element(css_selector, input_text)
+            self.sh.fill_an_element(css_selector=css_selector, fill_text=input_text)
             #- Fill in the confirm field as well, if provided
             if confirm_css_selector:
-                self.sh.fill_an_element(confirm_css_selector, input_text)
+                self.sh.fill_an_element(css_selector=confirm_css_selector, fill_text=input_text)
 
         except selenium_helpers.SeleniumHelperExceptions as selenium_error:
             message = "A selenium issue arose while handling the text field."
@@ -141,7 +141,7 @@ def handle_check_box(self, enums, input_indexes):
             #--- Handle the field
             for index in input_indexes:
                 current_test_index = index
-                self.sh.click_an_element(enums[index]["css_selector"])
+                self.sh.click_an_element(css_selector=enums[index]["css_selector"])
 
         except KeyError as key:
             message = "Key {0} is missing from the dictionary at " \
@@ -171,7 +171,7 @@ def handle_radio_button(self, enums, input_index):
         """
         try:
             #--- Handle the field
-            self.sh.click_an_element(enums[input_index]["css_selector"])
+            self.sh.click_an_element(css_selector=enums[input_index]["css_selector"])
 
         except KeyError as key:
             message = "Key {0} is missing from the dictionary at " \
@@ -205,7 +205,7 @@ class to interact with the field.
             if first_valid:
                 index_offset = 1
 
-            self.sh.click_an_element("{0} option:nth-child({1})".format(
+            self.sh.click_an_element(css_selector="{0} option:nth-child({1})".format(
                 css_selector, input_index + index_offset))
 
         except selenium_helpers.SeleniumHelperExceptions as selenium_error:
@@ -234,9 +234,9 @@ def handle_drop_down(self, css_selector, enums, input_index):
         try:
             #--- Handle the field
             #- Click the parent element to reveal the options
-            self.sh.click_an_element(css_selector)
+            self.sh.click_an_element(css_selector=css_selector)
             #- Click the option that corresponds with the css_selector in the given index of the enum
-            self.sh.click_an_element(enums[input_index]["css_selector"])
+            self.sh.click_an_element(css_selector=enums[input_index]["css_selector"])
 
         except KeyError as key:
             message = "Key {0} is missing from the dictionary at " \
@@ -261,7 +261,7 @@ def handle_button(self, css_selector):
             - css_selector:     string - The element's css selector in the webpage's DOM.
         """
         try:
-            self.sh.click_an_element(css_selector)
+            self.sh.click_an_element(css_selector=css_selector)
 
         except selenium_helpers.SeleniumHelperExceptions as selenium_error:
             message = "A selenium issue arose while attempting to select click the button"