Replace mobile methods for appium 1.0

Author: bootstraponline

lib/appium_lib/android/element/generic.rb

@@ -62,7 +62,7 @@ def find val
           [[7, val]],
           # s.textContains(value);
           [[3, val]]
-      mobile :find, args
+      complex_find args
     end
 
     # Return the first element matching text.
@@ -71,7 +71,7 @@ def find val
     def text text
       # Return the first element matching selector.
       # s.textContains(value)
-      mobile :find, [[[3, text]]]
+      complex_find [[[3, text]]]
     end
 
     # Return all elements matching text.
@@ -89,7 +89,7 @@ def texts text
     def name name
       # work around https://github.com/appium/appium/issues/543
       # @driver.find_element :name, name
-      mobile :find, [[[7, name]]]
+      complex_find [[[7, name]]]
     end
 
     # Return the first element exactly matching name.
@@ -99,7 +99,7 @@ def name name
     # @return [Element] the first matching element
     def name_exact name
       # exact description
-      result = mobile :find, [[[5, name]]]
+      result = complex_find [[[5, name]]]
 
       return result if result.kind_of? Selenium::WebDriver::Element
 
@@ -118,11 +118,11 @@ def name_exact name
     def names name=''
       if name.nil? || name.empty?
         args = 'all', [[7, ''], [100]]
-        mobile :find, args
+        complex_find args
       else
         args = 'all',
             [[7, name]]
-        mobile :find, args
+        complex_find args
       end
     end
 
@@ -136,7 +136,7 @@ def scroll_to text
           # descriptionContains(text)
           [[7, text]]
 
-      mobile :find, args
+      complex_find args
     end
 
     # Scroll to an element with the exact target text or description.
@@ -149,7 +149,7 @@ def scroll_to_exact text
           # description(text)
           [[5, text]]
 
-      mobile :find, args
+      complex_find args
     end
   end # module Android
 end # module Appium

lib/appium_lib/android/element/textfield.rb

@@ -37,7 +37,7 @@ def textfield text
       args = [[4, 'android.widget.EditText'], [7, text]],
           # s.className('android.widget.EditText').textContains(value);
           [[4, 'android.widget.EditText'], [3, text]]
-      mobile :find, args
+      complex_find args
     end
 
     # Get the first textfield that matches text.

lib/appium_lib/android/helper.rb

@@ -205,7 +205,7 @@ def find_eles_attr tag_name, attribute=nil
 
     args = [ 'all', sel1, sel2 ]
 
-    mobile :find, args
+    complex_find args
 =end
       array = ['all']
 
@@ -214,7 +214,7 @@ def find_eles_attr tag_name, attribute=nil
         array.push [[4, name], [100]]
       end
 
-      mobile :find, array
+      complex_find array
     end
 
     # Android only.

lib/appium_lib/common/helper.rb

@@ -298,7 +298,7 @@ def px_to_window_rel opts={}
     end
 
     def lazy_load_strings
-      @strings_xml ||= mobile(:getStrings)
+      @strings_xml ||= app_strings
     end
 
     # Search strings.xml's values for target.

lib/appium_lib/driver.rb

@@ -512,25 +512,6 @@ def execute_script script, *args
       @driver.execute_script script, *args
     end
 
-    # Helper method for mobile gestures
-    #
-    # https://github.com/appium/appium/wiki/Automating-mobile-gestures
-    #
-    # driver.execute_script 'mobile: swipe', endX: 100, endY: 100, duration: 0.01
-    #
-    # becomes
-    #
-    # mobile :swipe, endX: 100, endY: 100, duration: 0.01
-    # @param method [String, Symbol] the method to execute
-    # @param args [*args] the args to pass to the method
-    # @return [Object]
-    def mobile method, *args
-      raise 'Method must not be nil' if method.nil?
-      raise 'Method must have .to_s' unless method.respond_to? :to_s
-
-      @driver.execute_script "mobile: #{method.to_s}", *args
-    end
-
     # Calls @driver.find_elements
     #
     # @param args [*args] the args to use

lib/appium_lib/ios/element/generic.rb

@@ -130,9 +130,14 @@ def texts text
     # @return [Element] the first matching element
     def name name
       name = escape_single_quote name
-      mobile :findElementNameContains, name: name
+      execute_script(%Q(au.mainApp().getNameContains('#{name}')))
     end
 
+    # Return first element exactly matching name.
+    # on Android name is content description
+    # on iOS name is the accessibility label or the text.
+    # @param name [String] the name to search for
+    # @return [Element] the matching element
     def name_exact name
       name   = escape_single_quote name
       js     = all_ele_js "name == '#{name}'"