Added clear to driver.

benzhou29 · benzhou29 · commit c5a00437c425 · 2016-12-01T22:27:13.000-06:00
Added find elements by ios predicate string.
diff --git a/appium/webdriver/common/mobileby.py b/appium/webdriver/common/mobileby.py
@@ -16,6 +16,7 @@
 
 
 class MobileBy(By):
+    IOS_PREDICATE = '-ios predicate string'
     IOS_UIAUTOMATION = '-ios uiautomation'
     ANDROID_UIAUTOMATOR = '-android uiautomator'
     ACCESSIBILITY_ID = 'accessibility id'
diff --git a/appium/webdriver/mobilecommand.py b/appium/webdriver/mobilecommand.py
@@ -58,3 +58,4 @@ class MobileCommand(object):
     UPDATE_SETTINGS = 'updateSettings'
     SET_LOCATION = 'setLocation'
     GET_DEVICE_TIME = 'getDeviceTime'
+    CLEAR = 'clear'
diff --git a/appium/webdriver/webdriver.py b/appium/webdriver/webdriver.py
@@ -43,6 +43,7 @@ def __init__(self, command_executor='http://127.0.0.1:4444/wd/hub',
 
         # add new method to the `find_by_*` pantheon
         By.IOS_UIAUTOMATION = MobileBy.IOS_UIAUTOMATION
+        By.IOS_PREDICATE = MobileBy.IOS_PREDICATE
         By.ANDROID_UIAUTOMATOR = MobileBy.ANDROID_UIAUTOMATOR
         By.ACCESSIBILITY_ID = MobileBy.ACCESSIBILITY_ID
 
@@ -98,6 +99,28 @@ def find_elements_by_ios_uiautomation(self, uia_string):
         """
         return self.find_elements(by=By.IOS_UIAUTOMATION, value=uia_string)
 
+    def find_element_by_ios_predicate(self, predicate_string):
+        """Find an element by ios predicate string.
+
+        :Args:
+         - predicate_string - The predicate string
+
+        :Usage:
+            driver.find_element_by_ios_predicate('label == "myLabel"')
+        """
+        return self.find_element(by=By.IOS_PREDICATE, value=predicate_string)
+
+    def find_elements_by_ios_predicate(self, predicate_string):
+        """Finds elements by ios predicate string.
+
+        :Args:
+         - predicate_string - The predicate string
+
+        :Usage:
+            driver.find_elements_by_ios_predicate('label == "myLabel"')
+        """
+        return self.find_elements(by=By.IOS_PREDICATE, value=predicate_string)
+
     def find_element_by_android_uiautomator(self, uia_string):
         """Finds element by uiautomator in Android.
 
@@ -829,3 +852,5 @@ def _addCommands(self):
             ('GET', '/session/$sessionId/element/$id/location_in_view')
         self.command_executor._commands[Command.GET_DEVICE_TIME] = \
             ('GET', '/session/$sessionId/appium/device/system_time')
+        self.command_executor._commands[Command.CLEAR] = \
+            ('POST', '/session/$sessionId/element/$id/clear')
diff --git a/appium/webdriver/webelement.py b/appium/webdriver/webelement.py
@@ -41,6 +41,28 @@ def find_elements_by_ios_uiautomation(self, uia_string):
         """
         return self.find_elements(by=By.IOS_UIAUTOMATION, value=uia_string)
 
+    def find_element_by_ios_predicate(self, predicate_string):
+        """Find an element by ios predicate string.
+
+        :Args:
+         - predicate_string - The predicate string
+
+        :Usage:
+            driver.find_element_by_ios_predicate('label == "myLabel"')
+        """
+        return self.find_element(by=By.IOS_PREDICATE, value=predicate_string)
+
+    def find_elements_by_ios_predicate(self, predicate_string):
+        """Finds elements by ios predicate string.
+
+        :Args:
+         - predicate_string - The predicate string
+
+        :Usage:
+            driver.find_elements_by_ios_predicate('label == "myLabel"')
+        """
+        return self.find_elements(by=By.IOS_PREDICATE, value=predicate_string)
+
     def find_element_by_android_uiautomator(self, uia_string):
         """Finds element by uiautomator in Android.
 
@@ -122,3 +144,10 @@ def set_value(self, value):
         }
         self._execute(Command.SET_IMMEDIATE_VALUE, data)
         return self
+
+    def clear(self):
+        """Clears text.
+        """
+        data = {'id': self.id}
+        self._execute(Command.CLEAR, data)
+        return self
