xml_keys, xml_values, resolve_id work on iOS

Author: bootstraponline

lib/appium_lib/android/helper.rb

@@ -307,10 +307,6 @@ def page_class
     nil
   end
 
-  def lazy_load_strings
-    @strings_xml ||= mobile(:getStrings)
-  end
-
   # Android only.
   # Returns a string containing interesting elements.
   # If an element has no content desc or text, then it's not returned by this method.
@@ -416,30 +412,6 @@ def fast_duration
     0.20
   end
 
-  # Search strings.xml's values for target.
-  # @param target [String] the target to search for in strings.xml values
-  # @return [Array]
-  def xml_keys target
-    lazy_load_strings
-    @strings_xml.select { |key, value| key.downcase.include? target.downcase }
-  end
-
-  # Search strings.xml's keys for target.
-  # @param target [String] the target to search for in strings.xml keys
-  # @return [Array]
-  def xml_values target
-    lazy_load_strings
-    @strings_xml.select { |key, value| value.downcase.include? target.downcase }
-  end
-
-  # Resolve id in strings.xml and return the value.
-  # @param id [String] the id to resolve
-  # @return [String]
-  def resolve_id id
-    lazy_load_strings
-    @strings_xml[id]
-  end
-
   # Lists package, activity, and adb shell am start -n value for current app.
   # Works on local host only (not remote).
   def current_app

lib/appium_lib/common/helper.rb

@@ -232,4 +232,32 @@ def px_to_window_rel opts={}
     OpenStruct.new( x: x.to_f / w.width.to_f,
                     y: y.to_f / w.height.to_f )
   end
+
+  def lazy_load_strings
+    @strings_xml ||= mobile(:getStrings)
+  end
+
+  # Search strings.xml's values for target.
+  # @param target [String] the target to search for in strings.xml values
+  # @return [Array]
+  def xml_keys target
+    lazy_load_strings
+    @strings_xml.select { |key, value| key.downcase.include? target.downcase }
+  end
+
+  # Search strings.xml's keys for target.
+  # @param target [String] the target to search for in strings.xml keys
+  # @return [Array]
+  def xml_values target
+    lazy_load_strings
+    @strings_xml.select { |key, value| value.downcase.include? target.downcase }
+  end
+
+  # Resolve id in strings.xml and return the value.
+  # @param id [String] the id to resolve
+  # @return [String]
+  def resolve_id id
+    lazy_load_strings
+    @strings_xml[id]
+  end
 end # module Appium::Common

lib/appium_lib/ios/helper.rb

@@ -83,10 +83,6 @@ def page_class
     nil
   end
 
-  def lazy_load_strings
-    @strings_xml ||= mobile(:getStrings)
-  end
-
   # Returns a string of interesting elements. iOS only.
   #
   # Defaults to inspecting the 1st windows source only.