refactor: divide dependencies (#649)

* separate dependencies for xcuitest
* arrange android modules

Author: KazuCocoa

android_tests/lib/android/specs/android/helper.rb

@@ -64,7 +64,7 @@ def id_value
     wait { find('accessibility').click }
     wait { find('accessibility node provider').click }
 
-    if !automation_name_is_uiautomator2?
+    if automation_name_is_uiautomator2?
       wait { text 'Accessibility/Accessibility Node Provider' }
     else
       # With string.xml

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

@@ -1,5 +1,13 @@
 # rake android[common/device_touchaction]
 describe 'common/device_touchaction' do
+  def before_first
+    wait { text('Accessibility') }
+  end
+
+  t 'before test' do
+    before_first
+  end
+
   t 'action_chain_press_release' do
     wait do
       e = text('Accessibility')

android_tests/lib/run.rb

@@ -11,7 +11,7 @@
 #   ruby run.rb ios view_album
 
 def start_driver(caps)
-  driver = Appium::Driver.new(caps)
+  driver = Appium::Driver.new(caps, true)
   # Tests expect methods defined on the minispec object
   Appium.promote_appium_methods ::Minitest::Spec
   driver.start_driver

ios_tests/lib/ios/specs/common/web_context.rb

@@ -1,5 +1,13 @@
 # Tests specifically for areas where the web_context differs in behaviour
+# rake ios[common/web_context]
 describe 'the web context' do
+  def before_first
+    screen.must_equal catalog
+  end
+
+  t 'before_first' do
+    before_first
+  end
   t 'get_android_inspect' do
     text('Web').click
 

lib/appium_lib/android/uiautomator2.rb

@@ -0,0 +1,10 @@
+require_relative 'uiautomator2/helper'
+require_relative 'uiautomator2/element'
+
+module Appium
+  module Ios
+    module Xcuitest
+      # parent
+    end # module Xcuitest
+  end # module Ios
+end # module Appium

lib/appium_lib/android/uiautomator2/element.rb

@@ -0,0 +1,10 @@
+require_relative 'element/button'
+
+module Appium
+  module Android
+    module Uiautomator2
+      module Element
+      end # module Element
+    end # module Uiautomator2
+  end # module Android
+end # module Appium

lib/appium_lib/capabilities.rb

@@ -0,0 +1,13 @@
+module Appium
+  class Driver
+    module Capabilities
+      # @param [Hash] opts_caps Capabilities for Appium server. All capability keys are converted to lowerCamelCase when
+      #                         this client sends capabilities to Appium server as JSON format.
+      # @return [::Selenium::WebDriver::Remote::W3C::Capabilities] Return instance of Appium::Driver::Capabilities
+      #                         inherited ::Selenium::WebDriver::Remote::W3C::Capabilities
+      def self.init_caps_for_appium(opts_caps = {})
+        ::Selenium::WebDriver::Remote::W3C::Capabilities.new(opts_caps)
+      end
+    end
+  end
+end

lib/appium_lib/driver.rb

@@ -3,6 +3,9 @@
 require 'selenium-webdriver'
 require 'nokogiri'
 
+# base
+require_relative 'capabilities'
+
 # common
 require_relative 'common/helper'
 require_relative 'common/wait'
@@ -25,17 +28,7 @@
 require_relative 'ios/element/text'
 require_relative 'ios/mobile_methods'
 
-# ios - xcuitest
-require_relative 'ios/xcuitest/search_context'
-require_relative 'ios/xcuitest/element'
-require_relative 'ios/xcuitest/gestures'
-require_relative 'ios/xcuitest/command/pasteboard'
-require_relative 'ios/xcuitest/device'
-require_relative 'ios/xcuitest/helper'
-require_relative 'ios/xcuitest/element/text'
-require_relative 'ios/xcuitest/element/textfield'
-require_relative 'ios/xcuitest/element/generic'
-require_relative 'ios/xcuitest/element/button'
+require_relative 'ios/xcuitest'
 
 # android
 require_relative 'android/helper'
@@ -51,7 +44,7 @@
 require_relative 'android/device'
 
 # android - uiautomator2
-require_relative 'android/uiautomator2/helper.rb'
+require_relative 'android/uiautomator2'
 
 # device methods
 require_relative 'device/device'
@@ -269,18 +262,6 @@ def self.selenium_webdriver_version_more?(version)
     Gem.loaded_specs['selenium-webdriver'].version >= Gem::Version.new(version)
   end
 
-  class Driver
-    module Capabilities
-      # @param [Hash] opts_caps Capabilities for Appium server. All capability keys are converted to lowerCamelCase when
-      #                         this client sends capabilities to Appium server as JSON format.
-      # @return [::Selenium::WebDriver::Remote::W3C::Capabilities] Return instance of Appium::Driver::Capabilities
-      #                         inherited ::Selenium::WebDriver::Remote::W3C::Capabilities
-      def self.init_caps_for_appium(opts_caps = {})
-        ::Selenium::WebDriver::Remote::W3C::Capabilities.new(opts_caps)
-      end
-    end
-  end
-
   class Driver
     # attr readers are promoted to global scope. To avoid clobbering, they're
     # made available via the driver_attributes method
@@ -388,11 +369,15 @@ class Driver
     # @param opts [Object] A hash containing various options.
     # @param global_driver [Bool] A bool require global driver before initialize.
     # @return [Driver]
-    def initialize(opts = {}, global_driver = true)
-      if global_driver
+    def initialize(opts = {}, global_driver = nil)
+      if global_driver.nil?
         warn '[DEPRECATION] Appium::Driver.new(opts) will not generate global driver by default.' \
                  'If you would like to generate the global driver dy default, ' \
                  'please initialise driver with Appium::Driver.new(opts, true)'
+        global_driver = true # if global_driver is nil, then global_driver must be default value.
+      end
+
+      if global_driver
         $driver.driver_quit if $driver
       end
       raise 'opts must be a hash' unless opts.is_a? Hash
@@ -427,12 +412,13 @@ def initialize(opts = {}, global_driver = true)
         extend Appium::Android
         extend Appium::Android::Device
         if automation_name_is_uiautomator2?
+          extend Appium::Android::Uiautomator2
           extend Appium::Android::Uiautomator2::Helper
+          extend Appium::Android::Uiautomator2::Element
         end
       else
         extend Appium::Ios
         if automation_name_is_xcuitest?
-          # Override touch actions and patch_webdriver_element
           extend Appium::Ios::Xcuitest
           extend Appium::Ios::Xcuitest::SearchContext
           extend Appium::Ios::Xcuitest::Command

lib/appium_lib/ios/xcuitest.rb

@@ -0,0 +1,15 @@
+require_relative 'xcuitest/search_context'
+require_relative 'xcuitest/element'
+require_relative 'xcuitest/gestures'
+require_relative 'xcuitest/command'
+require_relative 'xcuitest/device'
+require_relative 'xcuitest/helper'
+require_relative 'xcuitest/element'
+
+module Appium
+  module Ios
+    module Xcuitest
+      # parent
+    end # module Xcuitest
+  end # module Ios
+end # module Appium

lib/appium_lib/ios/xcuitest/command.rb

@@ -0,0 +1,8 @@
+require_relative 'command/pasteboard'
+
+module Appium
+  module Ios
+    module Command
+    end
+  end
+end

lib/appium_lib/ios/xcuitest/element.rb

@@ -1,24 +1,31 @@
+require_relative 'element/text'
+require_relative 'element/textfield'
+require_relative 'element/generic'
+require_relative 'element/button'
+
 module Appium
   module Ios
     module Xcuitest
-      # @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
-          # Enable access to iOS accessibility label
-          # accessibility identifier is supported as 'name'
-          def label
-            attribute('label')
-          end
+      module Element
+        # @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
+            # Enable access to iOS accessibility label
+            # accessibility identifier is supported as 'name'
+            def label
+              attribute('label')
+            end
 
-          # Cross platform way of entering text into a textfield
-          def type(text)
-            send_keys text
-          end # def type
-        end # Selenium::WebDriver::Element.class_eval
-      end # def patch_webdriver_element
+            # Cross platform way of entering text into a textfield
+            def type(text)
+              send_keys text
+            end # def type
+          end # Selenium::WebDriver::Element.class_eval
+        end # def patch_webdriver_element
+      end # module Element
     end # module Xcuitest
   end # module Ios
 end # module Appium