Merge branch 'trunk' into java_cookie

Author: VietND96

java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java

@@ -20,7 +20,6 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
 
-import java.util.Collections;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WindowType;
@@ -42,8 +41,7 @@ void shouldNotCloseBiDiSessionIfOneWindowIsClosed() {
 
     BiDi biDi = driver.getBiDi();
 
-    BiDiSessionStatus status =
-        biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
+    BiDiSessionStatus status = biDi.getBidiSessionStatus();
     assertThat(status).isNotNull();
     assertThat(status.getMessage()).isEqualTo("Session already started");
 
@@ -53,8 +51,7 @@ void shouldNotCloseBiDiSessionIfOneWindowIsClosed() {
 
     driver.close();
 
-    BiDiSessionStatus statusAfterClosing =
-        biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
+    BiDiSessionStatus statusAfterClosing = biDi.getBidiSessionStatus();
     assertThat(statusAfterClosing).isNotNull();
     assertThat(status.getMessage()).isEqualTo("Session already started");
     driver.quit();
@@ -70,19 +67,14 @@ void shouldCloseBiDiSessionIfLastWindowIsClosed() {
 
     BiDi biDi = driver.getBiDi();
 
-    BiDiSessionStatus status =
-        biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
+    BiDiSessionStatus status = biDi.getBidiSessionStatus();
     assertThat(status).isNotNull();
     assertThat(status.getMessage()).isEqualTo("Session already started");
 
     driver.close();
 
     // Closing the last top-level browsing context, closes the WebDriver and BiDi session
     assertThatExceptionOfType(WebDriverException.class)
-        .isThrownBy(
-            () ->
-                biDi.send(
-                    new Command<>(
-                        "session.status", Collections.emptyMap(), BiDiSessionStatus.class)));
+        .isThrownBy(() -> biDi.getBidiSessionStatus());
   }
 }

java/test/org/openqa/selenium/bidi/BiDiSessionTest.java

@@ -19,7 +19,6 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-import java.util.Collections;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.testing.JupiterTestBase;
 
@@ -29,8 +28,7 @@ class BiDiSessionTest extends JupiterTestBase {
   void shouldBeAbleToCreateABiDiSession() {
     BiDi biDi = ((HasBiDi) driver).getBiDi();
 
-    BiDiSessionStatus status =
-        biDi.send(new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
+    BiDiSessionStatus status = biDi.getBidiSessionStatus();
     assertThat(status).isNotNull();
     assertThat(status.getMessage()).isNotEmpty();
   }

java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java

@@ -21,7 +21,6 @@
 import static org.openqa.selenium.testing.drivers.Browser.*;
 
 import java.io.StringReader;
-import java.util.Collections;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -37,7 +36,6 @@
 import org.openqa.selenium.WindowType;
 import org.openqa.selenium.bidi.BiDi;
 import org.openqa.selenium.bidi.BiDiSessionStatus;
-import org.openqa.selenium.bidi.Command;
 import org.openqa.selenium.bidi.HasBiDi;
 import org.openqa.selenium.bidi.browsingcontext.BrowsingContext;
 import org.openqa.selenium.bidi.browsingcontext.NavigationResult;
@@ -89,9 +87,7 @@ void setup() {
   @NotYetImplemented(EDGE)
   void ensureBiDiSessionCreation() {
     try (BiDi biDi = ((HasBiDi) driver).getBiDi()) {
-      BiDiSessionStatus status =
-          biDi.send(
-              new Command<>("session.status", Collections.emptyMap(), BiDiSessionStatus.class));
+      BiDiSessionStatus status = biDi.getBidiSessionStatus();
       assertThat(status).isNotNull();
       assertThat(status.getMessage()).isNotEmpty();
     }

py/selenium/webdriver/common/log.py

@@ -90,7 +90,7 @@ async def mutation_events(self) -> AsyncGenerator[Dict[str, Any], None]:
             yield event
 
         payload = json.loads(evnt.value.payload)
-        elements: list = self.driver.find_elements(By.CSS_SELECTOR, f"*[data-__webdriver_id={payload['target']}]")
+        elements: list = self.driver.find_elements(By.CSS_SELECTOR, f"*[data-__webdriver_id=\"{payload['target']}\"]")
         if not elements:
             elements.append(None)
         event["element"] = elements[0]

rb/spec/integration/selenium/webdriver/action_builder_spec.rb

@@ -44,8 +44,8 @@ module WebDriver
           input = driver.find_element(css: '#working')
 
           driver.action.send_keys(input, 'abcd').perform
-          wait.until { input.attribute(:value).length == 4 }
-          expect(input.attribute(:value)).to eq('abcd')
+          wait.until { input.property(:value).length == 4 }
+          expect(input.property(:value)).to eq('abcd')
         end
 
         it 'sends keys with multiple arguments' do
@@ -55,8 +55,8 @@ module WebDriver
           input.click
 
           driver.action.send_keys('abcd', 'dcba').perform
-          wait.until { input.attribute(:value).length == 8 }
-          expect(input.attribute(:value)).to eq('abcddcba')
+          wait.until { input.property(:value).length == 8 }
+          expect(input.property(:value)).to eq('abcddcba')
         end
 
         it 'sends non-ASCII keys' do
@@ -66,8 +66,8 @@ module WebDriver
           input.click
 
           driver.action.send_keys('abcd', :left, 'a').perform
-          wait.until { input.attribute(:value).length == 5 }
-          expect(input.attribute(:value)).to eq('abcad')
+          wait.until { input.property(:value).length == 5 }
+          expect(input.property(:value)).to eq('abcad')
         end
       end
 
@@ -81,9 +81,9 @@ module WebDriver
           event_input.click
 
           driver.action.key_down(:shift).send_keys('ab').key_up(:shift).perform
-          wait.until { event_input.attribute(:value).length == 2 }
+          wait.until { event_input.property(:value).length == 2 }
 
-          expect(event_input.attribute(:value)).to eq('AB')
+          expect(event_input.property(:value)).to eq('AB')
           expected = keylogger.text.strip
           expect(expected).to match(/^(focus )?keydown keydown keypress keyup keydown keypress keyup keyup$/)
         end
@@ -131,10 +131,10 @@ module WebDriver
           event_input = driver.find_element(id: 'clickField')
 
           driver.action.click_and_hold(event_input).perform
-          expect(event_input.attribute(:value)).to eq('Hello')
+          expect(event_input.property(:value)).to eq('Hello')
 
           driver.action.release_actions
-          expect(event_input.attribute(:value)).to eq('Clicked')
+          expect(event_input.property(:value)).to eq('Clicked')
         end
       end
 
@@ -143,24 +143,27 @@ module WebDriver
           driver.navigate.to url_for('javascriptPage.html')
           element = driver.find_element(id: 'clickField')
           driver.action.click(element).perform
-          expect(element.attribute(:value)).to eq('Clicked')
+          expect(element.property(:value)).to eq('Clicked')
         end
 
         it 'executes with equivalent pointer methods' do
           driver.navigate.to url_for('javascriptPage.html')
           element = driver.find_element(id: 'clickField')
           driver.action.move_to(element).pointer_down(:left).pointer_up(:left).perform
-          expect(element.attribute(:value)).to eq('Clicked')
+          expect(element.property(:value)).to eq('Clicked')
         end
       end
 
       describe '#double_click' do
+        # https://issues.chromium.org/issues/400087471
+        before { reset_driver! if GlobalTestEnv.rbe? && GlobalTestEnv.browser == :chrome }
+
         it 'presses pointer twice', except: {browser: %i[safari safari_preview]} do
           driver.navigate.to url_for('javascriptPage.html')
           element = driver.find_element(id: 'doubleClickField')
 
           driver.action.double_click(element).perform
-          expect(element.attribute(:value)).to eq('DoubleClicked')
+          expect(element.property(:value)).to eq('DoubleClicked')
         end
 
         it 'executes with equivalent pointer methods', except: {browser: %i[safari safari_preview]} do
@@ -171,7 +174,7 @@ module WebDriver
                 .pointer_down(:left).pointer_up(:left)
                 .pointer_down(:left).pointer_up(:left)
                 .perform
-          expect(element.attribute(:value)).to eq('DoubleClicked')
+          expect(element.property(:value)).to eq('DoubleClicked')
         end
       end
 
@@ -181,15 +184,15 @@ module WebDriver
           element = driver.find_element(id: 'doubleClickField')
 
           driver.action.context_click(element).perform
-          expect(element.attribute(:value)).to eq('ContextClicked')
+          expect(element.property(:value)).to eq('ContextClicked')
         end
 
         it 'executes with equivalent pointer methods' do
           driver.navigate.to url_for('javascriptPage.html')
           element = driver.find_element(id: 'doubleClickField')
 
           driver.action.move_to(element).pointer_down(:right).pointer_up(:right).perform
-          expect(element.attribute(:value)).to eq('ContextClicked')
+          expect(element.property(:value)).to eq('ContextClicked')
         end
       end
 
@@ -199,7 +202,7 @@ module WebDriver
           element = driver.find_element(id: 'clickField')
           driver.action.move_to(element).click.perform
 
-          expect(element.attribute(:value)).to eq('Clicked')
+          expect(element.property(:value)).to eq('Clicked')
         end
 
         it 'moves to element with offset' do
@@ -212,7 +215,7 @@ module WebDriver
           y_offset = (destination_rect.y - origin_rect.y).ceil
 
           driver.action.move_to(origin, x_offset, y_offset).click.perform
-          expect(destination.attribute(:value)).to eq('Clicked')
+          expect(destination.property(:value)).to eq('Clicked')
         end
       end
 
@@ -256,7 +259,7 @@ module WebDriver
           rect = element.rect
           driver.action.move_to_location(rect.x.ceil, rect.y.ceil).click.perform
 
-          expect(element.attribute(:value)).to eq('Clicked')
+          expect(element.property(:value)).to eq('Clicked')
         end
       end
 

rb/spec/integration/selenium/webdriver/driver_spec.rb

@@ -22,9 +22,11 @@
 module Selenium
   module WebDriver
     describe Driver, exclusive: {bidi: false, reason: 'Not yet implemented with BiDi'} do
+      after { reset_driver! if GlobalTestEnv.rbe? && GlobalTestEnv.browser == :chrome }
+
       it_behaves_like 'driver that can be started concurrently', exclude: [
         {browser: %i[safari safari_preview]},
-        {browser: :firefox, rbe: true, reason: 'https://github.com/mozilla/geckodriver/issues/2219'},
+        {browser: :firefox, reason: 'https://github.com/SeleniumHQ/selenium/issues/15451'},
         {driver: :remote, rbe: true, reason: 'Cannot start 2+ drivers at once.'}
       ]
 
@@ -60,8 +62,7 @@ module WebDriver
 
       it 'refreshes the page' do
         driver.navigate.to url_for('javascriptPage.html')
-        sleep 1 # javascript takes too long to load
-        driver.find_element(id: 'updatediv').click
+        short_wait { driver.find_element(id: 'updatediv') }.click
         expect(driver.find_element(id: 'dynamo').text).to eq('Fish and chips!')
         driver.navigate.refresh
         wait_for_element(id: 'dynamo')

rb/spec/integration/selenium/webdriver/manager_spec.rb

@@ -25,7 +25,13 @@ module WebDriver
       describe 'cookie management' do
         before { driver.navigate.to url_for('xhtmlTest.html') }
 
-        after { driver.manage.delete_all_cookies }
+        after do
+          if GlobalTestEnv.rbe? && GlobalTestEnv.browser == :chrome
+            reset_driver!
+          else
+            driver.manage.delete_all_cookies
+          end
+        end
 
         it 'sets correct defaults' do
           driver.manage.add_cookie name: 'default',

rb/spec/integration/selenium/webdriver/select_spec.rb

@@ -29,6 +29,7 @@ module Support
         let(:multi_disabled) { described_class.new(driver.find_element(name: 'multi_disabled')) }
 
         before { driver.navigate.to url_for('formPage.html') }
+        after { reset_driver! if GlobalTestEnv.rbe? && GlobalTestEnv.browser == :chrome }
 
         describe '#initialize' do
           it 'raises exception if not a select element' do

rb/spec/integration/selenium/webdriver/target_locator_spec.rb

@@ -25,11 +25,15 @@ module WebDriver
       before { @original_window = driver.window_handle }
 
       after do
-        handles = driver.window_handles
-        driver.switch_to.window(@original_window) if handles.include?(@original_window)
-
-        (handles - [driver.window_handle]).each do |handle|
-          driver.switch_to.window(handle) { driver.close }
+        if GlobalTestEnv.rbe? && GlobalTestEnv.browser == :chrome
+          reset_driver!
+        else
+          handles = driver.window_handles
+          driver.switch_to.window(@original_window) if handles.include?(@original_window)
+
+          (handles - [driver.window_handle]).each do |handle|
+            driver.switch_to.window(handle) { driver.close }
+          end
         end
       end
 
@@ -325,8 +329,6 @@ module WebDriver
         end
 
         describe 'unhandled alert error' do
-          after { |example| reset_driver!(example: example) }
-
           it 'raises an UnexpectedAlertOpenError if an alert has not been dealt with' do
             driver.navigate.to url_for('alerts.html')
             driver.find_element(id: 'alert').click

scripts/remote-image/Dockerfile

@@ -1,5 +1,5 @@
 # Our images must be for Linux x86_64
-FROM --platform=linux/amd64 ubuntu:focal@sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b
+FROM --platform=linux/amd64 ubuntu:jammy@sha256:ed1544e454989078f5dec1bfdabd8c5cc9c48e0705d07b678ab6ae3fb61952d2
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -11,7 +11,7 @@ RUN apt-get -qqy update && \
       libnet1 \
       libzip-dev \
       linux-libc-dev \
-      python3.9 \
+      python3.10 \
       python-is-python3 \
       zip \
       zlib1g && \