appium_capybara 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d93a4df9821c40f409585aeb01a90db2055930dc90955d6b74400d2a48340e4
-  data.tar.gz: 0b3195d112180448d2b4faf9410e977a2787ae219da060b51e56165a8f276a8d
+  metadata.gz: 838caf9468d6e6513df67cc554df7109b7efeb4154960f0355af05613cf6cd25
+  data.tar.gz: 800173f5e38349d0264a2fd978f9bfb201d3af333c495f816fd165c5af371358
 SHA512:
-  metadata.gz: c0e12784521e3946b77d5571721afe2a9f9ee60006dae699189adb4742670ecb89842e6c8e5414ddc3148e7608bf03dc487245df0f4819aee1ccbcbd96d17899
-  data.tar.gz: 9b2422091de5acb1f726b5fcbb4bf24477bb61d8eaf0b0bfe32c6e2bc39bdf5aa4aa7317e16d234c153216dfa13c912b14516bd00fb5c1b9d31062aed51b59fa
+  metadata.gz: 5617b2c7eb1b8745aae6ee8bc0752952c3609a7d8fca3c6469bc395f1779ecf16ef8cc2039ecb9c5bba63ca7393b1e4cbaf85f15e8686ac1fe073e8ade342c1c
+  data.tar.gz: a9df43925ed328b4a8a1fc1d123c177dedacb1ecbf331627e8bdbc96c0fcc0e14cb18ce1684b8469baf1d010b70d96d04daf00fab09ef9ee3c38743c776fc41f

data/example/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gem 'appium_capybara', path: '..'
 gem 'rspec', '~> 3.0.0'
-gem 'site_prism', '~> 2.6'
+gem 'site_prism', '~> 3.0'
 gem 'pry'

data/example/appium.txt

@@ -1,6 +1,6 @@
 [caps]
 platformName = "ios"
-platformVersion = "10.3"
+platformVersion = "12.2"
 deviceName ="iPhone Simulator"
 automationName = 'XCUITest'
 app = "./UICatalog.app.zip"

data/example/spec/capybara_init.rb

@@ -6,10 +6,10 @@ require 'site_prism'
 
 caps = Appium.load_appium_txt file: File.expand_path('./', 'appium.txt'), verbose: true
 
-url = "http://localhost:4723/wd/hub"
+url = 'http://localhost:4723/wd/hub'.freeze
 
 Capybara.register_driver(:appium) do |app|
-  all_options = caps.merge({appium_lib: {server_url: url}, global_driver: false})
+  all_options = caps.merge(appium_lib: { server_url: url }, global_driver: false)
   puts all_options.inspect
 
   Appium::Capybara::Driver.new app, all_options

data/example/spec/home_page.rb

@@ -1,5 +1,5 @@
 module Pages
-  class Home < SitePrism::Page
+  class Home < ::SitePrism::Page
     # UIANavigationBar
     #   name: UICatalog
     elements :navigation_bar, :accessibility_id, 'UICatalog'

data/example/spec/spec_helper.rb

@@ -4,11 +4,9 @@ require_relative 'capybara_init'
 require_relative 'home_page'
 
 RSpec.configure do |config|
-  config.after(:each) do |result|
-    Capybara.current_session.driver.quit
-  end
+  config.after(:each) { Capybara.current_session.driver.quit }
 
   config.after do |result|
     Capybara.current_session.driver.save_screenshot 'error.png' if result.exception
   end
-end
+end

data/lib/appium_capybara.rb

@@ -1,5 +1,5 @@
-require "appium_lib"
-require "capybara"
+require 'appium_lib'
+require 'capybara'
 require_relative 'appium_capybara/driver/appium/driver'
 require_relative 'appium_capybara/driver/appium/node'
 

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

@@ -8,7 +8,7 @@ module Appium::Capybara
     # starts new driver
     def appium_driver
       # must use self to reference the 'browser' method
-      self.browser unless @appium_driver
+      browser unless @appium_driver
 
       @appium_driver
     end
@@ -18,18 +18,18 @@ module Appium::Capybara
     # Creates and starts a new appium driver.
     # To access the browser without creating one use @browser
     def browser
-      unless @browser
-        @appium_driver = Appium::Driver.new @options, false
-        # 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
+      return @browser if @browser
+
+      @appium_driver = Appium::Driver.new @options, false
+      # 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 = $ERROR_INFO.status if $ERROR_INFO.is_a?(SystemExit)
+        quit if Process.pid == main
+        exit @exit_status if @exit_status # Force exit with stored status
       end
       @browser
     end
@@ -53,29 +53,29 @@ module Appium::Capybara
 
     # @deprecated This method is being removed
     def browser_initialized?
-      !! @browser
+      !!@browser
     end
 
     # override
     # type and options are passed but can be ignored.
-    def dismiss_modal(type, options={}, &blk)
+    def dismiss_modal(type, options = {}, &blk)
       appium_driver.alert_dismiss
     end
 
     # override
     # type and options are passed but can be ignored.
-    def accept_modal(type, options={}, &blk)
+    def accept_modal(type, options = {}, &blk)
       appium_driver.alert_accept
     end
 
     # new
     def scroll_up
-      browser.execute_script("mobile: scroll", direction: "up")
+      browser.execute_script('mobile: scroll', direction: 'up')
     end
 
     # new
     def scroll_down
-      browser.execute_script("mobile: scroll", direction: "down")
+      browser.execute_script('mobile: scroll', direction: 'down')
     end
 
     # new

data/lib/appium_capybara/ext/base_ext.rb

@@ -2,4 +2,4 @@ class Capybara::Node::Base
   def find_custom(finder, locator)
     base.find_custom(finder, locator)
   end
-end
+end

data/lib/appium_capybara/ext/selector_ext.rb

@@ -1,10 +1,8 @@
 module Capybara
   class Selector::Definition
-
     def custom(f, &block)
-      @format, @expression = f, block if block
+      @expressions[f] = block if block
     end
-
   end
 end
 

data/lib/appium_capybara/ext/selector_query_ext.rb

@@ -4,20 +4,19 @@ class Capybara::Queries::SelectorQuery < Capybara::Queries::BaseQuery
   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, @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
+                   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
       Capybara::Result.new(children, self)
     end
   end
-
 end

data/lib/appium_capybara/version.rb

@@ -1,6 +1,6 @@
 module Appium
   module Capybara
-    VERSION = '1.8.0' unless defined? ::Appium::Capybara::VERSION
-    DATE    = '2019-05-18' unless defined? ::Appium::Capybara::DATE
+    VERSION = '1.8.1'.freeze unless defined? ::Appium::Capybara::VERSION
+    DATE    = '2019-06-23'.freeze unless defined? ::Appium::Capybara::DATE
   end
-end
+end

data/release_notes.md

@@ -1,3 +1,10 @@
+#### v1.8.1 2019-06-23
+
+- [805b248](https://github.com/appium/appium_capybara/commit/805b24839f414c936e408739a871be9df3620fbf) Release 1.8.1
+- [d684bc1](https://github.com/appium/appium_capybara/commit/d684bc1ffe5849d31c4895ba5a47be9d4ca50f08) tweak syntax (#49)
+- [3b10096](https://github.com/appium/appium_capybara/commit/3b100967193128fa04a4ef5cab0e49c38d44f8e8) fix custom format definition (#48)
+
+
 #### v1.8.0 2019-05-18
 
 - [3d83516](https://github.com/appium/appium_capybara/commit/3d835164e59b03469a6250a7688c48d290dccfd2) Release 1.8.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appium_capybara
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - scott.bonebrake@gmail.com
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-18 00:00:00.000000000 Z
+date: 2019-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib