appium_lib_core 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92864805498c13b3e41df7d6b5ef4fc5965fee0d
-  data.tar.gz: a911e896fc8fcb342eb8af36e43ee2ba341e2439
+  metadata.gz: 44fc100d5d5e9bd6eca0c7710db01c24e6f80c2e
+  data.tar.gz: cdba41bed57c4d4f509e39460a273f697f1d19d8
 SHA512:
-  metadata.gz: bbc2bceb05631b3b7ee85e5ddccf50bb763e9223cf9a83f2c3653a69250f8da45c20f7ae308f8779c11653a99d58f41fa4fc1ec1b1f611856397a78cbb818455
-  data.tar.gz: 01a3830df3812f6b0a71f9493ccd18a22dfd0447858978d1f464fa285df75c12e5055d31341c0f2a38f9573dcea2effef409bc2fbe7298f08fa1a58ade694cc7
+  metadata.gz: 6ffd78624d5ffec1e6835dbf3f17c6664addc16e6d16ff4b1d58befaa96f0b1b6b0b6a5625cc7be98946858a69c2126e7b264668de458da94df48a03b71219fe
+  data.tar.gz: 83e202a1d228ae437a1ae20daecbf94b1a460994e3f6a829374872558a61cdaa1fe0221517945ad331168607f0e71e25aa1ce31863efba945f0037a8dcfb1d24

data/.travis.yml

@@ -4,7 +4,12 @@ language: ruby
 rvm:
   - 2.2.5
   - 2.3.3
-  - 2.4.0
+  - 2.4.3
+  - 2.5.0
+
+before_install:
+  - gem update --system
+  - gem update bundler
 
 script:
   - bundle exec rake rubocop

data/CHANGELOG.md

@@ -5,7 +5,21 @@ All notable changes to this project will be documented in this file.
 ### Enhancements
 
 ### Bug fixes
-- Fix some w3c methods to work with Appium part 2 [#38](https://github.com/appium/ruby_lib_core/pull/38)
+
+### Deprecations
+
+## [1.2.4] - 2018-01-03
+### Enhancements
+- Refactor `create_session` in `Appium::Core::Base::Bridge`
+- Be able to communicate with Appium by `W3C` based webdriver protocol if the Appium supports W3C protocol.
+    - If `forceMjsonwp: true` exists in the capability, the client try to communicate `mjsonwp` based protocol
+        - By default, it depends on the response from the server
+    - Read API doc for `Appium::Core::Base::Bridge#create_session` to read the example of `forceMjsonwp`
+- Backport some commands from OSS module to W3C module
+    - Read `lib/appium_lib_core/common/base/w3c_bridge.rb` for more details
+- Can get logs like `driver.logs.available_types` and `driver.logs.get`
+
+### Bug fixes
 
 ### Deprecations
 

data/appium_lib_core.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'json', '>= 1.8'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'yard', '~> 0.9.11'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'

data/lib/appium_lib_core/android/device.rb

@@ -53,6 +53,7 @@ module Appium
       # @example
       #
       #   @driver.set_network_connection 1
+      #   @driver.network_connection_type = 1
       #
 
       # @!method get_performance_data_types

data/lib/appium_lib_core/common/base.rb

@@ -1,8 +1,8 @@
 # The following files have selenium-webdriver related stuff.
 require_relative 'base/driver'
 require_relative 'base/bridge'
-require_relative 'base/msjsonwp_bridge'
-require_relative 'base/w3c_bridge'
+require_relative 'base/bridge/msjsonwp'
+require_relative 'base/bridge/w3c'
 require_relative 'base/capabilities'
 require_relative 'base/http_default'
 require_relative 'base/search_context'

data/lib/appium_lib_core/common/base/bridge.rb

@@ -2,6 +2,9 @@ module Appium
   module Core
     class Base
       class Bridge < ::Selenium::WebDriver::Remote::Bridge
+        # Prefix for extra capability defined by W3C
+        APPIUM_PREFIX = 'appium:'.freeze
+
         # Almost same as self.handshake in ::Selenium::WebDriver::Remote::Bridge
         #
         # Implements protocol handshake which:
@@ -10,13 +13,13 @@ module Appium
         #   2. Sniffs response.
         #   3. Based on the response, understands which dialect we should use.
         #
-        # @return [CoreBridgeMJSONWP, CoreBridgeW3C]
+        # @return [Bridge::MJSONWP, Bridge::W3C]
         #
         def self.handshake(**opts)
           desired_capabilities = opts.delete(:desired_capabilities)
 
           if desired_capabilities.is_a?(Symbol)
-            unless Remote::Capabilities.respond_to?(desired_capabilities)
+            unless ::Selenium::WebDriver::Remote::Capabilities.respond_to?(desired_capabilities)
               raise Error::WebDriverError, "invalid desired capability: #{desired_capabilities.inspect}"
             end
             desired_capabilities = Remote::Capabilities.__send__(desired_capabilities)
@@ -27,14 +30,85 @@ module Appium
 
           case bridge.dialect
           when :oss # for MJSONWP
-            CoreBridgeMJSONWP.new(capabilities, bridge.session_id, opts)
+            Bridge::MJSONWP.new(capabilities, bridge.session_id, opts)
           when :w3c
-            CoreBridgeW3C.new(capabilities, bridge.session_id, opts)
+            Bridge::W3C.new(capabilities, bridge.session_id, opts)
           else
             raise CoreError, 'cannot understand dialect'
           end
         end
 
+        # Override
+        # Creates session handling both OSS and W3C dialects.
+        # Copy from Selenium::WebDriver::Remote::Bridge to keep using `merged_capabilities` for Appium
+        #
+        # If `desired_capabilities` has `forceMjsonwp: true` in the capability, this bridge works with mjsonwp protocol.
+        # If `forceMjsonwp: false` or no the capability, it depends on server side whether this bridge works as w3c or mjsonwp.
+        #
+        # @param [::Selenium::WebDriver::Remote::W3C::Capabilities, Hash] capabilities A capability
+        # @return [::Selenium::WebDriver::Remote::Capabilities, ::Selenium::WebDriver::Remote::W3C::Capabilities]
+        #
+        # @example
+        #
+        #   opts = {
+        #     caps: {
+        #       platformName: :ios,
+        #       automationName: 'XCUITest',
+        #       app: 'test/functional/app/UICatalog.app',
+        #       platformVersion: '10.3',
+        #       deviceName: 'iPhone Simulator',
+        #       useNewWDA: true,
+        #       forceMjsonwp: true
+        #     },
+        #     appium_lib: {
+        #       wait: 30
+        #     }
+        #   }
+        #   core = ::Appium::Core.for(self, caps)
+        #   driver = core.start_driver #=> driver.dialect == :oss
+        #
+        # @example
+        #
+        #   opts = {
+        #     caps: {
+        #       platformName: :ios,
+        #       automationName: 'XCUITest',
+        #       app: 'test/functional/app/UICatalog.app',
+        #       platformVersion: '10.3',
+        #       deviceName: 'iPhone Simulator',
+        #       useNewWDA: true,
+        #     },
+        #     appium_lib: {
+        #       wait: 30
+        #     }
+        #   }
+        #   core = ::Appium::Core.for(self, caps)
+        #   driver = core.start_driver #=> driver.dialect == :w3c if the Appium server support W3C.
+        #
+        def create_session(desired_capabilities)
+          response = execute(:new_session, {}, merged_capabilities(desired_capabilities))
+
+          @session_id = response['sessionId']
+          oss_status = response['status'] # for compatibility with Appium 1.7.1-
+          value = response['value']
+
+          if value.is_a?(Hash) # include for W3C format
+            @session_id = value['sessionId'] if value.key?('sessionId')
+
+            if value.key?('capabilities')
+              value = value['capabilities']
+            elsif value.key?('value')
+              value = value['value']
+            end
+          end
+
+          unless @session_id
+            raise Error::WebDriverError, 'no sessionId in returned payload'
+          end
+
+          json_create(oss_status, value)
+        end
+
         # Append `appium:` prefix for Appium following W3C spec
         # https://www.w3.org/TR/webdriver/#dfn-validate-capabilities
         #
@@ -49,7 +123,7 @@ module Appium
             next if value.is_a?(String) && value.empty?
 
             capability_name = name.to_s
-            w3c_name = appium_prefix?(capability_name, w3c_capabilities) ? name : "appium:#{capability_name}"
+            w3c_name = appium_prefix?(capability_name, w3c_capabilities) ? name : "#{APPIUM_PREFIX}#{capability_name}"
 
             w3c_capabilities[w3c_name] = value
           end
@@ -59,7 +133,6 @@ module Appium
 
         private
 
-        APPIUM_PREFIX = 'appium:'.freeze
         def appium_prefix?(capability_name, w3c_capabilities)
           snake_cased_capability_names = ::Selenium::WebDriver::Remote::W3C::Capabilities::KNOWN.map(&:to_s)
           camel_cased_capability_names = snake_cased_capability_names.map(&w3c_capabilities.method(:camel_case))
@@ -69,18 +142,53 @@ module Appium
             capability_name.start_with?(APPIUM_PREFIX)
         end
 
-        # Use capabilities directory because Appium's capability is based on W3C one.
-        # Called in bridge.create_session(desired_capabilities) from Parent class
+        def json_create(oss_status, value)
+          if oss_status
+            ::Selenium::WebDriver.logger.info 'Detected OSS dialect.'
+            @dialect = :oss
+            ::Selenium::WebDriver::Remote::Capabilities.json_create(value)
+          else
+            ::Selenium::WebDriver.logger.info 'Detected W3C dialect.'
+            @dialect = :w3c
+            ::Selenium::WebDriver::Remote::W3C::Capabilities.json_create(value)
+          end
+        end
+
+        def delete_force_mjsonwp(capabilities)
+          w3c_capabilities = ::Selenium::WebDriver::Remote::W3C::Capabilities.new
+
+          capabilities = capabilities.__send__(:capabilities) unless capabilities.is_a?(Hash)
+          capabilities.each do |name, value|
+            next if value.nil?
+            next if value.is_a?(String) && value.empty?
+            next if name == :forceMjsonwp
+
+            w3c_capabilities[name] = value
+          end
+
+          w3c_capabilities
+        end
+
         def merged_capabilities(desired_capabilities)
-          new_caps = add_appium_prefix(desired_capabilities)
-          w3c_capabilities = ::Selenium::WebDriver::Remote::W3C::Capabilities.from_oss(new_caps)
+          force_mjsonwp = desired_capabilities[:forceMjsonwp]
+          desired_capabilities = delete_force_mjsonwp(desired_capabilities) unless force_mjsonwp.nil?
 
-          {
-            desiredCapabilities: desired_capabilities,
-            capabilities: {
-              firstMatch: [w3c_capabilities]
+          if force_mjsonwp
+            {
+              desiredCapabilities: desired_capabilities
             }
-          }
+          else
+            new_caps = add_appium_prefix(desired_capabilities)
+            w3c_capabilities = ::Selenium::WebDriver::Remote::W3C::Capabilities.from_oss(new_caps)
+
+            {
+              desiredCapabilities: desired_capabilities,
+              capabilities: {
+                alwaysMatch: w3c_capabilities,
+                firstMatch: [{}]
+              }
+            }
+          end
         end
       end # class Bridge
     end # class Base

data/lib/appium_lib_core/common/base/bridge/msjsonwp.rb

@@ -0,0 +1,13 @@
+module Appium
+  module Core
+    class Base
+      class Bridge
+        class MJSONWP < ::Selenium::WebDriver::Remote::OSS::Bridge
+          def commands(command)
+            ::Appium::Core::Commands::COMMANDS_EXTEND_MJSONWP[command]
+          end
+        end # class MJSONWP
+      end # class Bridge
+    end # class Base
+  end # module Core
+end # module Appium

data/lib/appium_lib_core/common/base/bridge/w3c.rb

@@ -0,0 +1,160 @@
+module Appium
+  module Core
+    class Base
+      class Bridge
+        class W3C < ::Selenium::WebDriver::Remote::W3C::Bridge
+          # Used for default duration of each touch actions
+          # Override from 250 milliseconds to 50 milliseconds
+          ::Selenium::WebDriver::PointerActions::DEFAULT_MOVE_DURATION = 0.05
+
+          def commands(command)
+            ::Appium::Core::Commands::COMMANDS_EXTEND_W3C[command]
+          end
+
+          # Perform touch actions for W3C module.
+          # Generate `touch` pointer action here and users can use this via `driver.action`
+          # - https://seleniumhq.github.io/selenium/docs/api/rb/Selenium/WebDriver/W3CActionBuilder.html
+          # - https://seleniumhq.github.io/selenium/docs/api/rb/Selenium/WebDriver/PointerActions.html
+          # - https://seleniumhq.github.io/selenium/docs/api/rb/Selenium/WebDriver/KeyActions.html
+          #
+          # @private
+          # For Appium
+          # override
+          #
+          # @example
+          #
+          #     element = @driver.find_element(:id, "some id")
+          #     @driver.action.click(element).perform # The `click` is a part of `PointerActions`
+          #
+          def action(async = false)
+            ::Selenium::WebDriver::W3CActionBuilder.new self,
+                                                        ::Selenium::WebDriver::Interactions.pointer(:touch, name: 'touch'),
+                                                        ::Selenium::WebDriver::Interactions.key('keyboard'),
+                                                        async
+          end
+          alias actions action
+
+          # For Appium
+          # override
+          def page_source
+            # For W3C
+            # execute_script('var source = document.documentElement.outerHTML;' \
+            # 'if (!source) { source = new XMLSerializer().serializeToString(document); }' \
+            # 'return source;')
+            execute :get_page_source
+          end
+
+          # For Appium
+          # override
+          def element_attribute(element, name)
+            # For W3C
+            # execute_atom :getAttribute, element, name
+            execute :get_element_attribute, id: element.ref, name: name
+          end
+
+          # For Appium
+          # override
+          def find_element_by(how, what, parent = nil)
+            how, what = convert_locators(how, what)
+
+            id = if parent
+                   execute :find_child_element, { id: parent }, { using: how, value: what }
+                 else
+                   execute :find_element, {}, { using: how, value: what }
+                 end
+            ::Selenium::WebDriver::Element.new self, element_id_from(id)
+          end
+
+          # For Appium
+          # override
+          def find_elements_by(how, what, parent = nil)
+            how, what = convert_locators(how, what)
+
+            ids = if parent
+                    execute :find_child_elements, { id: parent }, { using: how, value: what }
+                  else
+                    execute :find_elements, {}, { using: how, value: what }
+                  end
+
+            ids.map { |id| ::Selenium::WebDriver::Element.new self, element_id_from(id) }
+          end
+
+          # For Appium
+          # override
+          # called in `extend DriverExtensions::HasNetworkConnection`
+          def network_connection
+            execute :get_network_connection
+          end
+
+          # For Appium
+          # override
+          # called in `extend DriverExtensions::HasNetworkConnection`
+          def network_connection=(type)
+            execute :set_network_connection, {}, { parameters: { type: type } }
+          end
+
+          # For Appium
+          # No implementation for W3C webdriver module
+          # called in `extend DriverExtensions::HasLocation`
+          def location
+            obj = execute(:get_location) || {}
+            ::Selenium::WebDriver::Location.new obj['latitude'], obj['longitude'], obj['altitude']
+          end
+
+          # For Appium
+          # No implementation for W3C webdriver module
+          # called in `extend DriverExtensions::HasLocation`
+          def set_location(lat, lon, alt)
+            loc = { latitude: lat, longitude: lon, altitude: alt }
+            execute :set_location, {}, { location: loc }
+          end
+
+          #
+          # logs
+          #
+          # For Appium
+          # No implementation for W3C webdriver module
+          def available_log_types
+            types = execute :get_available_log_types
+            Array(types).map(&:to_sym)
+          end
+
+          # For Appium
+          # No implementation for W3C webdriver module
+          def log(type)
+            data = execute :get_log, {}, { type: type.to_s }
+
+            Array(data).map do |l|
+              begin
+                ::Selenium::WebDriver::LogEntry.new l.fetch('level', 'UNKNOWN'), l.fetch('timestamp'), l.fetch('message')
+              rescue KeyError
+                next
+              end
+            end
+          end
+
+          private
+
+          # Don't convert locators for Appium Client
+          # TODO: Only for Appium. Ideally, we'd like to keep the selenium-webdriver
+          def convert_locators(how, what)
+            # case how
+            # when 'class name'
+            #   how = 'css selector'
+            #   what = ".#{escape_css(what)}"
+            # when 'id'
+            #   how = 'css selector'
+            #   what = "##{escape_css(what)}"
+            # when 'name'
+            #   how = 'css selector'
+            #   what = "*[name='#{escape_css(what)}']"
+            # when 'tag name'
+            #   how = 'css selector'
+            # end
+            [how, what]
+          end
+        end # class W3C
+      end # class Bridge
+    end # class Base
+  end # module Core
+end # module Appium

data/lib/appium_lib_core/common/base/driver.rb

@@ -56,6 +56,18 @@ module Appium
         def back
           navigate.back
         end
+
+        # Get the device window's logs.
+        # @return [String]
+        #
+        # @example
+        #
+        #   @driver.logs.available_types # [:syslog, :crashlog, :performance]
+        #   @driver.logs.get :syslog # []
+        #
+        def logs
+          @logs ||= Logs.new(@bridge)
+        end
       end # class Driver
     end # class Base
   end # module Core

data/lib/appium_lib_core/common/command.rb

@@ -23,7 +23,7 @@ module Appium
         get_system_bars:            [:get,  'session/:session_id/appium/device/system_bars'.freeze],
         get_display_density:        [:get,  'session/:session_id/appium/device/display_density'.freeze],
         is_keyboard_shown:          [:get,  'session/:session_id/appium/device/is_keyboard_shown'.freeze],
-        get_network_connection:     [:get,  'session/:session_id/network_connection'.freeze],
+        get_network_connection:     [:get,  'session/:session_id/network_connection'.freeze], # defined also in OSS
         get_performance_data_types: [:post, 'session/:session_id/appium/performanceData/types'.freeze],
         stop_recording_screen:      [:post, 'session/:session_id/appium/stop_recording_screen'.freeze]
         # iOS
@@ -59,7 +59,7 @@ module Appium
       COMMAND_ANDROID = {
         start_activity:             [:post, 'session/:session_id/appium/device/start_activity'.freeze],
         end_coverage:               [:post, 'session/:session_id/appium/app/end_test_coverage'.freeze],
-        set_network_connection:     [:post, 'session/:session_id/network_connection'.freeze],
+        set_network_connection:     [:post, 'session/:session_id/network_connection'.freeze], # defined also in OSS
         get_performance_data:       [:post, 'session/:session_id/appium/getPerformanceData'.freeze],
         start_recording_screen:     [:post, 'session/:session_id/appium/start_recording_screen'.freeze]
       }.freeze
@@ -89,23 +89,24 @@ module Appium
           # The fix will be included in selenium-3.8.2
           get_page_source: [:get, 'session/:session_id/source'.freeze],
 
-          ## Add to W3C commands
-          # rotatable
+          ## Add OSS commands to W3C commands
+          ### rotatable
           get_screen_orientation: [:get, 'session/:session_id/orientation'.freeze],
           set_screen_orientation: [:post, 'session/:session_id/orientation'.freeze],
 
           get_location: [:get, 'session/:session_id/location'.freeze],
           set_location: [:post, 'session/:session_id/location'.freeze],
 
-          get_network_connection: [:get, 'session/:session_id/network_connection'.freeze],
-          set_network_connection: [:post, 'session/:session_id/network_connection'.freeze],
-
-          # For IME
+          ### For IME
           ime_get_available_engines: [:get,  'session/:session_id/ime/available_engines'.freeze],
           ime_get_active_engine:     [:get,  'session/:session_id/ime/active_engine'.freeze],
           ime_is_activated:          [:get,  'session/:session_id/ime/activated'.freeze],
           ime_deactivate:            [:post, 'session/:session_id/ime/deactivate'.freeze],
-          ime_activate_engine:       [:post, 'session/:session_id/ime/activate'.freeze]
+          ime_activate_engine:       [:post, 'session/:session_id/ime/activate'.freeze],
+
+          ### Logs
+          get_available_log_types: [:get, 'session/:session_id/log/types'.freeze],
+          get_log: [:post, 'session/:session_id/log'.freeze]
         }
       ).freeze
     end

data/lib/appium_lib_core/common/device.rb

@@ -112,6 +112,12 @@ module Appium
       # @!method get_network_connection
       #   Get the device network connection current status
       #   See set_network_connection method for return value
+      #
+      # @example
+      #
+      #   @driver.network_connection_type #=> 6
+      #   @driver.get_network_connection  #=> 6
+      #
 
       # @!method open_notifications
       #   Open Android notifications
@@ -561,10 +567,10 @@ module Appium
 
         # @private
         def create_bridge_command(method)
-          ::Appium::Core::Base::CoreBridgeMJSONWP.class_eval do
+          ::Appium::Core::Base::Bridge::MJSONWP.class_eval do
             block_given? ? class_eval(&Proc.new) : define_method(method) { execute method }
           end
-          ::Appium::Core::Base::CoreBridgeW3C.class_eval do
+          ::Appium::Core::Base::Bridge::W3C.class_eval do
             block_given? ? class_eval(&Proc.new) : define_method(method) { execute method }
           end
         end

data/lib/appium_lib_core/common/log.rb

@@ -9,21 +9,23 @@ module Appium
       # @return [[Selenium::WebDriver::LogEntry]] A list of logs data.
       #
       # @example
-      #   Appium::Core::Logs.new(driver).get("syslog") #=> [[Selenium::WebDriver::LogEntry]]
-      #   Appium::Core::Logs.new(driver).get(:syslog)  #=> [[Selenium::WebDriver::LogEntry]]
+      #
+      #   @driver.logs.get "syslog" # []
+      #   @driver.logs.get :syslog # []
       #
       def get(type)
-        @bridge.get type
+        @bridge.log type
       end
 
       # Get a list of available log types
       #
       # @return [[Hash]] A list of available log types.
       # @example
-      #   Appium::Core::Logs.new(driver).available_types #=>  [:syslog, :crashlog, :performance]
+      #
+      #   @driver.logs.available_types # [:syslog, :crashlog, :performance]
       #
       def available_types
-        @bridge.available_types
+        @bridge.available_log_types
       end
     end
   end # module Core

data/lib/appium_lib_core/version.rb

@@ -1,6 +1,6 @@
 module Appium
   module Core
-    VERSION = '1.2.3'.freeze unless defined? ::Appium::Core::VERSION
-    DATE    = '2017-12-27'.freeze unless defined? ::Appium::Core::DATE
+    VERSION = '1.2.4'.freeze unless defined? ::Appium::Core::VERSION
+    DATE    = '2018-01-03'.freeze unless defined? ::Appium::Core::DATE
   end
 end

data/release_notes.md

@@ -1,3 +1,13 @@
+#### v1.2.4 2018-01-03
+
+- [7032bc0](https://github.com/appium/ruby_lib_core/commit/7032bc02acc44640542eb545067a4125a7f1811f) Release 1.2.4
+- [2396b08](https://github.com/appium/ruby_lib_core/commit/2396b08f99a9630827f6805dde2716b0bd0b14f7) Add some missing commands for w3c (#42)
+- [db6aa69](https://github.com/appium/ruby_lib_core/commit/db6aa6954566f601bb038aa7a7aa6884612e19fe) Switchable w3c format caps from capabilities (#41)
+- [dac4ff1](https://github.com/appium/ruby_lib_core/commit/dac4ff16271361ceaecf1f613f85cff0bb6c4be2) Add capability for create session following w3c (#40)
+- [f2c25ce](https://github.com/appium/ruby_lib_core/commit/f2c25ce9e551790beb4cf6abb170a02a70955eb4) update travis (#39)
+- [2ea7908](https://github.com/appium/ruby_lib_core/commit/2ea7908a5e77f4f7275a3e51c1abae7966cf2d94) remove bug fixes part in unreleased
+
+
 #### v1.2.3 2017-12-27
 
 - [26b8392](https://github.com/appium/ruby_lib_core/commit/26b83923a50257922030c7ccb83e110aff55eee5) Release 1.2.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib_core
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Kazuaki MATSUO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-27 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -204,13 +204,13 @@ files:
 - lib/appium_lib_core/common.rb
 - lib/appium_lib_core/common/base.rb
 - lib/appium_lib_core/common/base/bridge.rb
+- lib/appium_lib_core/common/base/bridge/msjsonwp.rb
+- lib/appium_lib_core/common/base/bridge/w3c.rb
 - lib/appium_lib_core/common/base/capabilities.rb
 - lib/appium_lib_core/common/base/command.rb
 - lib/appium_lib_core/common/base/driver.rb
 - lib/appium_lib_core/common/base/http_default.rb
-- lib/appium_lib_core/common/base/msjsonwp_bridge.rb
 - lib/appium_lib_core/common/base/search_context.rb
-- lib/appium_lib_core/common/base/w3c_bridge.rb
 - lib/appium_lib_core/common/base/wait.rb
 - lib/appium_lib_core/common/command.rb
 - lib/appium_lib_core/common/device.rb

data/lib/appium_lib_core/common/base/msjsonwp_bridge.rb

@@ -1,11 +0,0 @@
-module Appium
-  module Core
-    class Base
-      class CoreBridgeMJSONWP < ::Selenium::WebDriver::Remote::OSS::Bridge
-        def commands(command)
-          ::Appium::Core::Commands::COMMANDS_EXTEND_MJSONWP[command]
-        end
-      end # class CoreBridgeMJSONWP
-    end # class Base
-  end # module Core
-end # module Appium

data/lib/appium_lib_core/common/base/w3c_bridge.rb

@@ -1,129 +0,0 @@
-module Appium
-  module Core
-    class Base
-      class CoreBridgeW3C < ::Selenium::WebDriver::Remote::W3C::Bridge
-        # Used for default duration of each touch actions
-        # Override from 250 milliseconds to 50 milliseconds
-        ::Selenium::WebDriver::PointerActions::DEFAULT_MOVE_DURATION = 0.05
-
-        def commands(command)
-          ::Appium::Core::Commands::COMMANDS_EXTEND_W3C[command]
-        end
-
-        # Perform touch actions for W3C module. Generate `touch` pointer action here and users can use this via `driver.action`
-        # - https://seleniumhq.github.io/selenium/docs/api/rb/Selenium/WebDriver/W3CActionBuilder.html
-        # - https://seleniumhq.github.io/selenium/docs/api/rb/Selenium/WebDriver/PointerActions.html
-        # - https://seleniumhq.github.io/selenium/docs/api/rb/Selenium/WebDriver/KeyActions.html
-        #
-        # @private
-        # For Appium
-        # override
-        #
-        # @example
-        #
-        #     element = @driver.find_element(:id, "some id")
-        #     @driver.action.click(element).perform # The `click` is a part of `PointerActions`
-        #
-        def action(async = false)
-          ::Selenium::WebDriver::W3CActionBuilder.new self,
-                                                      ::Selenium::WebDriver::Interactions.pointer(:touch, name: 'touch'),
-                                                      ::Selenium::WebDriver::Interactions.key('keyboard'),
-                                                      async
-        end
-        alias actions action
-
-        # For Appium
-        # override
-        def page_source
-          # For W3C
-          # execute_script('var source = document.documentElement.outerHTML;' \
-          # 'if (!source) { source = new XMLSerializer().serializeToString(document); }' \
-          # 'return source;')
-          execute :get_page_source
-        end
-
-        # For Appium
-        # override
-        def element_attribute(element, name)
-          # For W3C
-          # execute_atom :getAttribute, element, name
-          execute :get_element_attribute, id: element.ref, name: name
-        end
-
-        # For Appium
-        # override
-        def find_element_by(how, what, parent = nil)
-          how, what = convert_locators(how, what)
-
-          id = if parent
-                 execute :find_child_element, { id: parent }, { using: how, value: what }
-               else
-                 execute :find_element, {}, { using: how, value: what }
-               end
-          ::Selenium::WebDriver::Element.new self, element_id_from(id)
-        end
-
-        # For Appium
-        # override
-        def find_elements_by(how, what, parent = nil)
-          how, what = convert_locators(how, what)
-
-          ids = if parent
-                  execute :find_child_elements, { id: parent }, { using: how, value: what }
-                else
-                  execute :find_elements, {}, { using: how, value: what }
-                end
-
-          ids.map { |id| ::Selenium::WebDriver::Element.new self, element_id_from(id) }
-        end
-
-        # For Appium
-        # override
-        def location
-          obj = execute(:get_location) || {}
-          Location.new obj['latitude'], obj['longitude'], obj['altitude']
-        end
-
-        # For Appium
-        # override
-        def set_location(lat, lon, alt)
-          loc = { latitude: lat, longitude: lon, altitude: alt }
-          execute :set_location, {}, { location: loc }
-        end
-
-        # For Appium
-        # override
-        def network_connection
-          execute :get_network_connection
-        end
-
-        # For Appium
-        # override
-        def network_connection=(type)
-          execute :set_network_connection, {}, { parameters: { type: type } }
-        end
-
-        private
-
-        # Don't convert locators for Appium Client
-        # TODO: Only for Appium. Ideally, we'd like to keep the selenium-webdriver
-        def convert_locators(how, what)
-          # case how
-          # when 'class name'
-          #   how = 'css selector'
-          #   what = ".#{escape_css(what)}"
-          # when 'id'
-          #   how = 'css selector'
-          #   what = "##{escape_css(what)}"
-          # when 'name'
-          #   how = 'css selector'
-          #   what = "*[name='#{escape_css(what)}']"
-          # when 'tag name'
-          #   how = 'css selector'
-          # end
-          [how, what]
-        end
-      end # class CoreBridgeW3C
-    end # class Base
-  end # module Core
-end # module Appium