appium_lib 9.5.0 → 9.6.0

data/lib/appium_lib/ios/element/button.rb

@@ -6,7 +6,7 @@ module Appium
 
     # @return [String] Class name for button
     def button_class
-      automation_name_is_xcuitest? ? XCUIElementTypeButton : UIAButton
+      UIAButton
     end
 
     # Find the first UIAButton|XCUIElementTypeButton that contains value or by index.
@@ -16,12 +16,7 @@ module Appium
     def button(value)
       # return button at index.
       return ele_index button_class, value if value.is_a? Numeric
-
-      if automation_name_is_xcuitest?
-        raise_error_if_no_element buttons(value).first
-      else
-        ele_by_json_visible_contains button_class, value
-      end
+      ele_by_json_visible_contains button_class, value
     end
 
     # Find all UIAButtons|XCUIElementTypeButtons containing value.
@@ -30,13 +25,7 @@ module Appium
     # @return [Array<UIAButton|XCUIElementTypeButton>]
     def buttons(value = false)
       return tags button_class unless value
-
-      if automation_name_is_xcuitest?
-        elements = find_eles_by_predicate_include(class_name: button_class, value: value)
-        select_visible_elements elements
-      else
-        eles_by_json_visible_contains button_class, value
-      end
+      eles_by_json_visible_contains button_class, value
     end
 
     # Find the first UIAButton|XCUIElementTypeButton.
@@ -57,23 +46,14 @@ module Appium
     # @param value [String] the value to match exactly
     # @return [UIAButton|XCUIElementTypeButton]
     def button_exact(value)
-      if automation_name_is_xcuitest?
-        raise_error_if_no_element buttons_exact(value).first
-      else
-        ele_by_json_visible_exact button_class, value
-      end
+      ele_by_json_visible_exact button_class, value
     end
 
     # Find all UIAButtons|XCUIElementTypeButtons that exactly match value.
     # @param value [String] the value to match exactly
     # @return [Array<UIAButton|XCUIElementTypeButton>]
     def buttons_exact(value)
-      if automation_name_is_xcuitest?
-        elements = find_eles_by_predicate(class_name: button_class, value: value)
-        select_visible_elements elements
-      else
-        eles_by_json_visible_exact button_class, value
-      end
+      eles_by_json_visible_exact button_class, value
     end
   end # module Ios
 end # module Appium

data/lib/appium_lib/ios/element/generic.rb

@@ -4,46 +4,28 @@ module Appium
     # @param value [String] the value to search for
     # @return [Element]
     def find(value)
-      if automation_name_is_xcuitest?
-        raise_error_if_no_element finds(value).first
-      else
-        ele_by_json_visible_contains '*', value
-      end
+      ele_by_json_visible_contains '*', value
     end
 
     # Find all elements containing value
     # @param value [String] the value to search for
     # @return [Array<Element>]
     def finds(value)
-      if automation_name_is_xcuitest?
-        elements = find_eles_by_predicate_include value: value
-        select_visible_elements elements
-      else
-        eles_by_json_visible_contains '*', value
-      end
+      eles_by_json_visible_contains '*', value
     end
 
     # Find the first element exactly matching value
     # @param value [String] the value to search for
     # @return [Element]
     def find_exact(value)
-      if automation_name_is_xcuitest?
-        raise_error_if_no_element finds_exact(value).first
-      else
-        ele_by_json_visible_exact '*', value
-      end
+      ele_by_json_visible_exact '*', value
     end
 
     # Find all elements exactly matching value
     # @param value [String] the value to search for
     # @return [Array<Element>]
     def finds_exact(value)
-      if automation_name_is_xcuitest?
-        elements = find_eles_by_predicate value: value
-        select_visible_elements elements
-      else
-        eles_by_json_visible_exact '*', value
-      end
+      eles_by_json_visible_exact '*', value
     end
 
     private

data/lib/appium_lib/ios/element/text.rb

@@ -6,7 +6,7 @@ module Appium
 
     # @return [String] Class name for text
     def static_text_class
-      automation_name_is_xcuitest? ? XCUIElementTypeStaticText : UIAStaticText
+      UIAStaticText
     end
 
     # Find the first UIAStaticText|XCUIElementTypeStaticText that contains value or by index.
@@ -15,12 +15,7 @@ module Appium
     # @return [UIAStaticText|XCUIElementTypeStaticText]
     def text(value)
       return ele_index static_text_class, value if value.is_a? Numeric
-
-      if automation_name_is_xcuitest?
-        raise_error_if_no_element texts(value).first
-      else
-        ele_by_json_visible_contains static_text_class, value
-      end
+      ele_by_json_visible_contains static_text_class, value
     end
 
     # Find all UIAStaticTexts|XCUIElementTypeStaticTexts containing value.
@@ -29,13 +24,7 @@ module Appium
     # @return [Array<UIAStaticText|XCUIElementTypeStaticText>]
     def texts(value = false)
       return tags static_text_class unless value
-
-      if automation_name_is_xcuitest?
-        elements = find_eles_by_predicate_include(class_name: static_text_class, value: value)
-        select_visible_elements elements
-      else
-        eles_by_json_visible_contains static_text_class, value
-      end
+      eles_by_json_visible_contains static_text_class, value
     end
 
     # Find the first UIAStaticText|XCUIElementTypeStaticText.
@@ -54,23 +43,14 @@ module Appium
     # @param value [String] the value to match exactly
     # @return [UIAStaticText|XCUIElementTypeStaticText]
     def text_exact(value)
-      if automation_name_is_xcuitest?
-        raise_error_if_no_element texts_exact(value).first
-      else
-        ele_by_json_visible_exact static_text_class, value
-      end
+      ele_by_json_visible_exact static_text_class, value
     end
 
     # Find all UIAStaticTexts|XCUIElementTypeStaticTexts that exactly match value.
     # @param value [String] the value to match exactly
     # @return [Array<UIAStaticText|XCUIElementTypeStaticText>]
     def texts_exact(value)
-      if automation_name_is_xcuitest?
-        elements = find_eles_by_predicate(class_name: static_text_class, value: value)
-        select_visible_elements elements
-      else
-        eles_by_json_visible_exact static_text_class, value
-      end
+      eles_by_json_visible_exact static_text_class, value
     end
   end # module Ios
 end # module Appium

data/lib/appium_lib/ios/element/textfield.rb

@@ -8,50 +8,14 @@ module Appium
 
     # @return [String] Class name for text field
     def text_field_class
-      automation_name_is_xcuitest? ? XCUIElementTypeTextField : UIATextField
+      UIATextField
     end
 
     # @return [String] Class name for secure text field
     def secure_text_field_class
-      automation_name_is_xcuitest? ? XCUIElementTypeSecureTextField : UIASecureTextField
+      UIASecureTextField
     end
 
-    private
-
-    # @private
-    # for XCUITest
-    def _textfield_with_predicate
-      raise_error_if_no_element _textfields_with_predicate.first
-    end
-
-    # @private
-    # for XCUITest
-    def _textfields_with_predicate
-      elements = tags_include(class_names: [text_field_class, secure_text_field_class])
-      select_visible_elements elements
-    end
-
-    # Appium
-    def _textfield_visible
-      { typeArray: [UIATextField, UIASecureTextField], onlyVisible: true }
-    end
-
-    # Appium
-    def _textfield_exact_string(value)
-      exact = { target: value, substring: false, insensitive: false }
-      exact_obj = { name:  exact, label: exact, value: exact }
-      _textfield_visible.merge(exact_obj)
-    end
-
-    # Appium
-    def _textfield_contains_string(value)
-      contains = { target: value, substring: true, insensitive: true }
-      contains_obj = { name: contains, label: contains, value: contains }
-      _textfield_visible.merge(contains_obj)
-    end
-
-    public
-
     # Find the first TextField that contains value or by index.
     # Note: Uses XPath
     # @param value [String, Integer] the text to match exactly.
@@ -62,21 +26,13 @@ module Appium
         index = value
         raise "#{index} is not a valid index. Must be >= 1" if index <= 0
         index -= 1 # eles_by_json and _textfields_with_predicate is 0 indexed.
-        result = if automation_name_is_xcuitest?
-                   _textfields_with_predicate[index]
-                 else
-                   eles_by_json(_textfield_visible)[index]
-                 end
+        result = eles_by_json(_textfield_visible)[index]
         raise _no_such_element if result.nil?
         return result
 
       end
 
-      if automation_name_is_xcuitest?
-        raise_error_if_no_element textfields(value).first
-      else
-        ele_by_json _textfield_contains_string value
-      end
+      ele_by_json _textfield_contains_string value
     end
 
     # Find all TextFields containing value.
@@ -84,35 +40,20 @@ module Appium
     # @param value [String] the value to search for
     # @return [Array<TextField>]
     def textfields(value = false)
-      if automation_name_is_xcuitest?
-        return tags_include(class_names: [text_field_class, secure_text_field_class]) unless value
-
-        elements = tags_include class_names: [text_field_class, secure_text_field_class], value: value
-        select_visible_elements elements
-      else
-        return eles_by_json _textfield_visible unless value
-        eles_by_json _textfield_contains_string value
-      end
+      return eles_by_json _textfield_visible unless value
+      eles_by_json _textfield_contains_string value
     end
 
     # Find the first TextField.
     # @return [TextField]
     def first_textfield
-      if automation_name_is_xcuitest?
-        _textfield_with_predicate
-      else
-        ele_by_json _textfield_visible
-      end
+      ele_by_json _textfield_visible
     end
 
     # Find the last TextField.
     # @return [TextField]
     def last_textfield
-      result = if automation_name_is_xcuitest?
-                 _textfields_with_predicate.last
-               else
-                 eles_by_json(_textfield_visible).last
-               end
+      result = eles_by_json(_textfield_visible).last
       raise _no_such_element if result.nil?
       result
     end
@@ -121,23 +62,35 @@ module Appium
     # @param value [String] the value to match exactly
     # @return [TextField]
     def textfield_exact(value)
-      if automation_name_is_xcuitest?
-        raise_error_if_no_element textfields_exact(value).first
-      else
-        ele_by_json _textfield_exact_string value
-      end
+      ele_by_json _textfield_exact_string value
     end
 
     # Find all TextFields that exactly match value.
     # @param value [String] the value to match exactly
     # @return [Array<TextField>]
     def textfields_exact(value)
-      if automation_name_is_xcuitest?
-        elements = tags_exact class_names: [text_field_class, secure_text_field_class], value: value
-        select_visible_elements elements
-      else
-        eles_by_json _textfield_exact_string value
-      end
+      eles_by_json _textfield_exact_string value
+    end
+
+    private
+
+    # Appium
+    def _textfield_visible
+      { typeArray: [UIATextField, UIASecureTextField], onlyVisible: true }
+    end
+
+    # Appium
+    def _textfield_exact_string(value)
+      exact = { target: value, substring: false, insensitive: false }
+      exact_obj = { name:  exact, label: exact, value: exact }
+      _textfield_visible.merge(exact_obj)
+    end
+
+    # Appium
+    def _textfield_contains_string(value)
+      contains = { target: value, substring: true, insensitive: true }
+      contains_obj = { name: contains, label: contains, value: contains }
+      _textfield_visible.merge(contains_obj)
     end
   end # module Ios
 end # module Appium

data/lib/appium_lib/ios/helper.rb

@@ -189,12 +189,8 @@ module Appium
     # Return the iOS version as an array of integers
     # @return [Array<Integer>]
     def ios_version
-      if automation_name_is_xcuitest?
-        @driver.capabilities['platformVersion']
-      else
-        ios_version = execute_script 'UIATarget.localTarget().systemVersion()'
-        ios_version.split('.').map(&:to_i)
-      end
+      ios_version = execute_script 'UIATarget.localTarget().systemVersion()'
+      ios_version.split('.').map(&:to_i)
     end
 
     # Get the element of type class_name at matching index.
@@ -219,15 +215,7 @@ module Appium
 
     # @private
     def string_attr_exact(class_name, attr, value)
-      if automation_name_is_xcuitest?
-        if attr == '*'
-          %((//#{class_name})[@*[.="#{value}"]])
-        else
-          %((//#{class_name})[@#{attr}="#{value}"])
-        end
-      else
-        %(//#{class_name}[@visible="true" and @#{attr}="#{value}"])
-      end
+      %(//#{class_name}[@visible="true" and @#{attr}="#{value}"])
     end
 
     # Find the first element exactly matching class and attribute value.
@@ -254,15 +242,7 @@ module Appium
 
     # @private
     def string_attr_include(class_name, attr, value)
-      if automation_name_is_xcuitest?
-        if attr == '*'
-          %((//#{class_name})[@*[contains(translate(., "#{value.upcase}", "#{value}"), "#{value}")]])
-        else
-          %((//#{class_name})[contains(translate(@#{attr}, "#{value.upcase}", "#{value}"), "#{value}")])
-        end
-      else
-        %(//#{class_name}[@visible="true" and contains(translate(@#{attr},"#{value.upcase}", "#{value}"), "#{value}")])
-      end
+      %(//#{class_name}[@visible="true" and contains(translate(@#{attr},"#{value.upcase}", "#{value}"), "#{value}")])
     end
 
     # Find the first element exactly matching attribute case insensitive value.
@@ -346,13 +326,7 @@ module Appium
     # @param class_name [String] the tag to match
     # @return [Element]
     def last_ele(class_name)
-      if automation_name_is_xcuitest?
-        visible_elements = tags class_name
-        raise _no_such_element if visible_elements.empty?
-        visible_elements.last
-      else
-        ele_index class_name, 'last()'
-      end
+      ele_index class_name, 'last()'
     end
 
     # Returns the first **visible** element matching class_name
@@ -360,11 +334,7 @@ module Appium
     # @param class_name [String] the class_name to search for
     # @return [Element]
     def tag(class_name)
-      if automation_name_is_xcuitest?
-        raise_error_if_no_element tags(class_name).first
-      else
-        ele_by_json(typeArray: [class_name], onlyVisible: true)
-      end
+      ele_by_json(typeArray: [class_name], onlyVisible: true)
     end
 
     # Returns all visible elements matching class_name
@@ -372,12 +342,7 @@ module Appium
     # @param class_name [String] the class_name to search for
     # @return [Element]
     def tags(class_name)
-      if automation_name_is_xcuitest?
-        elements = @driver.find_elements :class, class_name
-        select_visible_elements elements
-      else
-        eles_by_json(typeArray: [class_name], onlyVisible: true)
-      end
+      eles_by_json(typeArray: [class_name], onlyVisible: true)
     end
 
     # Returns all visible elements matching class_names and value
@@ -390,22 +355,8 @@ module Appium
     def tags_include(class_names:, value: nil)
       return unless class_names.is_a? Array
 
-      if automation_name_is_xcuitest?
-        c_names = class_names.map { |class_name| %(type == "#{class_name}") }.join(' || ')
-
-        predicate = if value
-                      %((#{c_names}) && ) +
-                        %((name contains[c] "#{value}" || label contains[c] "#{value}" || value contains[c] "#{value}"))
-                    else
-                      c_names
-                    end
-
-        elements = @driver.find_elements :predicate, predicate
-        select_visible_elements elements
-      else
-        class_names.flat_map do |class_name|
-          value ? eles_by_json_visible_contains(class_name, value) : tags(class_name)
-        end
+      class_names.flat_map do |class_name|
+        value ? eles_by_json_visible_contains(class_name, value) : tags(class_name)
       end
     end
 
@@ -419,22 +370,8 @@ module Appium
     def tags_exact(class_names:, value: nil)
       return unless class_names.is_a? Array
 
-      if automation_name_is_xcuitest?
-        c_names = class_names.map { |class_name| %(type == "#{class_name}") }.join(' || ')
-
-        predicate = if value
-                      %((#{c_names}) && ) +
-                        %((name ==[c] "#{value}" || label ==[c] "#{value}" || value ==[c] "#{value}"))
-                    else
-                      c_names
-                    end
-
-        elements = @driver.find_elements :predicate, predicate
-        select_visible_elements elements
-      else
-        class_names.flat_map do |class_name|
-          value ? eles_by_json_visible_exact(class_name, value) : tags(class_name)
-        end
+      class_names.flat_map do |class_name|
+        value ? eles_by_json_visible_exact(class_name, value) : tags(class_name)
       end
     end