Merge branch 'SeleniumHQ:trunk' into py-stop-session-not-created

Author: cgoldberg

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -35,13 +35,14 @@ body:
       label: Debugging Logs
       placeholder: |
         Note: the stack trace should be in the explanation section above
-        Instructions for enabling logging can be found in the link below
+        Instructions for enabling and referencing logs can be found in the links below
       render: logs
   - type: markdown
     id: link
     attributes:
       value: |
         **Read our [logging documentation](https://www.selenium.dev/documentation/webdriver/troubleshooting/logging/)**
+        **Link to a [gist](https://gist.github.com/) if logs are too long**
          
 
         ## Help us Address Your Issue Faster!

rb/.rubocop.yml

@@ -1,22 +1,14 @@
-require:
-  - rubocop-rake
-  - rubocop-rspec
-
 plugins:
   - rubocop-performance
+  - rubocop-rake
+  - rubocop-rspec
 
 AllCops:
   TargetRubyVersion: 3.1
   NewCops: enable
   Exclude:
     - !ruby/regexp /lib\/selenium\/devtools\/v\d+/
 
-Capybara/RSpec/PredicateMatcher:
-  Enabled: false
-
-FactoryBot/CreateList:
-  Enabled: false
-
 Gemspec/DevelopmentDependencies:
   EnforcedStyle: gemspec
 
@@ -155,10 +147,8 @@ Style/OptionalBooleanParameter:
   Enabled: false
 
 Lint/Debugger:
-  Enabled: true
-  DebuggerMethods:
-    Capybara:
-      - save_screenshot: ~
+  IgnoredMethods:
+    - save_screenshot
 
 Lint/UselessConstantScoping:
   Enabled: false

rb/Gemfile.lock

@@ -134,25 +134,16 @@ GEM
     rubocop-ast (1.44.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
-    rubocop-capybara (2.22.1)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-factory_bot (2.27.1)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
     rubocop-performance (1.25.0)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (2.31.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.29.1)
-      rubocop (~> 1.61)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
     rubyzip (2.4.1)
     securerandom (0.4.1)
@@ -209,10 +200,10 @@ DEPENDENCIES
   rack (~> 2.0)
   rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop (~> 1.60, >= 1.60.2)
-  rubocop-performance (~> 1.15)
-  rubocop-rake (~> 0.6.0)
-  rubocop-rspec (~> 2.16)
+  rubocop (~> 1.75)
+  rubocop-performance (~> 1.25)
+  rubocop-rake (~> 0.7)
+  rubocop-rspec (~> 3.5)
   selenium-devtools!
   selenium-webdriver!
   steep (~> 1.5.0)

rb/lib/selenium/webdriver/common/options.rb

@@ -52,7 +52,7 @@ def safari(**opts)
         end
 
         def set_capabilities
-          (W3C_OPTIONS + self::CAPABILITIES.keys).each do |key|
+          (W3C_OPTIONS + GRID_OPTIONS + self::CAPABILITIES.keys).each do |key|
             next if method_defined? key
 
             define_method key do

rb/lib/selenium/webdriver/support/guards.rb

@@ -40,7 +40,7 @@ def initialize(example, bug_tracker: '', conditions: nil)
         def add_condition(name, condition = false, &block)
           condition = false if condition.nil?
           @guard_conditions << GuardCondition.new(name, condition, &block)
-          WebDriver.logger.info "Running with Guard '#{name}' set to: #{condition}"
+          WebDriver.logger.debug "Running with Guard '#{name}' set to: #{condition}"
         end
 
         def add_message(name, message)

rb/selenium-webdriver.gemspec

@@ -59,10 +59,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack', ['~> 2.0']
   s.add_development_dependency 'rake', ['~> 13.0']
   s.add_development_dependency 'rspec', ['~> 3.0']
-  s.add_development_dependency 'rubocop', ['~> 1.60', '>=1.60.2']
-  s.add_development_dependency 'rubocop-performance', ['~> 1.15']
-  s.add_development_dependency 'rubocop-rake', ['~> 0.6.0']
-  s.add_development_dependency 'rubocop-rspec', ['~> 2.16']
+  s.add_development_dependency 'rubocop', ['~> 1.75']
+  s.add_development_dependency 'rubocop-performance', ['~> 1.25']
+  s.add_development_dependency 'rubocop-rake', ['~> 0.7']
+  s.add_development_dependency 'rubocop-rspec', ['~> 3.5']
   s.add_development_dependency 'webmock', ['~> 3.5']
   s.add_development_dependency 'webrick', ['~> 1.7']
   s.add_development_dependency 'yard', ['~> 0.9.11', '>= 0.9.36']

rb/spec/unit/selenium/webdriver/common/print_options_spec.rb

@@ -17,42 +17,40 @@
 # specific language governing permissions and limitations
 # under the License.
 
-
 require File.expand_path('../spec_helper', __dir__)
 require 'selenium/webdriver/common/print_options'
 
-
 module Selenium
   module WebDriver
     describe PrintOptions do
-      let(:options) { PrintOptions.new }
+      let(:options) { described_class.new }
 
       it 'has default values' do
         expect(options.orientation).to eq('portrait')
         expect(options.scale).to eq(1.0)
         expect(options.background).to be(false)
-        expect(options.page_size).to eq({ width: 21.0, height: 29.7 })
-        expect(options.margins).to eq({ top: 1.0, bottom: 1.0, left: 1.0, right: 1.0 })
+        expect(options.page_size).to eq({width: 21.0, height: 29.7})
+        expect(options.margins).to eq({top: 1.0, bottom: 1.0, left: 1.0, right: 1.0})
       end
 
       it 'can set custom page size' do
-        custom_size = { width: 25.0, height: 30.0 }
+        custom_size = {width: 25.0, height: 30.0}
         options.page_size = custom_size
         expect(options.page_size).to eq(custom_size)
       end
 
       it 'can set predefined page sizes using symbols' do
         options.page_size = :a4
-        expect(options.page_size).to eq({ width: 21.0, height: 29.7 })
+        expect(options.page_size).to eq({width: 21.0, height: 29.7})
 
         options.page_size = :legal
-        expect(options.page_size).to eq({ width: 21.59, height: 35.56 })
+        expect(options.page_size).to eq({width: 21.59, height: 35.56})
 
         options.page_size = :tabloid
-        expect(options.page_size).to eq({ width: 27.94, height: 43.18 })
+        expect(options.page_size).to eq({width: 27.94, height: 43.18})
 
         options.page_size = :letter
-        expect(options.page_size).to eq({ width: 21.59, height: 27.94 })
+        expect(options.page_size).to eq({width: 21.59, height: 27.94})
       end
 
       it 'raises an error for unsupported predefined page size symbols' do