Fix complex find

Author: bootstraponline

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

@@ -61,9 +61,16 @@
     strs.has_key?("activity_save_restore").must_equal true
   end
 
+  def must_return_element element
+    element.class.must_equal Selenium::WebDriver::Element
+  end
+
   t 'complex_find' do
-    act = complex_find [[[3, 'Accessibility'], [14, true]]]
-    act.class.must_equal Selenium::WebDriver::Element
+    find('Views').click
+    must_return_element complex_find(mode: 'scroll', selectors: [[[3, 'tabs']]])
+    must_return_element complex_find(mode: 'all', selectors: [[[3, 'i']]]).first
+    must_return_element complex_find(selectors: [[[3, 'tabs']]])
+    back
   end
 
   t 'key_event' do

lib/appium_lib/android/element/generic.rb

@@ -27,7 +27,7 @@ def scroll_to text
           # descriptionContains(text)
           [[7, text]]
 
-      complex_find 'scroll', args
+      complex_find mode: 'scroll', selectors: args
     end
 
     # Scroll to an element with the exact target text or description.
@@ -40,7 +40,7 @@ def scroll_to_exact text
           # description(text)
           [[5, text]]
 
-      complex_find 'scroll', args
+      complex_find mode: 'scroll', selectors: args
     end
   end # module Android
 end # module Appium

lib/appium_lib/device/device.rb

@@ -140,18 +140,15 @@ def key_event(key, metastate=nil)
         end
 
         add_endpoint_method(:complex_find, 'session/:session_id/appium/app/complex_find') do
-          def complex_find(mode, selectors=nil)
-            if selectors.nil?
-              selectors = mod.dup
-              mod       = false
-            end
-
-            selector_array = mod ? [mod] : []
-            selector_array.push selectors
+          def complex_find(opts)
+            mode = opts.fetch :mode, false
+            selectors = opts.fetch :selectors, false
+            raise 'Complex find must have selectors' unless selectors
+            selectors.insert(0, mode) if mode
 
             ids = execute :complex_find, {}, selectors
-            if mod && ids.length > 1
 
+            if mode == 'all' && ids.length > 1
               return ids.map { |id| Selenium::WebDriver::Element.new self, element_id_from(id) }
             else
               return Selenium::WebDriver::Element.new self, element_id_from(ids)