appium_capybara 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcaa3b3ff61f1ef5be33c9669abbe8cb2b033904
-  data.tar.gz: 64b3658115760f7df8f50c3569e23faafa61620f
+  metadata.gz: d66d327bb69cb59b65203b343dd8d51cc7af1af9
+  data.tar.gz: cb4d19b3eba30e99bbff1d2efc70dd35bd5e987d
 SHA512:
-  metadata.gz: 9a04e754a3d64d62d4b04937a82992cb922939e37807f0761d679d7573491dd2053668a6752f1a3667895ff0b794ca87ab071d14b96e36e58f0f7cc1cb809e24
-  data.tar.gz: fd6853ffe43d951e0405888349820b5d71b31d556b673b3ce6e4b543d653c1fca6fd52ab064b4c3fae7b100daa55d2fdcd129f84f74c0e649fd866af29b8ff11
+  metadata.gz: ece5c4ff572a5dd92b137c351847b76440b106f6e83b3c5e5fbd1add8cafc98aee16d161373d51c78a004985859fa98750082aa500edcd003627db346937e8cf
+  data.tar.gz: 5630655cb736c741fee94f4408a50ebe92acc9dfbccedd5f05f91ef9d87d8125ee2bb3ffc8bf2b3311b7e7d3d7c40a838d1a4640ce4096d3d898c9ecb86916c4

data/appium_capybara.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'appium_lib', '>= 4.1.0'
-  s.add_runtime_dependency 'capybara', '~> 2.4', '>= 2.4.1'
+  s.add_runtime_dependency 'capybara', '~> 2.7'
 
   s.add_development_dependency 'appium_thor', '~> 0.0', '>= 0.0.7'
 

data/example/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'appium_capybara', '~> 0.0.2'
+gem 'appium_capybara', :path => ".."
 gem 'rspec', '~> 3.0.0'
 gem 'site_prism', '~> 2.6'

data/example/appium.txt

@@ -1,8 +1,8 @@
 [caps]
 platformName = "ios"
-deviceName ="iPhone Simulator"
+deviceName ="iPhone 6"
 app = "./UICatalog.app.zip"
-platformVersion = "7.1"
+platformVersion = "8.1"
 
 [appium_lib]
 sauce_username = ""

data/example/spec/capybara_init.rb

@@ -1,5 +1,6 @@
-require 'appium_capybara'
 require 'rspec'
+require 'capybara/rspec'
+require 'appium_capybara'
 require 'site_prism'
 
 Capybara.register_driver(:appium) do |app|

data/lib/appium_capybara.rb

@@ -4,9 +4,8 @@ require_relative 'appium_capybara/driver/appium/driver'
 require_relative 'appium_capybara/driver/appium/node'
 
 require_relative 'appium_capybara/ext/base_ext'
-require_relative 'appium_capybara/ext/query_ext'
+require_relative 'appium_capybara/ext/selector_query_ext'
 require_relative 'appium_capybara/ext/selector_ext'
-require_relative 'appium_capybara/ext/session_ext'
 
 module Appium::Capybara
-end
+end

data/lib/appium_capybara/driver/appium/driver.rb

@@ -22,6 +22,14 @@ module Appium::Capybara
         @appium_driver = Appium::Driver.new @options
         # browser is the standard selenium driver without any appium methods
         @browser = @appium_driver.start_driver
+
+        main = Process.pid
+        at_exit do
+          # Store the exit status of the test run since it goes away after calling the at_exit proc...
+          @exit_status = $!.status if $!.is_a?(SystemExit)
+          quit if Process.pid == main
+          exit @exit_status if @exit_status # Force exit with stored status
+        end
       end
       @browser
     end
@@ -79,7 +87,7 @@ module Appium::Capybara
     # override
     # Capybara always passes an options param but appium_lib can't do anything with it.
     def save_screenshot(path, options = {})
-      appium_driver.screenshot path
+      appium_driver.screenshot path if @appium_driver
     end
 
     # new

data/lib/appium_capybara/ext/selector_ext.rb

@@ -1,20 +1,10 @@
 module Capybara
   class Selector
+
     def custom(f, &block)
-      @format = f
-      @custom = block if block
-      @custom
+      @format, @expression = f, block if block
     end
 
-    def call(locator)
-      if @format == :css
-        @css.call(locator)
-      elsif @format == :xpath
-        @xpath.call(locator)
-      else
-        @custom.call(locator)
-      end
-    end
   end
 end
 
@@ -29,4 +19,4 @@ Capybara.add_selector(:name) do
 end
 Capybara.add_selector(:accessibility_id) do
   custom(:accessibility_id) { |locator| locator }
-end
+end

data/lib/appium_capybara/ext/{query_ext.rb → selector_query_ext.rb}

@@ -1,14 +1,15 @@
-class Capybara::Query < Capybara::Queries::BaseQuery
+class Capybara::Queries::SelectorQuery < Capybara::Queries::BaseQuery
+
   # @api private
   def resolve_for(node, exact = nil)
     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, locator)
-                 end.map do |child|
+        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
@@ -18,4 +19,5 @@ class Capybara::Query < Capybara::Queries::BaseQuery
       Capybara::Result.new(children, self)
     end
   end
+
 end

data/lib/appium_capybara/version.rb

@@ -1,6 +1,6 @@
 module Appium
   module Capybara
-    VERSION = '1.2.1' unless defined? ::Appium::Capybara::VERSION
-    DATE    = '2014-12-29' unless defined? ::Appium::Capybara::DATE
+    VERSION = '1.3.0' unless defined? ::Appium::Capybara::VERSION
+    DATE    = '2016-04-22' unless defined? ::Appium::Capybara::DATE
   end
 end

data/release_notes.md

@@ -1,6 +1,20 @@
+#### v1.3.0 2016-04-22
+
+- [9a2517c](https://github.com/appium/appium_capybara/commit/9a2517c7797ae1719a4ef91b0db939b11e9af2e5) Release 1.3.0
+- [30496b0](https://github.com/appium/appium_capybara/commit/30496b00cdca96a98c87a7987b03f396d42f9584) Release 1.3.0
+- [e77c23b](https://github.com/appium/appium_capybara/commit/e77c23b5806e3de20a813edb93a0c386e14c2c68) Capybara 2.7 support
+- [6e43a9e](https://github.com/appium/appium_capybara/commit/6e43a9e77e8e7186b45a9a7c9650ab4a5af750e8) End file appium_capybara.rb with new line
+- [a1d776d](https://github.com/appium/appium_capybara/commit/a1d776d1b89aff5a0c340f58ec2df062989b70e0) Fix for wrong attribute used in resolve_for
+- [0aa208b](https://github.com/appium/appium_capybara/commit/0aa208be11e78d82f3fec4011daec13c71d588fa) Update extensions of Capybara classes to support version 2.7
+- [834d0b1](https://github.com/appium/appium_capybara/commit/834d0b1a15b2f447a8ba10ef2f5d93f62a6f29e6) Merge pull request #25 from appium/fix_query
+- [a68a6f3](https://github.com/appium/appium_capybara/commit/a68a6f3f0247c056c2475982ab18aba57783e34c) Query extension now uses expression instead of locator
+- [7695c14](https://github.com/appium/appium_capybara/commit/7695c141aef4635923317980916ee8b263b47acd) Merge pull request #24 from vgrigoruk/master
+- [580a476](https://github.com/appium/appium_capybara/commit/580a4769fc1ce2d631cc2b59598f007e4a3f63d3) make sure app is running when making a screenshot. Auto-quit driver when test session ends
+- [697a000](https://github.com/appium/appium_capybara/commit/697a0004930d1d74e19b6b6603b58300845aaa7c) Update example for iOS 8
+
+
 #### v1.2.1 2014-12-29
 
-- [57ad02c](https://github.com/appium/appium_capybara/commit/57ad02c3aac2c34f5710149bff6ea92d5309d421) Release 1.2.1
 - [1ab8564](https://github.com/appium/appium_capybara/commit/1ab856478e7495347dbbd5d2737c9cc55106b3bf) Release 1.2.1
 - [97de881](https://github.com/appium/appium_capybara/commit/97de8812b54d84d2a4681672c436f06609080334) Loosen restriction on ruby_lib version
 - [691164f](https://github.com/appium/appium_capybara/commit/691164f033e6b952ca1fe2ce131a40c76c03e825) Update contributing.md

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appium_capybara
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - scott.bonebrake@gmail.com
@@ -10,60 +10,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.7'
 - !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
   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
 description: Enables appium support in Capybara.
@@ -75,7 +69,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE-2.0.txt
 - README.md
@@ -92,11 +86,9 @@ files:
 - lib/appium_capybara.rb
 - lib/appium_capybara/driver/appium/driver.rb
 - lib/appium_capybara/driver/appium/node.rb
-- lib/appium_capybara/driver/base_ext.rb
 - lib/appium_capybara/ext/base_ext.rb
-- lib/appium_capybara/ext/query_ext.rb
 - lib/appium_capybara/ext/selector_ext.rb
-- lib/appium_capybara/ext/session_ext.rb
+- lib/appium_capybara/ext/selector_query_ext.rb
 - lib/appium_capybara/version.rb
 - release_notes.md
 homepage: https://github.com/appium/appium_capybara
@@ -109,12 +101,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/lib/appium_capybara/driver/base_ext.rb

@@ -1,5 +0,0 @@
-class Capybara::Driver::Base
-  def browser_initialized?
-    true
-  end
-end

data/lib/appium_capybara/ext/session_ext.rb

@@ -1,16 +0,0 @@
-module Capybara
-  class Session
-    def reset!
-      # Work around for issue https://github.com/jnicklas/capybara/issues/1237
-      browser_initialized = driver.respond_to?(:browser_initialized?) ? driver.browser_initialized? : true
-
-      if @touched && browser_initialized
-        driver.reset!
-        # Ugly hack to not run this assertion for Appium
-        assert_no_selector(:xpath, "/html/body/*") unless driver.instance_of? Appium::Capybara::Driver
-        @touched = false
-      end
-      raise_server_error!
-    end
-  end
-end