selenium-webdriver 4.8.0 → 4.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd585c8c3f1d0336fe186c7748cc0b473302c5e63f305804e85944764f518961
-  data.tar.gz: ade668c90f35b2624a4e3fe370bead6e7500073c9f1a5fcd6127f08a44c95e30
+  metadata.gz: 9777fa00d3b0216e227ce5194d19da4268b8c7805b27d57782fa33f27d13e66c
+  data.tar.gz: 0c5fa5ecf085aa83a0d2ba6ef690c98a637ee6667656a0e2edb129a2850307a9
 SHA512:
-  metadata.gz: 870ccbc8b1b21afdc53ef1853e0ba19eba366ed0e42552ff442496554e6545a5d73c7450f53d0cfc555d6c8e5487a600f7b4391ed8b0ac1202c467153f86c6d9
-  data.tar.gz: 16034330349a65c5419cc014239d980e518cf9793d2bc24514686eb1ba35b18c818c7626467299f78bbc2b5eaf7863f61c82904787f2e4e97d50e056cd4fe5f5
+  metadata.gz: d10526d84df80cd437990f38cb9b4445b19c67141115ba53ae5b300d668f5e8ef87f11b8efa70b231535bc817d2d276e21e83c70564fed3165a6627a08a17abe
+  data.tar.gz: 9175b92a1ca431f2ffde1d1005c2a6e712c7a2c0808c58581f51a440d33e3307fd1693ae8fd098571ddd68d8bc06d5257e9ec3467b071758a25db9aab990232e

data/CHANGES

@@ -1,4 +1,16 @@
-4.8.0 (Unreleased)
+4.8.1 (2023-02-17)
+=========================
+Ruby:
+  * Fix autoload of WebDriver::Remote::Bridge::COMMANDS
+  * Subclass is setting value before the superclass is setting it to nil
+  * Updating Selenium Manager binaries for 4.8.1 release
+
+BiDi:
+  * Released selenium-devtools 0.110.0 (supports CDP v85, v108, v109, v110)
+  * Close BiDi session on closing the last top-level browsing context
+  * Add filtering capability to LogInspector
+
+4.8.0 (2023-01-23)
 =========================
 Ruby:
   * Allow updating instance variables on service classes

data/lib/selenium/webdriver/bidi/log/filter_by.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you 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 Selenium
+  module WebDriver
+    class BiDi
+      class FilterBy
+        attr_accessor :level
+
+        def initialize(level)
+          @level = level
+        end
+
+        def self.log_level(level = nil)
+          unless %w[debug error info warning].include?(level)
+            raise Error::WebDriverError,
+                  "Valid log levels are 'debug', 'error', 'info' and 'warning'. Received: #{level}"
+          end
+          FilterBy.new(level)
+        end
+      end # FilterBy
+    end # BiDi
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/bidi/log_inspector.rb

@@ -23,6 +23,7 @@ require_relative 'log/base_log_entry'
 require_relative 'log/generic_log_entry'
 require_relative 'log/console_log_entry'
 require_relative 'log/javascript_log_entry'
+require_relative 'log/filter_by'
 
 module Selenium
   module WebDriver
@@ -49,43 +50,41 @@ module Selenium
           @bidi.session.subscribe('log.entryAdded', browsing_context_ids)
         end
 
-        def on_console_entry(&block)
-          enabled = log_listeners[:console].any?
-          log_listeners[:console] << block
-          return if enabled
+        def on_console_entry(filter_by = nil, &block)
+          check_valid_filter(filter_by)
 
           on_log do |params|
             type = params['type']
-            console_log_events(params) if type.eql?('console')
+            console_log_events(params, filter_by, &block) if type.eql?('console')
           end
         end
 
-        def on_javascript_log(&block)
-          enabled = log_listeners[:javascript].any?
-          log_listeners[:javascript] << block
-          return if enabled
+        def on_javascript_log(filter_by = nil, &block)
+          check_valid_filter(filter_by)
 
           on_log do |params|
             type = params['type']
-            javascript_log_events(params) if type.eql?('javascript')
+            javascript_log_events(params, filter_by, &block) if type.eql?('javascript')
           end
         end
 
         def on_javascript_exception(&block)
-          enabled = log_listeners[:js_exception].any?
-          log_listeners[:js_exception] << block
-          log_listeners[:javascript] << block
-          return if enabled
-
           on_log do |params|
             type = params['type']
-            level = params['level']
-
-            javascript_log_events(params) if type.eql?('javascript') && level.eql?(LOG_LEVEL[:ERROR])
+            javascript_log_events(params, FilterBy.log_level('error'), &block) if type.eql?('javascript')
           end
         end
 
-        def on_log(&block)
+        def on_log(filter_by = nil, &block)
+          unless filter_by.nil?
+            check_valid_filter(filter_by)
+
+            on(:entry_added) do |params|
+              yield(params) if params['level'] == filter_by.level
+            end
+            return
+          end
+
           on(:entry_added, &block)
         end
 
@@ -96,11 +95,13 @@ module Selenium
           @bidi.callbacks["log.#{event}"] << block
         end
 
-        def log_listeners
-          @log_listeners ||= Hash.new { |listeners, kind| listeners[kind] = [] }
+        def check_valid_filter(filter_by)
+          return if filter_by.nil? || filter_by.instance_of?(FilterBy)
+
+          raise "Pass valid FilterBy object. Received: #{filter_by.inspect}"
         end
 
-        def console_log_events(params)
+        def console_log_events(params, filter_by)
           event = ConsoleLogEntry.new(
             level: params['level'],
             text: params['text'],
@@ -111,12 +112,16 @@ module Selenium
             args: params['args'],
             stack_trace: params['stackTrace']
           )
-          log_listeners[:console].each do |listener|
-            listener.call(event)
+
+          unless filter_by.nil?
+            yield(event) if params['level'] == filter_by.level
+            return
           end
+
+          yield(event)
         end
 
-        def javascript_log_events(params)
+        def javascript_log_events(params, filter_by)
           event = JavascriptLogEntry.new(
             level: params['level'],
             text: params['text'],
@@ -124,15 +129,13 @@ module Selenium
             type: params['type'],
             stack_trace: params['stackTrace']
           )
-          log_listeners[:javascript].each do |listener|
-            listener.call(event)
-          end
 
-          return unless params['level'].eql?(LOG_LEVEL[:ERROR])
-
-          log_listeners[:js_exception].each do |listener|
-            listener.call(event)
+          unless filter_by.nil?
+            yield(event) if params['level'] == filter_by.level
+            return
           end
+
+          yield(event)
         end
       end # LogInspector
     end # Bidi

data/lib/selenium/webdriver/bidi.rb

@@ -37,7 +37,7 @@ module Selenium
       end
 
       def session
-        Session.new(self)
+        @session ||= Session.new(self)
       end
 
       def send_cmd(method, **params)

data/lib/selenium/webdriver/common/driver.rb

@@ -69,8 +69,8 @@ module Selenium
       #
 
       def initialize(bridge: nil, listener: nil, **opts)
-        @service_manager = nil
         @devtools = nil
+        @bidi = nil
         bridge ||= create_bridge(**opts)
         add_extensions(bridge.browser)
         @bridge = listener ? Support::EventFiringBridge.new(bridge, listener) : bridge
@@ -174,6 +174,7 @@ module Selenium
       ensure
         @service_manager&.stop
         @devtools&.close
+        @bidi&.close
       end
 
       #
@@ -181,7 +182,10 @@ module Selenium
       #
 
       def close
-        bridge.close
+        # If no top-level browsing contexts are open after calling close,
+        # it indicates that the WebDriver session is closed.
+        # If the WebDriver session is closed, the BiDi session also needs to be closed.
+        bridge.close.tap { |handles| @bidi&.close if handles&.empty? }
       end
 
       #

data/lib/selenium/webdriver/remote/bridge.rb

@@ -21,6 +21,7 @@ module Selenium
   module WebDriver
     module Remote
       class Bridge
+        autoload :COMMANDS, 'selenium/webdriver/remote/bridge/commands'
         include Atoms
 
         PORT = 4444

data/lib/selenium/webdriver/remote.rb

@@ -27,7 +27,6 @@ module Selenium
       autoload :Driver,       'selenium/webdriver/remote/driver'
       autoload :Response,     'selenium/webdriver/remote/response'
       autoload :Capabilities, 'selenium/webdriver/remote/capabilities'
-      autoload :COMMANDS,     'selenium/webdriver/remote/commands'
 
       module Http
         autoload :Common,  'selenium/webdriver/remote/http/common'

data/lib/selenium/webdriver/version.rb

@@ -19,6 +19,6 @@
 
 module Selenium
   module WebDriver
-    VERSION = '4.8.0'
+    VERSION = '4.8.1'
   end # WebDriver
 end # Selenium

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-webdriver
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.8.1
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml
@@ -225,6 +225,7 @@ files:
 - lib/selenium/webdriver/bidi/browsing_context_info.rb
 - lib/selenium/webdriver/bidi/log/base_log_entry.rb
 - lib/selenium/webdriver/bidi/log/console_log_entry.rb
+- lib/selenium/webdriver/bidi/log/filter_by.rb
 - lib/selenium/webdriver/bidi/log/generic_log_entry.rb
 - lib/selenium/webdriver/bidi/log/javascript_log_entry.rb
 - lib/selenium/webdriver/bidi/log_inspector.rb
@@ -352,8 +353,8 @@ files:
 - lib/selenium/webdriver/ie/service.rb
 - lib/selenium/webdriver/remote.rb
 - lib/selenium/webdriver/remote/bridge.rb
+- lib/selenium/webdriver/remote/bridge/commands.rb
 - lib/selenium/webdriver/remote/capabilities.rb
-- lib/selenium/webdriver/remote/commands.rb
 - lib/selenium/webdriver/remote/driver.rb
 - lib/selenium/webdriver/remote/http/common.rb
 - lib/selenium/webdriver/remote/http/curb.rb