appium_lib 9.1.2 → 9.1.3

data/docs/ios_xcuitest.md

@@ -6,7 +6,7 @@
     - [Migrating your iOS tests from UIAutomation](https://github.com/appium/appium/blob/v1.6.2/docs/en/advanced-concepts/migrating-to-xcuitest.md)
 
 ## find elements
-- supported elements by find_element is:
+- supported elements by find_element are:
     - [appium-xcuitest-driver](https://github.com/appium/appium-xcuitest-driver/blob/master/lib/commands/find.js#L17)
     - [WebDriverAgent](https://github.com/facebook/WebDriverAgent/blob/8346199212bffceab24192e81bc0118d65132466/WebDriverAgentLib/Commands/FBFindElementCommands.m#L111)
 - Mapping
@@ -15,7 +15,7 @@
 ### with except for XPath
 #### examples
 - [button_class](https://github.com/appium/ruby_lib/blob/master/lib/appium_lib/ios/element/button.rb#L8), [static_text_class](https://github.com/appium/ruby_lib/blob/master/lib/appium_lib/ios/element/text.rb#L8), [text_field_class](https://github.com/appium/ruby_lib/blob/master/lib/appium_lib/ios/element/textfield.rb#L10) and [secure_text_field_class](https://github.com/appium/ruby_lib/blob/master/lib/appium_lib/ios/element/textfield.rb#L15) provide class name.
-    - If `automationName` is `Appium`, then they provide `UIAxxxx`
+    - If `automationName` is `Appium` or `nil`, then they provide `UIAxxxx`
     - If `automationName` is `XCUITest`, then they provide `XCUIElementTypexxx`
 
 ```ruby
@@ -30,10 +30,16 @@ find_element(:class, button_class) # Return a element of XCUIElementTypeButton f
 find_element(:accessibility_id, element) # Return a element which has accessibilityIdentifier, `element`.
 ```
 
+- `button/s(value)`, `button_exact/buttons_exact`, `text/s(value)`, `text_exact/texts_exact` 
+```ruby
+buttons(value) # Return button elements include `value` as its name attributes.
+```
+
+
 ### with XPath
 - It is better to avoid XPath strategy.
     - https://github.com/appium/appium/blob/v1.6.2/docs/en/advanced-concepts/migrating-to-xcuitest.md#xpath-locator-strategy
-        - > Try not to use XPath locators unless there is absolutely no other alternatives. In general, xpath locators might be times slower, than other types of locators like accessibility id, class name and predicate (up to 100 times slower in some special cases). They are so slow, because xpath location is not natively supported by Apple's XCTest framework.
+        - > Try not to use XPath locators unless there are absolutely no other alternatives. In general, XPath locators might be times slower, than other types of locators like accessibility id, class name and predicate (up to 100 times slower in some special cases). They are so slow because XPath location is not natively supported by Apple's XCTest framework.
     - Improved performance a bit
         - https://github.com/appium/appium/issues/6842
         - https://github.com/facebook/WebDriverAgent/issues/306
@@ -41,13 +47,12 @@ find_element(:accessibility_id, element) # Return a element which has accessibil
     - https://github.com/facebook/WebDriverAgent/blob/2158a8d0f305549532f1338fe1e4628cfbd53cd9/WebDriverAgentLib/Categories/XCElementSnapshot%2BFBHelpers.m#L57
 
 #### examples
-- `button/s(value)`, `textfield/s(value)`, `text/s(value)` uses XPath in their method. So, these methods are slower than other find_element directly.
+- `textfield/s(value)`, `find/s`, `find_exact/finds_exact` uses XPath in their method. So, these methods are slower than other find_element directly.
 
 ```ruby
-button(value) # Return a XCUIElementTypeButton element which has `value` text.
 textfield(value) # Return a XCUIElementTypeSecureTextField or XCUIElementTypeTextField element which has `value` text.
-text(value) # Return a XCUIElementTypeStaticText element which has `value` text.
+finds_exact(value) # Return any elements include `value` as its name attributes.
 ```
 
 ## Other actions
-Basically, other actions such as `type` is compatible with `automationName = Appium`. 
+Basically, other actions such as `type` are compatible with `automationName = Appium`.

data/ios_tests/lib/ios/specs/driver.rb

@@ -137,6 +137,11 @@ describe 'driver' do
         sauce_access_key.must_be_nil
       end
     end
+
+    t 'default timeout for http client' do
+      http_client.open_timeout.must_equal 999_999
+      http_client.read_timeout.must_equal 999_999
+    end
   end
 
   describe 'Appium::Driver' do
@@ -165,6 +170,22 @@ describe 'driver' do
       client_version.must_equal expected
     end
 
+    t 'set_immediate_value' do
+      go_to_textfields
+
+      message = 'hello'
+
+      element = textfield(1)
+      element.click
+      element.clear
+
+      set_immediate_value(element, message)
+      element.text.must_equal message
+
+      set_wait 10
+      leave_textfields
+    end
+
     t 'restart' do
       restart
       text 'buttons'

data/ios_tests/lib/ios/specs/ios/element/button.rb

@@ -29,7 +29,7 @@ describe 'ios/element/button' do
 
   t 'buttons' do
     exp = ['Back', 'Back', 'Gray', 'Right pointing arrow']
-    exp.concat ['Custom Text', 'More info', 'More info', 'More info', 'Add contact'] if UI::Inventory.xcuitest?
+    exp.concat ['Add contact'] if UI::Inventory.xcuitest?
 
     target_buttons = buttons('a')
     target_buttons.map(&:name).must_equal exp

data/ios_tests/lib/ios/specs/ios/element/textfield.rb

@@ -124,22 +124,6 @@ describe 'ios/element/textfield' do
     textfields_exact('does not exist').length.must_equal 0
   end
 
-  t 'set_immediate_value' do
-    go_to_textfields
-
-    message = 'hello'
-
-    element = textfield(1)
-    element.click
-    element.clear
-
-    set_immediate_value(element, message)
-    element.text.must_equal message
-
-    set_wait 10
-    leave_textfields
-  end
-
   t 'after_last' do
     after_last
   end

data/ios_tests/lib/ios/specs/ios/patch.rb

@@ -28,6 +28,7 @@ describe 'ios/patch' do
 
     ele = first_textfield
 
+    ele.clear
     ele.type 'ok'
     ele.text.must_equal 'ok'
   end

data/lib/appium_lib/common/version.rb

@@ -1,5 +1,5 @@
 module Appium
   # Version and Date are defined on the 'Appium' module, not 'Appium::Common'
-  VERSION = '9.1.2'.freeze unless defined? ::Appium::VERSION
-  DATE    = '2016-12-25'.freeze unless defined? ::Appium::DATE
+  VERSION = '9.1.3'.freeze unless defined? ::Appium::VERSION
+  DATE    = '2017-01-04'.freeze unless defined? ::Appium::DATE
 end

data/lib/appium_lib/device/device.rb

@@ -166,7 +166,7 @@ module Appium
             app_package = opts[:app_package]
             raise 'app_package is required' unless app_package
             app_activity = opts[:app_activity]
-            raise 'app_activity is required' unless opts[:app_activity]
+            raise 'app_activity is required' unless app_activity
             app_wait_package  = opts.fetch(:app_wait_package, '')
             app_wait_activity = opts.fetch(:app_wait_activity, '')
 
@@ -313,11 +313,7 @@ module Appium
 
       # @private
       def add_endpoint_method(method)
-        if block_given?
-          create_bridge_command method, &Proc.new
-        else
-          create_bridge_command method
-        end
+        block_given? ? create_bridge_command(method, &Proc.new) : create_bridge_command(method)
 
         delegate_driver_method method
         delegate_from_appium_driver method
@@ -345,11 +341,7 @@ module Appium
       # @private
       def create_bridge_command(method)
         Selenium::WebDriver::Remote::Bridge.class_eval do
-          if block_given?
-            class_eval(&Proc.new)
-          else
-            define_method(method) { execute method }
-          end
+          block_given? ? class_eval(&Proc.new) : define_method(method) { execute method }
         end
       end
 
@@ -365,11 +357,7 @@ module Appium
         Selenium::WebDriver::SearchContext.class_eval do
           def find_element_with_appium(*args)
             how, what = extract_args(args)
-
-            finders = ::Selenium::WebDriver::SearchContext::FINDERS.merge ::Appium::Driver::SearchContext::FINDERS
-            by = finders[how.to_sym]
-            raise ArgumentError, "cannot find element by #{how.inspect}" unless by
-
+            by = _set_by_from_finders(how)
             begin
               bridge.find_element_by by, what.to_s, ref
             rescue Selenium::WebDriver::Error::TimeOutError
@@ -379,17 +367,20 @@ module Appium
 
           def find_elements_with_appium(*args)
             how, what = extract_args(args)
-
-            finders = ::Selenium::WebDriver::SearchContext::FINDERS.merge ::Appium::Driver::SearchContext::FINDERS
-            by = finders[how.to_sym]
-            raise ArgumentError, "cannot find element by #{how.inspect}" unless by
-
+            by = _set_by_from_finders(how)
             begin
               bridge.find_elements_by by, what.to_s, ref
             rescue Selenium::WebDriver::Error::TimeOutError
               raise Selenium::WebDriver::Error::NoSuchElementError
             end
           end
+
+          def _set_by_from_finders(how)
+            finders = ::Selenium::WebDriver::SearchContext::FINDERS.merge ::Appium::Driver::SearchContext::FINDERS
+            by = finders[how.to_sym]
+            raise ArgumentError, "cannot find element by #{how.inspect}" unless by
+            by
+          end
         end
       end
 

data/lib/appium_lib/device/touch_actions.rb

@@ -39,6 +39,10 @@ module Appium
     end
 
     # Press down for a specific duration.
+    # Alternatively, you can use `press(...).wait(...).release()` instead of `long_press` if duration doesn't work well.
+    # https://github.com/appium/ruby_lib/issues/231#issuecomment-269895512
+    # e.g. Appium::TouchAction.new.press(x: 280, y: 530).wait(2000).release.perform
+    #
     # @option element [WebDriver::Element] the element to press.
     # @option x [integer] x co-ordinate to press on.
     # @option y [integer] y co-ordinate to press on.

data/lib/appium_lib/driver.rb

@@ -302,6 +302,9 @@ module Appium
     # Returns the driver
     # @return [Driver] the driver
     attr_reader :driver
+    # Return http client called in start_driver()
+    # @return [Selenium::WebDriver::Remote::Http::Default] the http client
+    attr_reader :http_client
 
     # Creates a new driver
     #
@@ -547,13 +550,12 @@ module Appium
     #
     # @return [Selenium::WebDriver] the new global driver
     def start_driver
-      @client ||= Selenium::WebDriver::Remote::Http::Default.new
-      @client.timeout = 999_999
+      @http_client ||= Selenium::WebDriver::Remote::Http::Default.new(open_timeout: 999_999, read_timeout: 999_999)
 
       begin
         driver_quit
         @driver =  Selenium::WebDriver.for(:remote,
-                                           http_client: @client,
+                                           http_client: @http_client,
                                            desired_capabilities: @caps,
                                            url: server_url,
                                            listener: @listener)

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

@@ -18,7 +18,7 @@ module Appium
       return ele_index button_class, value if value.is_a? Numeric
 
       if automation_name_is_xcuitest?
-        find_ele_by_attr_include button_class, '*', value
+        _raise_error_if_no_element buttons(value).first
       else
         ele_by_json_visible_contains button_class, value
       end
@@ -32,7 +32,8 @@ module Appium
       return tags button_class unless value
 
       if automation_name_is_xcuitest?
-        find_eles_by_attr_include button_class, '*', value
+        elements = tags button_class
+        _elements_include elements, value
       else
         eles_by_json_visible_contains button_class, value
       end
@@ -57,7 +58,7 @@ module Appium
     # @return [UIAButton|XCUIElementTypeButton]
     def button_exact(value)
       if automation_name_is_xcuitest?
-        find_ele_by_attr button_class, '*', value
+        _raise_error_if_no_element buttons_exact(value).first
       else
         ele_by_json_visible_exact button_class, value
       end
@@ -68,7 +69,8 @@ module Appium
     # @return [Array<UIAButton|XCUIElementTypeButton>]
     def buttons_exact(value)
       if automation_name_is_xcuitest?
-        find_eles_by_attr button_class, '*', value
+        elements = tags button_class
+        _elements_exact elements, value
       else
         eles_by_json_visible_exact button_class, value
       end

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

@@ -43,5 +43,28 @@ module Appium
         eles_by_json_visible_exact '*', value
       end
     end
+
+    private
+
+    def _raise_error_if_no_element(element)
+      raise ::Selenium::WebDriver::Error::NoSuchElementError if element.nil?
+      element
+    end
+
+    def _elements_include(elements, value)
+      return [] if elements.empty?
+      elements.select do |element|
+        name = element.name
+        name.nil? ? false : name.downcase.include?(value.downcase)
+      end
+    end
+
+    def _elements_exact(elements, value)
+      return [] if elements.empty?
+      elements.select do |element|
+        name = element.name
+        name.nil? ? false : name.casecmp(value).zero?
+      end
+    end
   end # module Ios
 end # module Appium

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

@@ -17,7 +17,7 @@ module Appium
       return ele_index static_text_class, value if value.is_a? Numeric
 
       if automation_name_is_xcuitest?
-        find_ele_by_attr_include static_text_class, '*', value
+        _raise_error_if_no_element texts(value).first
       else
         ele_by_json_visible_contains static_text_class, value
       end
@@ -31,7 +31,8 @@ module Appium
       return tags static_text_class unless value
 
       if automation_name_is_xcuitest?
-        find_eles_by_attr_include static_text_class, '*', value
+        elements = tags static_text_class
+        _elements_include elements, value
       else
         eles_by_json_visible_contains static_text_class, value
       end
@@ -54,7 +55,7 @@ module Appium
     # @return [UIAStaticText|XCUIElementTypeStaticText]
     def text_exact(value)
       if automation_name_is_xcuitest?
-        find_ele_by_attr static_text_class, '*', value
+        _raise_error_if_no_element texts_exact(value).first
       else
         ele_by_json_visible_exact static_text_class, value
       end
@@ -65,7 +66,8 @@ module Appium
     # @return [Array<UIAStaticText|XCUIElementTypeStaticText>]
     def texts_exact(value)
       if automation_name_is_xcuitest?
-        find_eles_by_attr static_text_class, '*', value
+        elements = tags static_text_class
+        _elements_exact elements, value
       else
         eles_by_json_visible_exact static_text_class, value
       end

data/release_notes.md

@@ -1,3 +1,16 @@
+#### v9.1.3 2017-01-04
+
+- [ba2fbdc](https://github.com/appium/ruby_lib/commit/ba2fbdcb206609259134fc09eac7940c21cc2c13) Release 9.1.3
+- [f0c15c5](https://github.com/appium/ruby_lib/commit/f0c15c5b0211b40a8412583c5180a19dc4b56047) update documentations in xcuitest (#444)
+- [67114d1](https://github.com/appium/ruby_lib/commit/67114d1c16f4289c9aa4e7bb02fcc05a08cc3575) Improve performance for button/s and text/s (#442)
+- [2d1f30e](https://github.com/appium/ruby_lib/commit/2d1f30e9b4d89dc51bb546d535c0bd3f14687394) simplify a bit and move tests to suitable file (#441)
+- [1efed4c](https://github.com/appium/ruby_lib/commit/1efed4cbf45b889ca9e64f91346e786a89ba3c42) add documentation for alternative long_press method (#440)
+- [71e629f](https://github.com/appium/ruby_lib/commit/71e629f34065b6a6e39e9bc18bcf4eb0576be0cb) update small changes (#439)
+- [cec023c](https://github.com/appium/ruby_lib/commit/cec023cc9388afe5283c7637622f369a9b891b1e) Use open timeout and read timeout and require selenium-webdriver3.0.4+ (#437)
+- [ffa78a6](https://github.com/appium/ruby_lib/commit/ffa78a64b1dd68fa24c80779eff0a9c2ab685c19) Release 9 1 2 (#434)
+- [22401b0](https://github.com/appium/ruby_lib/commit/22401b065f2317e82d37b5188ad9c18c701b0a41) Release 9.1.2
+
+
 #### v9.1.2 2016-12-25
 
 - [22401b0](https://github.com/appium/ruby_lib/commit/22401b065f2317e82d37b5188ad9c18c701b0a41) Release 9.1.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 9.1.2
+  version: 9.1.3
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -19,7 +19,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement