appium_lib 9.15.1 → 9.15.2

data/lib/appium_lib/ios/common/helper.rb

@@ -6,6 +6,7 @@ module Appium
 
       def start_element(type, attrs = [])
         return if filter && !filter.eql?(type)
+
         page = attrs.inject({}) do |hash, attr|
           hash[attr[0]] = attr[1] if %w(name label value hint visible).include?(attr[0])
           hash
@@ -15,19 +16,17 @@ module Appium
 
       # @private
       def _print_attr(type, name, label, value, hint, visible) # rubocop:disable Metrics/ParameterLists
+        puts type.to_s if name || label || value || hint || visible
+
         if name == label && name == value
-          puts type.to_s if name || label || value || hint || visible
           puts "   name, label, value: #{name}" if name
         elsif name == label
-          puts type.to_s if name || label || value || hint || visible
           puts "   name, label: #{name}" if name
           puts "   value: #{value}" if value
         elsif name == value
-          puts type.to_s if name || label || value || hint || visible
           puts "   name, value: #{name}" if name
           puts "  label: #{label}" if label
         else
-          puts type.to_s if name || label || value || hint || visible
           puts "   name: #{name}" if name
           puts "  label: #{label}" if label
           puts "  value: #{value}" if value
@@ -60,23 +59,23 @@ module Appium
     def page(opts = {})
       class_name = opts.is_a?(Hash) ? opts.fetch(:class, nil) : opts
 
+      source = get_source
+
       # current_context may be nil which breaks start_with
       if current_context && current_context.start_with?('WEBVIEW')
-        s      = get_source
         parser = @android_html_parser ||= Nokogiri::HTML::SAX::Parser.new(Appium::Common::HTMLElements.new)
         parser.document.reset
         parser.document.filter = class_name
-        parser.parse s
+        parser.parse source
         result = parser.document.result
         puts result
         result
       else
-        s = get_source
         parser = Nokogiri::XML::SAX::Parser.new(UITestElementsPrinter.new)
         if class_name
           parser.document.filter = class_name.is_a?(Symbol) ? class_name.to_s : class_name
         end
-        parser.parse s
+        parser.parse source
         nil
       end
     end
@@ -94,6 +93,7 @@ module Appium
     # @return [Element]
     def ele_index(class_name, index)
       raise 'Index must be >= 1' unless index == 'last()' || (index.is_a?(Integer) && index >= 1)
+
       elements = tags(class_name)
 
       if index == 'last()'
@@ -105,6 +105,7 @@ module Appium
       end
 
       raise _no_such_element if result.nil?
+
       result
     end
 
@@ -147,6 +148,7 @@ module Appium
     def find_ele_by_predicate(class_name: '*', value:)
       elements = find_eles_by_predicate(class_name: class_name, value: value)
       raise _no_such_element if elements.empty?
+
       elements.first
     end
 
@@ -156,12 +158,12 @@ module Appium
     # @param class_name [String] the tag name to match
     # @return [Array<Element>]
     def find_eles_by_predicate(class_name: '*', value:)
-      predicate =  if class_name == '*'
-                     %(name ==[c] "#{value}" || label ==[c] "#{value}" || value ==[c] "#{value}")
-                   else
-                     %(type == "#{class_name}" && ) +
-                       %((name ==[c] "#{value}" || label ==[c] "#{value}" || value ==[c] "#{value}"))
-                   end
+      predicate = if class_name == '*'
+                    %(name ==[c] "#{value}" || label ==[c] "#{value}" || value ==[c] "#{value}")
+                  else
+                    %(type == "#{class_name}" && ) +
+                      %((name ==[c] "#{value}" || label ==[c] "#{value}" || value ==[c] "#{value}"))
+                  end
       @driver.find_elements :predicate, predicate
     end
 
@@ -192,6 +194,7 @@ module Appium
     def find_ele_by_predicate_include(class_name: '*', value:)
       elements = find_eles_by_predicate_include(class_name: class_name, value: value)
       raise _no_such_element if elements.empty?
+
       elements.first
     end
 
@@ -280,17 +283,17 @@ module Appium
     # @return [String]
     def string_visible_contains(element, value)
       contains = {
-        target:      value,
-        substring:   true,
+        target: value,
+        substring: true,
         insensitive: true
       }
 
       {
-        typeArray:   [element],
+        typeArray: [element],
         onlyVisible: true,
-        name:        contains,
-        label:       contains,
-        value:       contains
+        name: contains,
+        label: contains,
+        value: contains
       }
     end
 
@@ -319,17 +322,17 @@ module Appium
     # @return [String]
     def string_visible_exact(element, value)
       exact = {
-        target:      value,
-        substring:   false,
+        target: value,
+        substring: false,
         insensitive: false
       }
 
       {
-        typeArray:   [element],
+        typeArray: [element],
         onlyVisible: true,
-        name:        exact,
-        label:       exact,
-        value:       exact
+        name: exact,
+        label: exact,
+        value: exact
       }
     end
 
@@ -359,6 +362,7 @@ module Appium
     def _all_pred(opts)
       predicate = opts[:predicate]
       raise 'predicate must be provided' unless predicate
+
       visible = opts.fetch :visible, true
       %($.mainApp().getAllWithPredicate("#{predicate}", #{visible});)
     end
@@ -386,10 +390,11 @@ module Appium
 
     def _validate_object(*objects)
       raise 'objects must be an array' unless objects.is_a? Array
+
       objects.each do |obj|
         next unless obj # obj may be nil. if so, ignore.
 
-        valid_keys   = [:target, :substring, :insensitive]
+        valid_keys   = %i[target substring insensitive]
         unknown_keys = obj.keys - valid_keys
         raise "Unknown keys: #{unknown_keys}" unless unknown_keys.empty?
 
@@ -434,7 +439,7 @@ module Appium
     # }
     #
     def _by_json(opts)
-      valid_keys   = [:typeArray, :onlyFirst, :onlyVisible, :name, :label, :value]
+      valid_keys = %i(typeArray onlyFirst onlyVisible name label value)
       unknown_keys = opts.keys - valid_keys
       raise "Unknown keys: #{unknown_keys}" unless unknown_keys.empty?
 
@@ -468,7 +473,7 @@ module Appium
       JS
 
       res = execute_script element_or_elements_by_type
-      res ? res : raise(Appium::Ios::CommandError, 'mainWindow is nil')
+      res || raise(Appium::Ios::CommandError, 'mainWindow is nil')
     end
 
     # For Appium(automation name), not XCUITest
@@ -491,8 +496,9 @@ module Appium
     # see eles_by_json
     def ele_by_json(opts)
       opts[:onlyFirst] = true
-      result           = _by_json(opts).first
+      result = _by_json(opts).first
       raise _no_such_element if result.nil?
+
       result
     end
   end # module Ios

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

@@ -16,6 +16,7 @@ module Appium
     def button(value)
       # return button at index.
       return ele_index button_class, value if value.is_a? Numeric
+
       ele_by_json_visible_contains button_class, value
     end
 
@@ -25,6 +26,7 @@ module Appium
     # @return [Array<UIAButton|XCUIElementTypeButton>]
     def buttons(value = false)
       return tags button_class unless value
+
       eles_by_json_visible_contains button_class, value
     end
 

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

@@ -33,6 +33,7 @@ module Appium
     def raise_error_if_no_element(element)
       error_message = 'An element could not be located on the page using the given search parameters.'
       raise(::Selenium::WebDriver::Error::NoSuchElementError, error_message) if element.nil?
+
       element
     end
 

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

@@ -15,6 +15,7 @@ module Appium
     # @return [UIAStaticText|XCUIElementTypeStaticText]
     def text(value)
       return ele_index static_text_class, value if value.is_a? Numeric
+
       ele_by_json_visible_contains static_text_class, value
     end
 
@@ -24,6 +25,7 @@ module Appium
     # @return [Array<UIAStaticText|XCUIElementTypeStaticText>]
     def texts(value = false)
       return tags static_text_class unless value
+
       eles_by_json_visible_contains static_text_class, value
     end
 

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

@@ -25,11 +25,12 @@ module Appium
       if value.is_a? Numeric
         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 = eles_by_json(_textfield_visible)[index]
         raise _no_such_element if result.nil?
-        return result
 
+        return result
       end
 
       ele_by_json _textfield_contains_string value
@@ -41,6 +42,7 @@ module Appium
     # @return [Array<TextField>]
     def textfields(value = false)
       return eles_by_json _textfield_visible unless value
+
       eles_by_json _textfield_contains_string value
     end
 
@@ -55,6 +57,7 @@ module Appium
     def last_textfield
       result = eles_by_json(_textfield_visible).last
       raise _no_such_element if result.nil?
+
       result
     end
 
@@ -82,7 +85,7 @@ module Appium
     # Appium
     def _textfield_exact_string(value)
       exact = { target: value, substring: false, insensitive: false }
-      exact_obj = { name:  exact, label: exact, value: exact }
+      exact_obj = { name: exact, label: exact, value: exact }
       _textfield_visible.merge(exact_obj)
     end
 

data/lib/appium_lib/ios/xcuitest/command/gestures.rb

@@ -36,7 +36,7 @@ module Appium
                    predicate_string: nil)
           return 'Set "up", "down", "left" or "right" for :direction' unless %w(up down left right).include?(direction)
 
-          args =  { direction: direction }
+          args = { direction: direction }
           args[:element] = element.ref if element
           args[:distance] = distance if distance
           args[:name] = name if name
@@ -68,7 +68,7 @@ module Appium
         #   double_tap x: 100, y: 100
         #   double_tap element: find_element(:accessibility_id, "some item")
         #   ```
-        def double_tap(x: nil, y: nil, element: nil)
+        def double_tap(x: nil, y: nil, element: nil) # rubocop:disable Naming/UncommunicativeMethodParamName
           return 'Set x, y or element' if (x.nil? || y.nil?) && element.nil?
 
           args = element.nil? ? { x: x, y: y } : { element: element.ref }
@@ -85,7 +85,7 @@ module Appium
         #   touch_and_hold x: 100, y: 100, duration: 2.0
         #   touch_and_hold element: find_element(:accessibility_id, "some item")
         #   ```
-        def touch_and_hold(x: nil, y: nil, element: nil, duration: 1.0)
+        def touch_and_hold(x: nil, y: nil, element: nil, duration: 1.0) # rubocop:disable Naming/UncommunicativeMethodParamName
           return 'Set x, y or element' if (x.nil? || y.nil?) && element.nil?
 
           args = element.nil? ? { x: x, y: y } : { element: element.ref }
@@ -113,7 +113,7 @@ module Appium
         #   tap x: 100, y: 100
         #   tap x: 100, y: 100, element: find_element(:accessibility_id, "some item")
         #   ```
-        def tap(x:, y:, element: nil)
+        def tap(x:, y:, element: nil) # rubocop:disable Naming/UncommunicativeMethodParamName
           args = { x: x, y: y }
           args[:element] = element.ref if element
           @driver.execute_script 'mobile: tap', args

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

@@ -17,6 +17,7 @@ module Appium
         def button(value)
           # return button at index.
           return ele_index button_class, value if value.is_a? Numeric
+
           raise_error_if_no_element buttons(value).first
         end
 
@@ -26,6 +27,7 @@ module Appium
         # @return [Array<UIAButton|XCUIElementTypeButton>]
         def buttons(value = false)
           return tags button_class unless value
+
           elements = find_eles_by_predicate_include(class_name: button_class, value: value)
           select_visible_elements elements
         end

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

@@ -37,6 +37,7 @@ module Appium
         def raise_error_if_no_element(element)
           error_message = 'An element could not be located on the page using the given search parameters.'
           raise(::Selenium::WebDriver::Error::NoSuchElementError, error_message) if element.nil?
+
           element
         end
 

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

@@ -16,6 +16,7 @@ module Appium
         # @return [UIAStaticText|XCUIElementTypeStaticText]
         def text(value)
           return ele_index static_text_class, value if value.is_a? Numeric
+
           raise_error_if_no_element texts(value).first
         end
 
@@ -25,6 +26,7 @@ module Appium
         # @return [Array<UIAStaticText|XCUIElementTypeStaticText>]
         def texts(value = false)
           return tags static_text_class unless value
+
           elements = find_eles_by_predicate_include(class_name: static_text_class, value: value)
           select_visible_elements elements
         end

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

@@ -24,9 +24,11 @@ module Appium
           if value.is_a? Numeric
             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 = _textfields_with_predicate[index]
             raise _no_such_element if result.nil?
+
             return result
 
           end
@@ -56,6 +58,7 @@ module Appium
         def last_textfield
           result = _textfields_with_predicate.last
           raise _no_such_element if result.nil?
+
           result
         end
 

data/lib/appium_lib/ios/xcuitest/helper.rb

@@ -26,6 +26,7 @@ module Appium
         def last_ele(class_name)
           visible_elements = tags class_name
           raise _no_such_element if visible_elements.empty?
+
           visible_elements.last
         end
 
@@ -59,8 +60,7 @@ module Appium
           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}"))
+                        %((#{c_names}) && (name contains[c] "#{value}" || label contains[c] "#{value}" || value contains[c] "#{value}")) # rubocop:disable Metrics/LineLength
                       else
                         c_names
                       end
@@ -82,8 +82,7 @@ module Appium
           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}"))
+                        %((#{c_names}) && (name ==[c] "#{value}" || label ==[c] "#{value}" || value ==[c] "#{value}"))
                       else
                         c_names
                       end

data/lib/appium_lib/version.rb

@@ -1,5 +1,5 @@
 module Appium
   # Version and Date are defined on the 'Appium' module, not 'Appium::Common'
-  VERSION = '9.15.1'.freeze unless defined? ::Appium::VERSION
-  DATE    = '2018-08-27'.freeze unless defined? ::Appium::DATE
+  VERSION = '9.15.2'.freeze unless defined? ::Appium::VERSION
+  DATE    = '2018-11-07'.freeze unless defined? ::Appium::DATE
 end

data/release_notes.md

@@ -1,3 +1,13 @@
+#### v9.15.1 2018-08-27
+
+- [14d1835](https://github.com/appium/ruby_lib/commit/14d1835fc2d8385af5b8b4489d6b6bb077e510e4) [Release 9 15 1 (#817)](https://github.com/appium/ruby_lib/issues/817)
+- [5f6c18e](https://github.com/appium/ruby_lib/commit/5f6c18ed9774fe027ee748e812ff91ee6d15a130) [Add extend core (#816)](https://github.com/appium/ruby_lib/issues/816)
+- [c6e5321](https://github.com/appium/ruby_lib/commit/c6e532186b7552212ba61ab2e351dba247a35312) [Tweak gemspec (#814)](https://github.com/appium/ruby_lib/issues/814)
+- [2864eec](https://github.com/appium/ruby_lib/commit/2864eec1d05fb69a461c37e4295f159aebe406ca) [add tests and tweak helpers which handle xml (#813)](https://github.com/appium/ruby_lib/issues/813)
+- [e04afe9](https://github.com/appium/ruby_lib/commit/e04afe92dbe6ea38773c234deb97cb4a7f8ffdd2) [Revert "Use ::REXML::Document by default in CountElements (#811)" (#812)](https://github.com/appium/ruby_lib/issues/811)
+- [1dcc665](https://github.com/appium/ruby_lib/commit/1dcc6650974a57369cc6b087b577cc1146bdaa1f) [Use ::REXML::Document by default in CountElements (#811)](https://github.com/appium/ruby_lib/issues/811)
+
+
 #### v9.15.0 2018-08-10
 
 - [b09ea84](https://github.com/appium/ruby_lib/commit/b09ea848cc595d8d3ef6494e0a26770521b9432c) [Release 9 15 0 (#810)](https://github.com/appium/ruby_lib/issues/810)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 9.15.1
+  version: 9.15.2
 platform: ruby
 authors:
 - code@bootstraponline.com
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib_core
@@ -25,20 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: tomlrb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -60,137 +46,137 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
-  name: posix-spawn
+  name: tomlrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
+        version: '1.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: hashdiff
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
-  name: spec
+  name: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.3.4
+        version: 0.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.3.4
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.60.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '5.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '5.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.3.4
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.11
 description: Ruby library for Appium.
 email:
 - code@bootstraponline.com