appium_lib_core 5.0.0.rc1 → 5.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc513ad9f9ba5689303763b09a884af18e1a9eb80e78a6e05cf838551905f732
-  data.tar.gz: 59241d4d8626cf39eeb63a51291f18deca6759bdba95a8e2bb942173e0b5df9e
+  metadata.gz: 3eba36b9dee77259cd1a14dd0e03c3a140a0e4bcb014d3d7d277ca9d4c47e011
+  data.tar.gz: 511a0a3fa46c55f078185c8d25262ec4c6b5d281be628a2217df1d90fd58d331
 SHA512:
-  metadata.gz: 867c6a7bfbdf95243fae3a6292f0349bf9bda1fbb83b44cb7d2e12e8f5e0ecb2f41fb6103aeebdcaaded1024cbb16cd2d758d73bef9bf00697325d75b5c2d027
-  data.tar.gz: 345771f473fca33668d101f00be374ebb3b345b6795c5392b9955da73bb45588e5589b70ba8c983ce161e35c311b2f18adfd7bac3a8d816ba93863820b05b4f6
+  metadata.gz: 47a0de22452cdfa19f9e9aa71dd1b29bedc17c0b431860c7db5bbccb4f50ff83e08db3103caa5ad9e40aaf526518c072ee32563a7139d126222c63d52375048e
+  data.tar.gz: 868a920d5221fba2e9e9e3c583a7e5c81cd00bbdf19680ef4795ae23cb71ea773fdce24889935574190a82d888f8ba7f99f1e98e3f86ddd3dab344710598675a

data/CHANGELOG.md

@@ -17,6 +17,8 @@ Read `release_notes.md` for commit level details.
 - Support only W3C spec
 - Support Ruby 2.5+
 - Raises `::Appium::Core::Error::ArgumentError` instead of `ArgumentError` for this library specific argument errors
+- Removed `desired_capabilities` from capabilities. Please use `capabilities` instead.
+- `element.ref` returns not only element id. It returns an array like `[:driver, id]`. You should do `_, element_id = element.ref` to get the element id
 
 ## [4.7.0] - 2021-07-17
 

data/appium_lib_core.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'selenium-webdriver', '4.0.0.rc1'
+  spec.add_runtime_dependency 'selenium-webdriver', '4.0.0.rc2'
   spec.add_runtime_dependency 'faye-websocket', '~> 0.11.0'
 
   spec.add_development_dependency 'bundler', '>= 1.14'

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

@@ -53,7 +53,7 @@ module Appium
         # Override
         # Creates session handling both OSS and W3C dialects.
         #
-        # @param [::Selenium::WebDriver::Remote::Capabilities, Hash] desired_capabilities A capability
+        # @param [::Selenium::WebDriver::Remote::Capabilities, Hash] capabilities A capability
         # @return [::Selenium::WebDriver::Remote::Capabilities]
         #
         # @example
@@ -78,7 +78,7 @@ module Appium
           @available_commands = ::Appium::Core::Commands::COMMANDS.dup
 
           caps = add_appium_prefix(capabilities)
-          response = execute(:new_session, {}, { capabilities: { firstMatch: [caps] } })
+          response = execute(:new_session, {}, { capabilities: { alwaysMatch: caps, firstMatch: [] } })
 
           @session_id = response['sessionId']
           raise ::Selenium::WebDriver::Error::WebDriverError, 'no sessionId in returned payload' unless @session_id

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

@@ -22,6 +22,13 @@ module Appium
         # @return [::Selenium::WebDriver::Remote::Capabilities] Return instance of Appium::Core::Base::Capabilities
         #                         inherited ::Selenium::WebDriver::Remote::Capabilities
         def self.create_capabilities(opts_caps = {})
+          # TODO: Move to 'Options' way instead of 'Capabilities'.
+          # Selenium 5 will have Options instead of 'Capabilities'.
+          # https://github.com/SeleniumHQ/selenium/blob/trunk/rb/lib/selenium/webdriver/common/options.rb
+          # Then, Ruby client also shoud move to the Options way.
+          # Appium's capabilities could change by depending on Appium versions. So it does not have
+          # standard options like chrome and firefox etc. So, the implementation should differ from
+          # other browsers. But here should inherit `Options` to follow Selenium.
           ::Selenium::WebDriver::Remote::Capabilities.new(opts_caps)
         end
       end

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

@@ -57,23 +57,7 @@ module Appium
         # @return [::Appium::Core::Base::Bridge]
         #
         def create_bridge(**opts)
-          caps = opts.delete(:capabilities)
-          # NOTE: This is deprecated
-          cap_array = caps.is_a?(Hash) ? [caps] : Array(caps)
-
-          desired_capabilities = opts.delete(:desired_capabilities)
-          if desired_capabilities
-            if desired_capabilities.is_a?(Hash)
-              desired_capabilities = ::Selenium::WebDriver::Remote::Capabilities(desired_capabilities)
-            end
-            cap_array << desired_capabilities
-          end
-
-          options = opts.delete(:options)
-          cap_array << options if options
-
-          capabilities = generate_capabilities(cap_array)
-
+          capabilities = opts.delete(:capabilities)
           bridge_opts = { http_client: opts.delete(:http_client), url: opts.delete(:url) }
           raise ::Appium::Core::Error::ArgumentError, "Unable to create a driver with parameters: #{opts}" unless opts.empty?
 

data/lib/appium_lib_core/driver.rb

@@ -187,8 +187,6 @@ module Appium
       # @option opts [Hash] :caps Appium capabilities.
       # @option opts [Hash] :capabilities The same as :caps.
       #                                   This param is for compatibility with Selenium WebDriver format
-      # @option opts [Hash] :desired_capabilities The same as :caps.
-      #                                           This param is for compatibility with Selenium WebDriver format
       # @option opts [Appium::Core::Options] :appium_lib Capabilities affect only ruby client
       # @option opts [String] :url The same as :custom_url in :appium_lib.
       #                            This param is for compatibility with Selenium WebDriver format
@@ -199,10 +197,8 @@ module Appium
       #
       #     # format 1
       #     @core = Appium::Core.for caps: {...}, appium_lib: {...}
-      #     # format 2. 'capabilities:' or 'desired_capabilities:' is also available instead of 'caps:'.
+      #     # format 2. 'capabilities:' is also available instead of 'caps:'.
       #     @core = Appium::Core.for url: "http://127.0.0.1:8080/wd/hub", capabilities: {...}, appium_lib: {...}
-      #     # format 3. 'appium_lib: {...}' can be blank
-      #     @core = Appium::Core.for url: "http://127.0.0.1:8080/wd/hub", desired_capabilities: {...}
       #
       #
       #     require 'rubygems'
@@ -230,7 +226,7 @@ module Appium
       #     @core.start_driver # Connect to 'http://127.0.0.1:8080/wd/hub' because of 'port: 8080'
       #
       #     # Start iOS driver with .zip file over HTTP
-      #     #  'desired_capabilities:' or 'capabilities:' is also available instead of 'caps:'. Either is fine.
+      #     # 'capabilities:' is also available instead of 'caps:'. Either is fine.
       #     opts = {
       #              capabilities: {
       #                platformName: :ios,
@@ -254,7 +250,7 @@ module Appium
       #     # Start iOS driver as another format. 'url' is available like below
       #     opts = {
       #              url: "http://custom-host:8080/wd/hub.com",
-      #              desired_capabilities: {
+      #              capabilities: {
       #                platformName: :ios,
       #                platformVersion: '11.0',
       #                deviceName: 'iPhone Simulator',
@@ -368,8 +364,8 @@ module Appium
 
         begin
           @driver = ::Appium::Core::Base::Driver.new(listener: @listener,
-                                            http_client: @http_client,
-                                                     desired_capabilities: @caps,
+                                                     http_client: @http_client,
+                                                     capabilities: @caps, # ::Selenium::WebDriver::Remote::Capabilities
                                                      url: @custom_url)
 
           if @direct_connect
@@ -567,10 +563,7 @@ module Appium
       def validate_keys(opts)
         flatten_ops = flatten_hash_keys(opts)
 
-        # FIXME: Remove 'desired_capabilities' in the next major Selenium update
-        unless opts.member?(:caps) || opts.member?(:capabilities) || opts.member?(:desired_capabilities)
-          raise Error::NoCapabilityError
-        end
+        raise Error::NoCapabilityError unless opts.member?(:caps) || opts.member?(:capabilities)
 
         if !opts.member?(:appium_lib) && flatten_ops.member?(:appium_lib)
           raise Error::CapabilityStructureError, 'Please check the value of appium_lib in the capability'
@@ -591,8 +584,7 @@ module Appium
 
       # @private
       def get_caps(opts)
-        # FIXME: Remove 'desired_capabilities' in the next major Selenium update
-        Core::Base::Capabilities.create_capabilities(opts[:caps] || opts[:capabilities] || opts[:desired_capabilities] || {})
+        Core::Base::Capabilities.create_capabilities(opts[:caps] || opts[:capabilities] || {})
       end
 
       # @private

data/lib/appium_lib_core/version.rb

@@ -14,7 +14,7 @@
 
 module Appium
   module Core
-    VERSION = '5.0.0.rc1' unless defined? ::Appium::Core::VERSION
-    DATE    = '2021-09-09' unless defined? ::Appium::Core::DATE
+    VERSION = '5.0.0.rc2' unless defined? ::Appium::Core::VERSION
+    DATE    = '2021-10-01' unless defined? ::Appium::Core::DATE
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib_core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
+  version: 5.0.0.rc2
 platform: ruby
 authors:
 - Kazuaki MATSUO
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement