Merge branch 'trunk' into java-bidi-onNavigationCommitted

Author: navin772

.bazelrc.remote

@@ -31,7 +31,7 @@ build:rbe --disk_cache=
 build:rbe --incompatible_enable_cc_toolchain_resolution
 build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 test:rbe --test_env=DISPLAY=:99.0
-test:rbe --test_tag_filters=-exclusive-if-local,-skip-rbe,-remote
+test:rbe --test_tag_filters=-skip-rbe,-remote
 
 # Env vars we can hard code
 build:rbe --action_env=HOME=/home/dev

.github/label-commenter-config.yml

@@ -122,14 +122,14 @@ labels:
           * 📮 [StackOverflow](https://stackoverflow.com/questions/tagged/selenium)
           * 🗣 Our [IRC/Slack/Matrix channels](https://www.selenium.dev/support/) where the community can help you as well
         action: close
-  - name: help wanted
+  - name: R-help wanted
     labeled:
       issue:
         body: |
           This issue is looking for contributors.
 
           Please comment below or reach out to us through our [IRC/Slack/Matrix channels](https://www.selenium.dev/support/) if you are interested.
-  - name: I-logging
+  - name: J-logging
     labeled:
       issue:
         body: |

.github/workflows/issue-labeler.yml

@@ -181,3 +181,8 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           labels: J-awaiting answer
+      - name: Remove label
+        if: steps.version-check.outputs.is-outdated == 'true'
+        uses: actions-ecosystem/action-remove-labels@v1
+        with:
+          labels: A-needs-triaging

.github/workflows/pre-release.yml

@@ -30,19 +30,21 @@ jobs:
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
-          if git rev-parse --verify release-${{ github.event.inputs.version }} >/dev/null 2>&1; then
-          git branch -D release-${{ github.event.inputs.version }}
+          if git rev-parse --verify release-preparation-${{ github.event.inputs.version }} >/dev/null 2>&1; then
+          git branch -D release-preparation-${{ github.event.inputs.version }}
           fi
-          git checkout -b release-${{ github.event.inputs.version }}
+          git checkout -b release-preparation-${{ github.event.inputs.version }}
       - name: Update Rust Version
         run: |
-          ./go rust:version[${{ github.event.inputs.version }}]
-          ./go rust:version:commit
+          ./go rust:version ${{ github.event.inputs.version }}
+          ./go rust:changelog
+      - name: Commit Rust updates
+        run: git commit -m "update selenium manager version and rust changelog"
       - name: Push changes
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
-          branch: release-${{ github.event.inputs.version }}
+          branch: release-preparation-${{ github.event.inputs.version }}
           force: true
 
   selenium-manager:
@@ -51,7 +53,7 @@ jobs:
     uses: ./.github/workflows/ci-rust.yml
     with:
       release: true
-      branch: release-${{ github.event.inputs.version }}
+      branch: release-preparation-${{ github.event.inputs.version }}
     secrets:
       SELENIUM_CI_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
 
@@ -79,11 +81,11 @@ jobs:
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
       - name: Update browser versions
-        run: ./go update_browsers[${{ github.event.inputs.chrome_channel }}]
+        run: ./go update_browsers ${{ github.event.inputs.chrome_channel }}
       - name: Commit browser updates
         run: git commit -m "update pinned browser versions"
       - name: Update devtools versions
-        run: ./go all:update_cdp[${{ github.event.inputs.chrome_channel }}]
+        run: ./go all:update_cdp ${{ github.event.inputs.chrome_channel }}
       - name: Commit DevTools updates
         run: git commit -m "update devtools versions"
       - name: Update Selenium Manager versions
@@ -99,11 +101,11 @@ jobs:
       - name: Commit Authors updates
         run: git commit -m "update authors file"
       - name: Bump minor version
-        run: ./go all:version
+        run: ./go all:version ${{ github.event.inputs.version }}
       - name: Commit version updates
         run: git commit -m "bump versions in preparation for release"
       - name: Update changelog
-        run: ./go all:changelog
+        run: ./go all:changelogs
       - name: Commit changelog updates
         run: git commit -m "WIP - rough auto-update of changelog, please edit"
       - name: List untracked files

Rakefile

@@ -166,7 +166,7 @@ end
 desc 'Update Selenium Manager to latest release'
 task :update_manager do |_task, _arguments|
   puts 'Updating Selenium Manager references'
-  Bazel.execute('run', args, '//scripts:selenium_manager')
+  Bazel.execute('run', [], '//scripts:selenium_manager')
 
   @git.add('common/selenium_manager.bzl')
 end
@@ -1092,18 +1092,6 @@ namespace :rust do
     @git.add('rust/Cargo.Bazel.lock')
     @git.add('rust/Cargo.lock')
   end
-
-  # Creating a special task for this because Rust version needs to be managed at a different place than
-  # everything else; want to use changelog updates later in process
-  namespace :version do
-    desc 'Commits updates from Rust version changes'
-    task :commit do
-      @git.reset
-      commit!("update Rust version to #{rust_version}",
-              ['rust/BUILD.bazel', 'rust/Cargo.Bazel.lock', 'rust/Cargo.lock', 'rust/Cargo.toml'])
-      commit!('Rust Changelog', ['rust/CHANGELOG.md'])
-    end
-  end
 end
 
 namespace :all do
@@ -1181,6 +1169,7 @@ namespace :all do
     Rake::Task['py:lint'].invoke
   end
 
+  # Example: `./go all:prepare 4.31.0 early-stable`
   desc 'Update everything in preparation for a release'
   task :prepare, [:version, :channel] do |_task, arguments|
     version = arguments[:version]
@@ -1203,10 +1192,9 @@ namespace :all do
     Rake::Task['node:version'].invoke(version)
     Rake::Task['py:version'].invoke(version)
     Rake::Task['dotnet:version'].invoke(version)
-    Rake::Task['rust:version'].invoke(version)
 
     unless version == 'nightly'
-      Rake::Task['all:changelogs']
+      Rake::Task['all:changelogs'].invoke
 
       major_minor = arguments[:version][/^\d+\.\d+/]
       file = '.github/ISSUE_TEMPLATE/bug-report.yml'
@@ -1225,7 +1213,6 @@ namespace :all do
     Rake::Task['node:changelog'].invoke
     Rake::Task['py:changelog'].invoke
     Rake::Task['dotnet:changelog'].invoke
-    Rake::Task['rust:changelog'].invoke
   end
 end
 
@@ -1324,13 +1311,3 @@ def update_changelog(version, language, path, changelog, header)
   File.write(changelog, "#{header}\n#{commits}\n\n#{content}")
   @git.add(changelog)
 end
-
-def commit!(message, files = [], all: false)
-  files.each do |file|
-    puts "adding: #{file}"
-    @git.add(file)
-  end
-  all ? @git.commit_all(message) : @git.commit(message)
-rescue Git::FailedError => e
-  puts e.message
-end

rb/spec/integration/selenium/webdriver/bidi/browsing_context_spec.rb

@@ -81,7 +81,9 @@ class BiDi
           expect(driver.execute_script('return window.devicePixelRatio')).to eq(2.0)
         end
 
-        it 'accepts users prompts without text' do
+        it 'accepts users prompts without text',
+           except: {browser: %i[edge chrome],
+                    reason: 'https://github.com/GoogleChromeLabs/chromium-bidi/issues/3281'} do
           browsing_context = described_class.new(bridge)
 
           driver.navigate.to url_for('alerts.html')
@@ -94,7 +96,9 @@ class BiDi
           expect(driver.title).to eq('Testing Alerts')
         end
 
-        it 'accepts users prompts with text' do
+        it 'accepts users prompts with text',
+           except: {browser: %i[edge chrome],
+                    reason: 'https://github.com/GoogleChromeLabs/chromium-bidi/issues/3281'} do
           browsing_context = described_class.new(bridge)
           driver.navigate.to url_for('alerts.html')
           driver.find_element(id: 'prompt').click
@@ -106,7 +110,8 @@ class BiDi
           expect(driver.title).to eq('Testing Alerts')
         end
 
-        it 'rejects users prompts' do
+        it 'rejects users prompts', except: {browser: %i[edge chrome],
+                                             reason: 'https://github.com/GoogleChromeLabs/chromium-bidi/issues/3281'} do
           browsing_context = described_class.new(bridge)
           driver.navigate.to url_for('alerts.html')
           driver.find_element(id: 'alert').click

rb/spec/integration/selenium/webdriver/fedcm_spec.rb

@@ -22,7 +22,8 @@
 module Selenium
   module WebDriver
     module FedCM
-      describe FedCM, exclusive: [{ bidi: false, reason: 'Not yet implemented with BiDi' }, { browser: %i[chrome edge] }] do
+      describe FedCM,
+               exclusive: [{bidi: false, reason: 'Not yet implemented with BiDi'}, {browser: %i[chrome edge]}] do
         let(:dialog) { driver.fedcm_dialog }
 
         before { driver.get url_for('fedcm/fedcm.html') }
@@ -66,8 +67,8 @@ module FedCM
             expect(dialog.select_account(1)).to be_nil
           end
 
-          it 'clicks the dialog', except: { browser: %i[chrome edge],
-                                            reason: "error: 'Use another account' not supported for this IDP" } do
+          it 'clicks the dialog', except: {browser: %i[chrome edge],
+                                           reason: "error: 'Use another account' not supported for this IDP"} do
             expect(dialog.click).to be_nil
           end