refactor: define bridge in core (#676)

* define bridge in core

* define patch module

* remove require uiautomation

Author: KazuCocoa

lib/appium_lib/core/android.rb

@@ -1,3 +1,4 @@
 # loaded in common/driver.rb
 require_relative 'android/search_context'
 require_relative 'android/device'
+require_relative 'android/uiautomator1/bridge'

lib/appium_lib/core/android/uiautomator1/bridge.rb

@@ -0,0 +1,16 @@
+require_relative '../../android'
+
+module Appium
+  module Core
+    module Android
+      module Uiautomator1
+        module Bridge
+          def self.for(target)
+            target.extend Appium::Android::Device
+            ::Appium::Core::Android::SearchContext.extend
+          end
+        end
+      end
+    end
+  end
+end

lib/appium_lib/core/android/uiautomator2/bridge.rb

@@ -0,0 +1,16 @@
+require_relative '../../android_uiautomator2'
+
+module Appium
+  module Core
+    module Android
+      module Uiautomator2
+        module Bridge
+          def self.for(target)
+            target.extend Appium::Android::Device
+            ::Appium::Core::Android::SearchContext.extend
+          end
+        end
+      end
+    end
+  end
+end

lib/appium_lib/core/android_uiautomator2.rb

@@ -1 +1,4 @@
 # loaded in common/driver.rb
+require_relative 'android/search_context'
+require_relative 'android/device'
+require_relative 'android/uiautomator2/bridge'

lib/appium_lib/core/core.rb

@@ -6,6 +6,12 @@
 
 require_relative 'element/window'
 
+require_relative 'android'
+require_relative 'android_uiautomator2'
+
+require_relative 'ios'
+require_relative 'ios_xcuitest'
+
 module Appium
   # convert all keys (including nested) to symbols
   #

lib/appium_lib/core/driver.rb

@@ -65,27 +65,16 @@ def extend_for(device:, automation_name:, target:)
         when :android
           case automation_name
           when :uiautomator2
-            require_relative 'android'
-            require_relative 'android_uiautomator2'
+            ::Appium::Core::Android::Uiautomator2::Bridge.for(self)
           else # default and UiAutomator
-            require_relative 'android'
+            ::Appium::Core::Android::Uiautomator1::Bridge.for(self)
           end
-          Core::Android::SearchContext.extend
-          target.extend Appium::Android::Device
         when :ios
           case automation_name
           when :xcuitest
-            require_relative 'ios'
-            require_relative 'ios_xcuitest'
-            Core::Ios::SearchContext.extend
-            Core::Ios::Xcuitest::SearchContext.extend
-            target.extend Appium::Ios::Device
-            target.extend Appium::Ios::Xcuitest::Device
+            ::Appium::Core::Ios::Xcuitest::Bridge.for(self)
           else # default and UIAutomation
-            require_relative 'ios'
-            Core::Ios::SearchContext.extend
-            target.extend Appium::Ios::Device
-            patch_webdriver_element
+            ::Appium::Core::Ios::Uiautomation::Bridge.for(self)
           end
         when :mac
           # no Mac specific extentions

lib/appium_lib/core/ios.rb

@@ -1,4 +1,6 @@
 # loaded in common/driver.rb
 require_relative 'ios/search_context'
 require_relative 'ios/device'
-require_relative 'ios/patch'
+
+require_relative 'ios/uiautomation/patch'
+require_relative 'ios/uiautomation/bridge'

lib/appium_lib/core/ios/patch.rb

@@ -0,0 +1,17 @@
+require_relative '../../ios'
+
+module Appium
+  module Core
+    module Ios
+      module Uiautomation
+        module Bridge
+          def self.for(target)
+            Core::Ios::SearchContext.extend
+            target.extend Appium::Ios::Device
+            patch_webdriver_element
+          end
+        end
+      end
+    end
+  end
+end

lib/appium_lib/core/ios/uiautomation/bridge.rb

@@ -0,0 +1,20 @@
+module Appium
+  module Core
+    module Ios
+      module Uiautomation
+        # @private
+        # class_eval inside a method because class Selenium::WebDriver::Element
+        # will trigger as soon as the file is required. in contrast a method
+        # will trigger only when invoked.
+        def patch_webdriver_element
+          Selenium::WebDriver::Element.class_eval do
+            # Cross platform way of entering text into a textfield
+            def type(text, driver = $driver)
+              driver.execute_script %(au.getElement('#{ref}').setValue('#{text}');)
+            end # def type
+          end # Selenium::WebDriver::Element.class_eval
+        end # def patch_webdriver_element
+      end # module Uiautomation
+    end # module Ios
+  end # module Core
+end # module Appium

lib/appium_lib/core/ios/uiautomation/patch.rb

@@ -0,0 +1,18 @@
+require_relative '../../ios_xcuitest'
+
+module Appium
+  module Core
+    module Ios
+      module Xcuitest
+        module Bridge
+          def self.for(target)
+            Core::Ios::SearchContext.extend
+            Core::Ios::Xcuitest::SearchContext.extend
+            target.extend Appium::Ios::Device
+            target.extend Appium::Ios::Xcuitest::Device
+          end
+        end
+      end
+    end
+  end
+end

lib/appium_lib/core/ios/xcuitest/bridge.rb

@@ -1,3 +1,7 @@
 # loaded in common/driver.rb
+require_relative 'ios/search_context'
+require_relative 'ios/device'
+
 require_relative 'ios/xcuitest/search_context'
 require_relative 'ios/xcuitest/device'
+require_relative 'ios/xcuitest/bridge'