tweak include (#105)

* tweak include

* update tests

* tweak

Author: KazuCocoa

lib/appium_lib_core.rb

@@ -2,7 +2,6 @@
 
 require_relative 'appium_lib_core/version'
 require_relative 'appium_lib_core/common'
-require_relative 'appium_lib_core/patch'
 require_relative 'appium_lib_core/driver'
 
 require_relative 'appium_lib_core/device'
@@ -14,6 +13,9 @@
 require_relative 'appium_lib_core/ios'
 require_relative 'appium_lib_core/ios_xcuitest'
 
+# Call patch after requiring other files
+require_relative 'appium_lib_core/patch'
+
 module Appium
   # convert all keys (including nested) to symbols
   #

test/unit/android/device/mjsonwp/definition_test.rb

@@ -80,6 +80,10 @@ def test_with_arg_definitions
                                                 :get_clipboard,
                                                 :set_clipboard])
           end
+
+          def test_search_context_in_element_class_for_android
+            assert_equal '-android uiautomator', ::Selenium::WebDriver::Element::FINDERS[:uiautomator]
+          end
         end
       end # module MJSONWP
     end # module Device

test/unit/android/device/w3c/commands_test.rb

@@ -801,6 +801,22 @@ def test_ime_deactivate
 
             assert_requested(:post, "#{SESSION}/ime/deactivate", times: 1)
           end
+
+          def test_search_element_child_element
+            stub_request(:post, "#{SESSION}/element")
+              .with(body: { using: 'accessibility id', value: 'example' }.to_json)
+              .to_return(headers: HEADER, status: 200, body: { value: { ELEMENT: 'element_id_parent' },
+                                                               sessionId: SESSION, status: 0 }.to_json)
+            stub_request(:post, "#{SESSION}/element/element_id_parent/element")
+              .with(body: { using: 'accessibility id', value: 'example2' }.to_json)
+              .to_return(headers: HEADER, status: 200, body: { value: { ELEMENT: 'element_id_children' },
+                                                               sessionId: SESSION, status: 0 }.to_json)
+
+            @driver.find_element(:accessibility_id, 'example').find_element(:accessibility_id, 'example2')
+
+            assert_requested(:post, "#{SESSION}/element", times: 1)
+            assert_requested(:post, "#{SESSION}/element/element_id_parent/element", times: 1)
+          end
         end # class CommandsTest
       end # module W3C
     end # module Device

test/unit/android/device/w3c/definition_test.rb

@@ -79,6 +79,10 @@ def test_with_arg_definitions
                                                 :get_clipboard,
                                                 :set_clipboard])
           end
+
+          def test_search_context_in_element_class_for_android
+            assert_equal '-android uiautomator', ::Selenium::WebDriver::Element::FINDERS[:uiautomator]
+          end
         end # class DefinitionTest
       end # module W3C
     end # module Device

test/unit/driver_test.rb

@@ -82,24 +82,17 @@ def test_default_timeout_for_http_client
     end
 
     def test_search_context_in_element_class
-      expected = {
-        class: 'class name',
-        class_name: 'class name',
-        css: 'css selector',
-        id: 'id',
-        link: 'link text',
-        link_text: 'link text',
-        name: 'name',
-        partial_link_text: 'partial link text',
-        tag_name: 'tag name',
-        xpath: 'xpath',
-        accessibility_id: 'accessibility id',
-        uiautomation: '-ios uiautomation',
-        predicate: '-ios predicate string',
-        class_chain: '-ios class chain',
-        uiautomator: '-android uiautomator'
-      }
-      assert_equal expected, ::Selenium::WebDriver::Element::FINDERS
+      assert_equal 'class name', ::Selenium::WebDriver::Element::FINDERS[:class]
+      assert_equal 'class name', ::Selenium::WebDriver::Element::FINDERS[:class_name]
+      assert_equal 'css selector', ::Selenium::WebDriver::Element::FINDERS[:css]
+      assert_equal 'id', ::Selenium::WebDriver::Element::FINDERS[:id]
+      assert_equal 'link text', ::Selenium::WebDriver::Element::FINDERS[:link]
+      assert_equal 'link text', ::Selenium::WebDriver::Element::FINDERS[:link_text]
+      assert_equal 'name', ::Selenium::WebDriver::Element::FINDERS[:name]
+      assert_equal 'partial link text', ::Selenium::WebDriver::Element::FINDERS[:partial_link_text]
+      assert_equal 'tag name', ::Selenium::WebDriver::Element::FINDERS[:tag_name]
+      assert_equal 'xpath', ::Selenium::WebDriver::Element::FINDERS[:xpath]
+      assert_equal 'accessibility id', ::Selenium::WebDriver::Element::FINDERS[:accessibility_id]
     end
   end
 end

test/unit/ios/device/mjsonwp/definition_test.rb

@@ -67,6 +67,12 @@ def test_with_arg_definitions
                                                 :touch_id,
                                                 :toggle_touch_id_enrollment])
           end
+
+          def test_search_context_in_element_class_ios
+            assert_equal '-ios uiautomation', ::Selenium::WebDriver::Element::FINDERS[:uiautomation]
+            assert_equal '-ios predicate string', ::Selenium::WebDriver::Element::FINDERS[:predicate]
+            assert_equal '-ios class chain', ::Selenium::WebDriver::Element::FINDERS[:class_chain]
+          end
         end # class DefinitionTest
       end # module MJSONWP
     end # module Device

test/unit/ios/device/w3c/definition_test.rb

@@ -70,6 +70,12 @@ def test_with_arg_definitions
                                                 :touch_id,
                                                 :toggle_touch_id_enrollment])
           end
+
+          def test_search_context_in_element_class_ios
+            assert_equal '-ios uiautomation', ::Selenium::WebDriver::Element::FINDERS[:uiautomation]
+            assert_equal '-ios predicate string', ::Selenium::WebDriver::Element::FINDERS[:predicate]
+            assert_equal '-ios class chain', ::Selenium::WebDriver::Element::FINDERS[:class_chain]
+          end
         end # class DefinitionTest
       end # module W3C
     end # module Device