appium_lib_core 4.5.0 → 5.0.0.beta4

data/script/commands.rb

@@ -18,26 +18,18 @@ require './lib/appium_lib_core'
 module Script
   class CommandsChecker
     attr_reader :spec_commands,
-                :implemented_mjsonwp_commands, :implemented_w3c_commands, :implemented_core_commands,
-                :webdriver_oss_commands, :webdriver_w3c_commands
+                :implemented_w3c_commands, :implemented_core_commands,
+                :webdriver_w3c_commands
 
     # Set commands implemented in this core library.
     #
-    # - implemented_mjsonwp_commands:  All commands include ::Selenium::WebDriver::Remote::OSS::Bridge::COMMANDS
-    # - implemented_w3c_commands:  All commands include ::Selenium::WebDriver::Remote::W3C::Bridge::COMMANDS
+    # - implemented_w3c_commands:  All commands include ::Selenium::WebDriver::Remote::Bridge::COMMANDS
     # - implemented_core_commands:  All commands except for selenium-webdriver's commands
-    # - webdriver_oss_commands: ::Selenium::WebDriver::Remote::OSS::Bridge::COMMANDS
-    # - webdriver_w3c_commands: ::Selenium::WebDriver::Remote::W3C::Bridge::COMMANDS
     #
     def initialize
       @spec_commands = nil
 
-      @implemented_mjsonwp_commands = convert_driver_commands Appium::Core::Commands::MJSONWP::COMMANDS
-      @implemented_w3c_commands = convert_driver_commands Appium::Core::Commands::W3C::COMMANDS
       @implemented_core_commands = convert_driver_commands Appium::Core::Commands::COMMANDS
-
-      @webdriver_oss_commands = convert_driver_commands Appium::Core::Base::Commands::OSS
-      @webdriver_w3c_commands = convert_driver_commands Appium::Core::Base::Commands::W3C
     end
 
     # Get the bellow url's file.
@@ -80,18 +72,6 @@ module Script
       end
     end
 
-    # All commands which haven't been implemented in ruby core library yet.
-    # @return [Hash]
-    #
-    def all_diff_commands_mjsonwp
-      result = compare_commands(@spec_commands, @implemented_mjsonwp_commands)
-
-      white_list.each { |v| result.delete v }
-      w3c_spec.each { |v| result.delete v }
-
-      result
-    end
-
     # All commands which haven't been implemented in ruby core library yet.
     # @return [Hash]
     #
@@ -111,20 +91,6 @@ module Script
       result
     end
 
-    def diff_webdriver_oss
-      result = compare_commands(@spec_commands, @webdriver_oss_commands)
-      white_list.each { |v| result.delete v }
-      w3c_spec.each { |v| result.delete v }
-      result
-    end
-
-    def diff_webdriver_w3c
-      result = compare_commands(@spec_commands, @webdriver_w3c_commands)
-      white_list.each { |v| result.delete v }
-      mjsonwp_spec.each { |v| result.delete v }
-      result
-    end
-
     def compare_commands(command1, with_command2)
       return {} if command1.nil?
       return command1 if with_command2.nil?

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib_core
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 5.0.0.beta4
 platform: ruby
 authors:
 - Kazuaki MATSUO
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.14'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.14.1
+        version: 4.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.14'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.14.1
+        version: 4.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -120,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: appium_thor
   requirement: !ruby/object:Gem::Requirement
@@ -262,12 +256,12 @@ 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/mjsonwp.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/device_ime.rb
 - lib/appium_lib_core/common/base/driver.rb
+- lib/appium_lib_core/common/base/driver_settings.rb
 - lib/appium_lib_core/common/base/has_location.rb
+- lib/appium_lib_core/common/base/has_network_connection.rb
 - lib/appium_lib_core/common/base/http_default.rb
 - lib/appium_lib_core/common/base/platform.rb
 - lib/appium_lib_core/common/base/remote_status.rb
@@ -275,9 +269,6 @@ files:
 - lib/appium_lib_core/common/base/screenshot.rb
 - lib/appium_lib_core/common/base/search_context.rb
 - lib/appium_lib_core/common/command.rb
-- lib/appium_lib_core/common/command/common.rb
-- lib/appium_lib_core/common/command/mjsonwp.rb
-- lib/appium_lib_core/common/command/w3c.rb
 - lib/appium_lib_core/common/device/app_management.rb
 - lib/appium_lib_core/common/device/app_state.rb
 - lib/appium_lib_core/common/device/battery_status.rb
@@ -306,6 +297,7 @@ files:
 - lib/appium_lib_core/common/ws/websocket.rb
 - lib/appium_lib_core/device.rb
 - lib/appium_lib_core/driver.rb
+- lib/appium_lib_core/element.rb
 - lib/appium_lib_core/ios.rb
 - lib/appium_lib_core/ios/device.rb
 - lib/appium_lib_core/ios/device/clipboard.rb
@@ -322,7 +314,6 @@ files:
 - lib/appium_lib_core/mac2/bridge.rb
 - lib/appium_lib_core/mac2/device.rb
 - lib/appium_lib_core/mac2/device/screen.rb
-- lib/appium_lib_core/patch.rb
 - lib/appium_lib_core/version.rb
 - lib/appium_lib_core/windows.rb
 - lib/appium_lib_core/windows/bridge.rb
@@ -334,7 +325,7 @@ homepage: https://github.com/appium/ruby_lib_core/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -342,15 +333,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Minimal Ruby library for Appium.
 test_files: []

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

@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Appium
-  module Core
-    class Base
-      class Bridge
-        class MJSONWP < ::Selenium::WebDriver::Remote::OSS::Bridge
-          include Device::DeviceLock
-          include Device::Keyboard
-          include Device::ImeActions
-          include Device::Setting
-          include Device::Context
-          include Device::Value
-          include Device::FileManagement
-          include Device::KeyEvent
-          include Device::ImageComparison
-          include Device::AppManagement
-          include Device::AppState
-          include Device::ScreenRecord::Command
-          include Device::Device
-          include Device::TouchActions
-          include Device::ExecuteDriver
-
-          def commands(command)
-            ::Appium::Core::Commands::MJSONWP::COMMANDS[command]
-          end
-
-          # Returns all available sessions on the Appium server instance
-          def sessions
-            execute :get_all_sessions
-          end
-
-          def status
-            execute :status
-          end
-
-          # For Appium
-          def log_event(vendor, event)
-            execute :post_log_event, {}, { vendor: vendor, event: event }
-          end
-
-          # For Appium
-          def log_events(type = nil)
-            args = {}
-            args['type'] = type unless type.nil?
-
-            execute :get_log_events, {}, args
-          end
-
-          def take_element_screenshot(element)
-            execute :take_element_screenshot, id: element.ref
-          end
-
-          def take_viewport_screenshot
-            # TODO: this hasn't been supported by Espresso driver
-            execute_script('mobile: viewportScreenshot')
-          end
-
-          def send_actions(_data)
-            raise Error::UnsupportedOperationError, '#send_actions has not been supported in MJSONWP'
-          end
-
-          # For Appium
-          # @param [Hash] id The id which can get as a response from server
-          # @return [::Selenium::WebDriver::Element]
-          def convert_to_element(id)
-            ::Selenium::WebDriver::Element.new self, element_id_from(id)
-          end
-
-          def set_location(lat, lon, alt = 0.0, speed: nil)
-            loc = { latitude: lat, longitude: lon, altitude: alt }
-            loc[:speed] = speed unless speed.nil?
-            execute :set_location, {}, { location: loc }
-          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

@@ -1,248 +0,0 @@
-# frozen_string_literal: true
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Appium
-  module Core
-    class Base
-      class Bridge
-        class W3C < ::Selenium::WebDriver::Remote::W3C::Bridge
-          include Device::DeviceLock
-          include Device::Keyboard
-          include Device::ImeActions
-          include Device::Setting
-          include Device::Context
-          include Device::Value
-          include Device::FileManagement
-          include Device::KeyEvent
-          include Device::ImageComparison
-          include Device::AppManagement
-          include Device::AppState
-          include Device::ScreenRecord::Command
-          include Device::Device
-          include Device::TouchActions
-          include Device::ExecuteDriver
-          include Device::Orientation
-
-          def commands(command)
-            ::Appium::Core::Commands::W3C::COMMANDS[command]
-          end
-
-          # Returns all available sessions on the Appium server instance
-          def sessions
-            execute :get_all_sessions
-          end
-
-          def status
-            execute :status
-          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
-          #
-          # 'mouse' action is by default in the Ruby client. Appium server force the +mouse+ action to +touch+ once in
-          # the server side. So we don't consider the case.
-          #
-          # @example
-          #
-          #     element = @driver.find_element(:id, "some id")
-          #     @driver.action.click(element).perform # The 'click' is a part of 'PointerActions'
-          #
-          def action(async = false)
-            # Used for default duration of each touch actions
-            # Override from 250 milliseconds to 50 milliseconds
-            action_builder = super
-            action_builder.default_move_duration = 0.05
-            action_builder
-          end
-
-          # Port from MJSONWP
-          def get_timeouts
-            execute :get_timeouts
-          end
-
-          # Port from MJSONWP
-          def session_capabilities
-            ::Selenium::WebDriver::Remote::W3C::Capabilities.json_create execute(:get_capabilities)
-          end
-
-          # Port from MJSONWP
-          def send_keys_to_active_element(key)
-            text = ::Selenium::WebDriver::Keys.encode(key).join('')
-            execute :send_keys_to_active_element, {}, { value: text.split(//) }
-          end
-
-          # 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_displayed?(element)
-            # For W3C
-            # https://github.com/SeleniumHQ/selenium/commit/b618499adcc3a9f667590652c5757c0caa703289
-            # execute_atom :isDisplayed, element
-            execute :is_element_displayed, id: element.ref
-          end
-
-          # For Appium
-          # override
-          def element_attribute(element, name)
-            # For W3C in Selenium Client
-            # 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
-          # @param [Hash] id The id which can get as a response from server
-          # @return [::Selenium::WebDriver::Element]
-          def convert_to_element(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
-          def set_location(lat, lon, alt = 0.0, speed: nil)
-            loc = { latitude: lat, longitude: lon, altitude: alt }
-            loc[:speed] = speed unless speed.nil?
-            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
-
-          # For Appium
-          def log_event(vendor, event)
-            execute :post_log_event, {}, { vendor: vendor, event: event }
-          end
-
-          # For Appium
-          def log_events(type = nil)
-            args = {}
-            args['type'] = type unless type.nil?
-
-            execute :get_log_events, {}, args
-          end
-
-          def take_viewport_screenshot
-            execute_script('mobile: viewportScreenshot')
-          end
-
-          def take_element_screenshot(element)
-            execute :take_element_screenshot, id: element.ref
-          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