appium_capybara 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 846f78572050e712ef82ddef04af327ed4597b4b
-  data.tar.gz: d1f06c86e52c34181b78cda44e73bf87cb7c506e
+  metadata.gz: b136b7e11058078bcc10d341aee533ef68b7786a
+  data.tar.gz: 7a10391405bd81b020e9b52cca823667ae2311f6
 SHA512:
-  metadata.gz: d01de1de84dc2daccafee922af40054f439042b6714d7411b6893da3e6895949445df8e8d5860399018cfcf95a46d180017e24bcc4dd2b5e042e2f9b5b454444
-  data.tar.gz: 3792e906a0fcd4ccbc3015a2a896b3d7b1b6d8f675adcd3ecb7d75389a0e0eb31a23401360cf921462160aef495c6a1e0a8c518158fd1109818e089d36a6ed4c
+  metadata.gz: 38af33ec5c2ec31410719e253cc015247ac2c3b25dd2196724d672d7ef1fa1dd1f2341918e87cdcefff8644965fb26b42b19ed456cf09c32734d740dc8359e6c
+  data.tar.gz: aa40f5c964700ef3f12b2cc005e356a94e243635d2e3eb7eaad3b8b09ceb6035d56addd05d8231368077848a11227fd76f81df9610589a5cb3afed7f62165a57

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

@@ -48,13 +48,15 @@ module Appium::Capybara
       !! @browser
     end
 
-    # new
-    def dismiss_alert
+    # override
+    # type and options are passed but can be ignored.
+    def dismiss_modal(type, options={}, &blk)
       appium_driver.alert_dismiss
     end
 
-    # new
-    def accept_alert
+    # override
+    # type and options are passed but can be ignored.
+    def accept_modal(type, options={}, &blk)
       appium_driver.alert_accept
     end
 

data/lib/appium_capybara/ext/session_ext.rb

@@ -1,8 +1,10 @@
 module Capybara
   class Session
     def reset!
-      # Next line is a work around for issue https://github.com/jnicklas/capybara/issues/1237
-      if @touched && driver.browser_initialized?
+      # 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

data/lib/appium_capybara/version.rb

@@ -1,6 +1,6 @@
 module Appium
   module Capybara
-    VERSION = '1.1.0' unless defined? ::Appium::Capybara::VERSION
-    DATE    = '2014-10-02' unless defined? ::Appium::Capybara::DATE
+    VERSION = '1.2.0' unless defined? ::Appium::Capybara::VERSION
+    DATE    = '2014-11-24' unless defined? ::Appium::Capybara::DATE
   end
 end

data/release_notes.md

@@ -1,3 +1,12 @@
+#### v1.2.0 2014-11-24
+
+- [7c8f2c2](https://github.com/appium/appium_capybara/commit/7c8f2c238059b715488b482415f58f7021f05012) Release 1.2.0
+- [6dc2f67](https://github.com/appium/appium_capybara/commit/6dc2f6767d7781b9db8fd84fb7a7e2b130548faa) Merge pull request #18 from maudineormsby/fix/modal_accept
+- [842ae0e](https://github.com/appium/appium_capybara/commit/842ae0e9d6aeba4440c0e995663133da1f450bc4) Rename accept/dismiss modal methods.
+- [ef8acaa](https://github.com/appium/appium_capybara/commit/ef8acaa50f70c2edc88d5b7f107769c0151b6aed) Merge pull request #15 from randoum/master
+- [9c765e6](https://github.com/appium/appium_capybara/commit/9c765e611fb917f40d4f116aa3414cf603e4c878) Allow to use different drivers in the same test suite
+
+
 #### v1.1.0 2014-10-02
 
 - [88f6b44](https://github.com/appium/appium_capybara/commit/88f6b441e7e3da381a4d48b852bf5b00b04f6a7e) Release 1.1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appium_capybara
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - scott.bonebrake@gmail.com
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib