appium_capybara 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e580b26f96de413ba5f884a3415e64ee394e737804b60a7c0474db7c8df399e
-  data.tar.gz: b6d98a242aab223809ace04acba7f53628c0047dd9fe04717994e8480b5ef4cd
+  metadata.gz: 27c67dea5af823589166ddf8531c76abdb3d54ea20e28a6ba857e95db76640cc
+  data.tar.gz: 3e54b99ef761aaa42dcb7eb0e9afc0bf69b73c3b25bd5fcc267b57e9910925b1
 SHA512:
-  metadata.gz: 0b28ad6664372da0ee2019f076270cdea5cf0a0e7f92a78547d38ad0a1a823ede280313b1e39fcb32320475b50b4023e244761457a77d1e7953720f896866c45
-  data.tar.gz: b2c3c92b1e1ae17ba9f692b2c61d0b4bde9f8b35a00b6387c01b8ce4ba4911c6baf6cfadb1e89265a3f8c84b935039d94d51cee06d305a51534e40e5bf5fc1bc
+  metadata.gz: beee7f76ad0f3710aaf60d750a8575ffd91a04017002edce32a118add99c2451cc90f8a2dfceaaf937c3cc75db42e32509f1eaf1a373715b86665d246b9a4f60
+  data.tar.gz: d3f4b30ada64dda1e9f2be176eac0e6b1f698129fc79fbe70a676c4f38aa98eba58fe7639f0080aa64d25c980e866b94bbe332ac976876929b9abebb9cc9e620

data/README.md

@@ -1,5 +1,7 @@
 # appium_capybara  [![Gem Version](https://badge.fury.io/rb/appium_capybara.svg)](http://badge.fury.io/rb/appium_capybara)
 
+[Documentation](https://www.rubydoc.info/gems/appium_capybara/)
+
 Gem enabling appium support in capybara
 
 Please use `v1.4.1` for Capybara 2.x users. `v1.5.0` requires Capybara 3.x.
@@ -14,7 +16,7 @@ desired_caps_ios = {
   platform:        "Mac",
   deviceName:      "iPhone Simulator",
   platformName:    "iOS",
-  platformVersion: "7.1",
+  platformVersion: "12.4",
   app:             "full/path/to/app.zip"
 }
 
@@ -22,11 +24,11 @@ url = "http://localhost:4723/wd/hub" # or a sauce labs url
 
 Capybara.register_driver(:appium) do |app|
     appium_lib_options = {
-      server_url:           url
+      server_url: url
     }
     all_options = {
-      appium_lib:  appium_lib_options,
-      caps:        desired_caps_ios
+      appium_lib: appium_lib_options,
+      caps: desired_caps_ios
     }
     Appium::Capybara::Driver.new app, all_options
 end
@@ -46,6 +48,21 @@ Capybara.server_host = '0.0.0.0' # Listen to all interfaces
 Capybara.server_port = 56844     # Open port TCP 56844, change at your convenience
 ```
 
+## Call methods
+
+appium_capybara provides both Capybara methods and appium_lib methods.
+
+```ruby
+capy_driver = Capybara.current_session.driver
+
+# Calls methods defined in Appium::Capybara::Driver and Capybara::Selenium::Driver
+capy_driver.find_custom :name, '<enter text>'
+
+# Calls methods defined in only appium_lib (Appium::Driver)
+capy_driver.appium_driver.find_element(:name, 'TextFields').click
+capy_driver.appium_driver.hide_keyboard
+```
+
 ## Publishing to rubygems
 
 Make sure to run `thor bump` or manually modify version.rb before publishing. RubyGems will not allow the same

data/appium_capybara.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'appium_lib', '>= 9.15.0'
-  s.add_runtime_dependency 'capybara', '~> 3.19'
+  s.add_runtime_dependency 'capybara', '~> 3.27'
 
-  s.add_development_dependency 'appium_thor', '~> 0.0', '>= 0.0.7'
+  s.add_development_dependency 'appium_thor', '~> 1.1.6'
   s.add_development_dependency 'pry'
 
   s.files = s.remove_zip_files(`git ls-files`.split("\n"))

data/example/spec/ios_example_spec.rb

@@ -10,10 +10,15 @@ describe 'UICatalog smoke test' do
     capy_driver = Capybara.current_session.driver
 
     # Call appium driver's methods
-    capy_driver.appium_driver.find_element(:name, 'TextFields').click
-    expect(capy_driver.find_custom(:name, '<enter text>').size).to be 3
+    Capybara.current_session.driver.appium_driver.find_element(:name, 'Buttons').click
+    Capybara.current_session.driver.appium_driver.wait do
+      expect(capy_driver.find_custom(:class_name, 'XCUIElementTypeButton').size).to be 6
+    end
 
     # Get Appium::Capybara::Node elements
-    capy_driver.find_custom(:name, '<enter text>')[0].send_keys 'abc'
+    expect(capy_driver.find_custom(:name, 'X Button')[0].name).to eq('X Button')
+
+    e = Capybara.current_session.find(:xpath, '//XCUIElementTypeNavigationBar')
+    expect(e.find(:class, 'XCUIElementTypeButton').text).to eq('UICatalog')
   end
 end

data/lib/appium_capybara/ext/selector_query_ext.rb

@@ -2,21 +2,39 @@ class Capybara::Queries::SelectorQuery < Capybara::Queries::BaseQuery
 
   # @api private
   def resolve_for(node, exact = nil)
+    applied_filters.clear
+    @resolved_node = node
+    @resolved_count += 1
     node.synchronize do
-      children = if selector.format == :css
-                   node.find_css(css)
-                 elsif selector.format == :xpath
-                   node.find_xpath(xpath(exact))
-                 else
-                   node.find_custom(selector.format, @expression)
-                 end.map do |child|
-                   if node.is_a?(Capybara::Node::Base)
-                     Capybara::Node::Element.new(node.session, child, node, self)
-                   else
-                     Capybara::Node::Simple.new(child)
-                   end
-                 end
+      children = find_nodes_by_selector_format(node, exact).map(&method(:to_element))
       Capybara::Result.new(children, self)
     end
   end
+
+  private
+
+  # https://github.com/teamcapybara/capybara/blob/a7ebe1216f8d65f2e96c170437a732777353a81d/lib/capybara/queries/selector_query.rb#L227
+  def find_nodes_by_selector_format(node, exact)
+    hints = {}
+    hints[:uses_visibility] = true unless visible == :all
+    hints[:texts] = text_fragments unless selector_format == :xpath
+    hints[:styles] = options[:style] if use_default_style_filter?
+    hints[:position] = true if use_spatial_filter?
+
+    if selector_format == :css
+      if node.method(:find_css).arity != 1
+        node.find_css(css, **hints)
+      else
+        node.find_css(css)
+      end
+    elsif selector_format == :xpath
+      if node.method(:find_xpath).arity != 1
+        node.find_xpath(xpath(exact), **hints)
+      else
+        node.find_xpath(xpath(exact))
+      end
+    else
+      node.find_custom(selector_format, @expression)
+    end
+  end
 end

data/lib/appium_capybara/version.rb

@@ -1,6 +1,6 @@
 module Appium
   module Capybara
-    VERSION = '1.9.0'.freeze unless defined? ::Appium::Capybara::VERSION
-    DATE    = '2019-07-11'.freeze unless defined? ::Appium::Capybara::DATE
+    VERSION = '1.10.0'.freeze unless defined? ::Appium::Capybara::VERSION
+    DATE    = '2019-11-23'.freeze unless defined? ::Appium::Capybara::DATE
   end
 end

data/release_notes.md

@@ -1,3 +1,10 @@
+#### v1.10.0 2019-11-23
+
+- [2a0a739](https://github.com/appium/appium_capybara/commit/2a0a739685b571ab8d54655f924ed078c45d3bbe) Release 1.10.0
+- [7b3baf1](https://github.com/appium/appium_capybara/commit/7b3baf11af0775935812bcfb5a83d18f1d2c7cb6) for capybara 3.27+ (#55)
+- [541fe41](https://github.com/appium/appium_capybara/commit/541fe419e0cb96cc8ccb9426c72c4774c4f44a09) chore: Update readme and the ios test app (#54)
+
+
 #### v1.9.0 2019-07-11
 
 - [8c42306](https://github.com/appium/appium_capybara/commit/8c423067b4347ab64521f298737e76d1164f9929) Release 1.9.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appium_capybara
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - scott.bonebrake@gmail.com
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib
@@ -32,34 +32,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.19'
+        version: '3.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.19'
+        version: '3.27'
 - !ruby/object:Gem::Dependency
   name: appium_thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 1.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Enables appium support in Capybara