Update driver opts

Fix button test
Fix tests

Author: bootstraponline

android_tests/lib/android/specs/common/device.rb

@@ -32,8 +32,10 @@
     wait { current_activity.must_equal '.ApiDemos' }
   end
 
+  # appium's context support is broken on android
+
   t 'available_contexts' do
-    wait { available_contexts.must_equal ['NATIVE_APP'] }
+    wait_true { available_contexts.include? 'NATIVE_APP' }
   end
 
   t 'current_context' do
@@ -43,8 +45,11 @@
   t 'set_context' do
     wait { scroll_to('Views').click }
     wait { scroll_to('WebView').click }
-    wait { set_context 'WEBVIEW' }
-    wait { current_context.must_equal 'WEBVIEW_1' }
+
+    webview_context = available_contexts.detect { |e| e.start_with?('WEBVIEW') }
+
+    wait { set_context webview_context }
+    wait { current_context.must_equal webview_context }
 
     wait { set_context 'NATIVE_APP' }
     wait { current_context.must_equal 'NATIVE_APP' }
@@ -63,6 +68,9 @@
       switch_to_default_context
       current_context.must_equal 'NATIVE_APP'
     end
+
+    wait { set_context 'NATIVE_APP' }
+    wait { current_context.must_equal 'NATIVE_APP' }
   end
 
   t 'app_strings' do

android_tests/lib/android/specs/common/web_context.rb

@@ -1,13 +1,17 @@
 # Tests specifically for areas where the web_context differs in behaviour
+# rake android[common/web_context]
 describe 'the web context' do
 
   t 'get_android_inspect' do
-    scroll_to "Views"
+    scroll_to 'Views'
     last_text.click
     scroll_to 'WebView'
     last_text.click
-    set_context 'WEBVIEW'
-    current_context.must_equal 'WEBVIEW_1'
+
+    webview_context = available_contexts.detect { |e| e.start_with?('WEBVIEW') }
+
+    set_context webview_context
+    current_context.must_equal webview_context
     get_android_inspect.split("\n").length.must_be :>=, 3
   end
 end

lib/appium_lib/android/element/button.rb

@@ -86,9 +86,9 @@ def last_button
       # uiautomator index doesn't support last
       # and it's 0 indexed
       button_index       = tags(Button).length
-      button_index       -= 1 if button_index >= 0
+      button_index       -= 1 if button_index > 0
       image_button_index = tags(ImageButton).length
-      image_button_index -= 1 if image_button_index >= 0
+      image_button_index -= 1 if image_button_index > 0
 
       complex_find _button_visible_selectors button_index: button_index, image_button_index: image_button_index
     end

lib/appium_lib/driver.rb

@@ -210,7 +210,17 @@ class Driver
     # made available via the driver_attributes method
 
     # The amount to sleep in seconds before every webdriver http call.
-    attr_accessor :global_webdriver_http_sleep
+    attr_accessor :global_webdriver_http_sleep,
+                  :caps,
+                  :custom_url,
+                  :export_session,
+                  :default_wait,
+                  :last_waits,
+                  :sauce_username,
+                  :sauce_access_key,
+                  :appium_port,
+                  :appium_device,
+                  :appium_debug
 
     # Creates a new driver
     #
@@ -251,7 +261,7 @@ def initialize opts={}
       @sauce_username   = nil if !@sauce_username || (@sauce_username.is_a?(String) && @sauce_username.empty?)
       @sauce_access_key = appium_lib_opts.fetch :sauce_access_key, ENV['SAUCE_ACCESS_KEY']
       @sauce_access_key = nil if !@sauce_access_key || (@sauce_access_key.is_a?(String) && @sauce_access_key.empty?)
-      @port             = appium_lib_opts.fetch :port, 4723
+      @appium_port      = appium_lib_opts.fetch :port, 4723
 
       # Path to the .apk, .app or .app.zip.
       # The path can be local or remote for Sauce.
@@ -260,10 +270,10 @@ def initialize opts={}
       end
 
       # https://code.google.com/p/selenium/source/browse/spec-draft.md?repo=mobile
-      @device = @caps[:platformName]
-      @device = @device.is_a?(Symbol) ? @device : @device.downcase.strip.intern if @device
-      raise "platformName must be set. Not found in options: #{opts}" unless @device
-      raise 'platformName must be Android or iOS' unless [:android, :ios].include?(@device)
+      @appium_device = @caps[:platformName]
+      @appium_device = @appium_device.is_a?(Symbol) ? @appium_device : @appium_device.downcase.strip.intern if @appium_device
+      raise "platformName must be set. Not found in options: #{opts}" unless @appium_device
+      raise 'platformName must be Android or iOS' unless [:android, :ios].include?(@appium_device)
 
       # load common methods
       extend Appium::Common
@@ -280,12 +290,12 @@ def initialize opts={}
 
       # enable debug patch
       # !!'constant' == true
-      @debug = appium_lib_opts.fetch :debug, !!defined?(Pry)
+      @appium_debug = appium_lib_opts.fetch :debug, !!defined?(Pry)
 
-      if @debug
+      if @appium_debug
         ap opts unless opts.empty?
-        puts "Debug is: #{@debug}"
-        puts "Device is: #{@device}"
+        puts "Debug is: #{@appium_debug}"
+        puts "Device is: #{@appium_device}"
         patch_webdriver_bridge
       end
 
@@ -316,9 +326,9 @@ def driver_attributes
                      last_waits:       @last_waits,
                      sauce_username:   @sauce_username,
                      sauce_access_key: @sauce_access_key,
-                     port:             @port,
-                     device:           @device,
-                     debug:            @debug,
+                     port:             @appium_port,
+                     device:           @appium_device,
+                     debug:            @appium_debug,
       }
 
       # Return duplicates so attributes are immutable
@@ -329,7 +339,7 @@ def driver_attributes
     end
 
     def device_is_android?
-      @device == :android
+      @appium_device == :android
     end
 
     # Returns the server's version info
@@ -379,7 +389,7 @@ def server_url
       if !@sauce_username.nil? && !@sauce_access_key.nil?
         "http://#{@sauce_username}:#{@sauce_access_key}@ondemand.saucelabs.com:80/wd/hub"
       else
-        "http://127.0.0.1:#{@port}/wd/hub"
+        "http://127.0.0.1:#{@appium_port}/wd/hub"
       end
     end