appium_capybara 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02be80b72ca89400b5e0e6d9e862f59014cb26b9
-  data.tar.gz: e3775f45ad63d1dd74587c8ce56885533670cb07
+  metadata.gz: 3dbc1e9b9516c5a874463a2b75b25651a7546693
+  data.tar.gz: a4d7af99679e7b2a25ad2402521a5605ae2a1411
 SHA512:
-  metadata.gz: 0f2309926fed8aaa41b9b75763a8a7f255f4d1321f9822ec04ff7f4bec2453f7751c7cf92db585b416f46de9cf1f69079dc3dbd0d8e328c823d925f154bace8e
-  data.tar.gz: 80952911404f2abb22e6fb4e260c14fc3bf886415555f6a7e600ded4bba45b9e7743476ae4b7939ca234255355e4c1e2bd9b536df0e6a4dd16cbfc46806bdf81
+  metadata.gz: 78b1e0418d028920ec8e0cb20f4a1bbb21cccef6f71dec7880ec58489b5e23d009828d650731320aaa2782c72ab6d7836ebff6dfb7ed9421e95440334c77d376
+  data.tar.gz: c01309caee13b4819da74e27ea09d00837263ef448784beff4e1a8a94efa79585cd4f7a205401fa61cb8b784485510ecf8614ca855b8596261bf3c2357117e52

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

@@ -3,34 +3,44 @@ module Appium::Capybara
   # or they're new and specific to appium.
   class Appium::Capybara::Driver < Capybara::Selenium::Driver
 
+    # new
+    #
+    # starts new driver
+    def appium_driver
+      # must use self to reference the 'browser' method
+      self.browser unless @appium_driver
+
+      @appium_driver
+    end
+
     # override
     #
     # Creates and starts a new appium driver.
     # To access the browser without creating one use @browser
     def browser
       unless @browser
-        @browser = Appium::Driver.new @options
-        # This will fail if your appium didn't close its last session
-        @browser.start_driver
+        @appium_driver = Appium::Driver.new @options
+        # browser is the standard selenium driver without any appium methods
+        @browser = @appium_driver.start_driver
       end
       @browser
     end
 
     # override
     def find_xpath(selector)
-      browser.find_elements(:xpath, selector).map { |node| Appium::Capybara::Node.new(self, node) }
+      appium_driver.find_elements(:xpath, selector).map { |node| Appium::Capybara::Node.new(self, node) }
     end
 
     # override
     def find_css(selector)
-      browser.find_elements(:css, selector).map { |node| Appium::Capybara::Node.new(self, node) }
+      appium_driver.find_elements(:css, selector).map { |node| Appium::Capybara::Node.new(self, node) }
     end
 
     # override
     def reset!
       # invoking the browser method after the browser has closed will cause it to relaunch
-      # use @browser to avoid the relaunch.
-      @browser.driver.reset if @browser
+      # use @appium_driver to avoid the relaunch.
+      @appium_driver.reset if @appium_driver
     end
 
     # new
@@ -40,48 +50,49 @@ module Appium::Capybara
 
     # new
     def dismiss_alert
-      browser.alert_dismiss
+      appium_driver.alert_dismiss
     end
 
     # new
     def accept_alert
-      browser.alert_accept
+      appium_driver.alert_accept
     end
 
     # new
     def scroll_up
-      browser.driver.execute_script("mobile: scroll", direction: "up")
+      browser.execute_script("mobile: scroll", direction: "up")
     end
 
     # new
     def scroll_down
-      browser.driver.execute_script("mobile: scroll", direction: "down")
+      browser.execute_script("mobile: scroll", direction: "down")
     end
 
     # new
     # Use :landscape or :portrait
     def rotate(opts)
-      browser.driver.rotate opts
+      browser.rotate opts
     end
 
     # override
     # Capybara always passes an options param but appium_lib can't do anything with it.
     def save_screenshot(path, options = {})
-      browser.screenshot path
+      appium_driver.screenshot path
     end
 
     # new
     def find_custom(finder, locator)
-      browser.find_elements(finder, locator).map { |node| Appium::Capybara::Node.new(self, node) }
+      appium_driver.find_elements(finder, locator).map { |node| Appium::Capybara::Node.new(self, node) }
     end
 
     # override
     def quit
-      @browser.driver_quit if @browser
+      @appium_driver.driver_quit if @browser || @appium_driver
     rescue Errno::ECONNREFUSED
       # Browser must have already gone
     ensure
       @browser = nil
+      @appium_driver = nil
     end
 
   end # Appium::Capybara::Driver < Capybara::Selenium::Driver

data/lib/appium_capybara/version.rb

@@ -1,6 +1,6 @@
 module Appium
   module Capybara
-    VERSION = '0.1.2' unless defined? ::Appium::Capybara::VERSION
-    DATE    = '2014-08-27' unless defined? ::Appium::Capybara::DATE
+    VERSION = '1.0.0' unless defined? ::Appium::Capybara::VERSION
+    DATE    = '2014-09-17' unless defined? ::Appium::Capybara::DATE
   end
 end

data/release_notes.md

@@ -1,3 +1,10 @@
+#### v1.0.0 2014-09-17
+
+- [63e9f31](https://github.com/appium/appium_capybara/commit/63e9f319906f2ce7cda0fde8a2fc00363c7d890b) Release 1.0.0
+- [fe8f229](https://github.com/appium/appium_capybara/commit/fe8f2291a312db93a46a841ec1f5bc8be5ad8f07) Merge pull request #14 from appium/selenium_driver
+- [9f31f17](https://github.com/appium/appium_capybara/commit/9f31f173aa58436bd1bbacaa77d28754dede31e0) Use selenium driver by default
+
+
 #### v0.1.2 2014-08-27
 
 - [8267412](https://github.com/appium/appium_capybara/commit/8267412930b7ea69e00fccd233254a04c4a6f885) Release 0.1.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appium_capybara
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - scott.bonebrake@gmail.com
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib