Merge branch 'trunk' into remove-unused-import

Author: noritaka1166

.github/workflows/js-examples.yml

@@ -119,7 +119,7 @@ jobs:
       uses: nick-invision/[email protected]
       with:
         timeout_minutes: 20
-        max_attempts: 3
+        max_attempts: 2
         command: |
           cd examples/javascript
           npm test

.github/workflows/ruby-examples.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: 3.2
           bundler-cache: true
       - name: Install Gems Nightly non-Windows
         if: matrix.release == 'nightly' && matrix.os != 'windows'
@@ -119,7 +119,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: 3.2
           bundler-cache: true
       - name: Install dependencies
         working-directory: ./examples/ruby

examples/javascript/package-lock.json

@@ -8,7 +8,7 @@
     "license": "Apache-2.0",
     "dependencies": {
         "assert": "2.1.0",
-        "selenium-webdriver": "4.32.0"
+        "selenium-webdriver": "4.33.0"
     },
     "devDependencies": {
         "mocha": "11.2.2"

examples/javascript/package.json

@@ -1,4 +1,4 @@
-const {By, Origin, Builder} = require('selenium-webdriver');
+const {By, Origin, Builder, until } = require('selenium-webdriver');
 const assert = require('assert');
 
 describe('Mouse move by offset', function () {
@@ -16,7 +16,7 @@ describe('Mouse move by offset', function () {
     const actions = driver.actions({async: true});
     await actions.move({x: 8, y: 0, origin: mouseTracker}).perform();
 
-    await driver.sleep(500);
+    await driver.wait(until.elementTextContains(await driver.findElement(By.id('relative-location')), ","), 2000);
     let result = await driver.findElement(By.id('relative-location')).getText();
     result = result.split(', ');
     assert.deepStrictEqual((Math.abs(parseInt(result[0]) - 100 - 8) < 2), true)

examples/javascript/test/actionsApi/mouse/moveByOffset.spec.js

@@ -114,7 +114,7 @@ describe('Browsing Context Inspector', function () {
 
     assert.equal(contextInfo.id, windowHandle)
     assert.equal(contextInfo.url, 'about:blank')
-    assert.equal(contextInfo.children, null)
+    assert.equal(contextInfo.children.length, 0)
     assert.equal(contextInfo.parentBrowsingContext, null)
   })
 })

examples/javascript/test/bidirectional/browsingContextInspector.spec.js

@@ -33,7 +33,7 @@ describe('Input module', function () {
 
     let resultElement = await driver.findElement(By.id('result'))
     await resultElement.getText().then(function (text) {
-      assert(text.includes('oquefort parmigiano cheddar'))
+      assert(text.includes('oquefort parmigiano cheddar'), `text is: ${text}`)
     })
   })
 

examples/javascript/test/bidirectional/input.spec.js

@@ -20,17 +20,17 @@ describe('Network events', function () {
   })
 
   it('can listen to event before request is sent', async function () {
-    let beforeRequestEvent = null
+    let beforeRequestEvent = []
     const network = await Network(driver)
     await network.beforeRequestSent(function (event) {
-      beforeRequestEvent = event
+      beforeRequestEvent.push(event)
     })
 
     await driver.get('https://www.selenium.dev/selenium/web/blank.html')
 
-    assert.equal(beforeRequestEvent.request.method, 'GET')
-    const url = beforeRequestEvent.request.url
-    assert.equal(url, await driver.getCurrentUrl())
+    const currentUrl = await driver.getCurrentUrl()
+    const currentUrlFound = beforeRequestEvent.some(event => event.request.url.includes(currentUrl))
+    assert(currentUrlFound, `${currentUrl} was not requested`)
   })
 
   it('can request cookies', async function () {
@@ -50,8 +50,6 @@ describe('Network events', function () {
     assert.equal(beforeRequestEvent.request.method, 'GET')
     assert.equal(beforeRequestEvent.request.cookies[0].name, 'north')
     assert.equal(beforeRequestEvent.request.cookies[0].value.value, 'biryani')
-    const url = beforeRequestEvent.request.url
-    assert.equal(url, await driver.getCurrentUrl())
 
     await driver.manage().addCookie({
       name: 'south',
@@ -70,13 +68,14 @@ describe('Network events', function () {
       beforeRequestEvent.push(event)
     })
 
-    await driver.get('http://www.selenium.dev/selenium/web/bidi/redirected_http_equiv.html')
+    await driver.get('https://www.selenium.dev/selenium/web/bidi/redirected_http_equiv.html')
     await driver.wait(until.urlContains('redirected.html'), 1000)
 
     assert.equal(beforeRequestEvent[0].request.method, 'GET')
-    assert(beforeRequestEvent[0].request.url.includes('redirected_http_equiv.html'))
-    assert.equal(beforeRequestEvent[2].request.method, 'GET')
-    assert(beforeRequestEvent[3].request.url.includes('redirected.html'))
+    let redirectedFound = beforeRequestEvent.some(event => event.request.url.includes('redirected.html'))
+    assert(redirectedFound, 'redirected.html was not requested')
+    redirectedFound = beforeRequestEvent.some(event => event.request.url.includes('redirected_http_equiv.html'))
+    assert(redirectedFound, 'redirected_http_equiv.html was not requested')
   })
 
   it('can subscribe to response started', async function () {

examples/javascript/test/bidirectional/network_events.spec.js

@@ -27,7 +27,7 @@ describe('Service Test', function () {
 
     options.setChromeBinaryPath(browserPath)
 
-    let service = new Chrome.ServiceBuilder().setPath(driverPath)
+    let service = new Chrome.ServiceBuilder(driverPath)
 
     let driver = new Builder()
         .forBrowser(Browser.CHROME)
@@ -50,4 +50,4 @@ describe('Service Test', function () {
     await driver.get('https://www.selenium.dev/selenium/web/blank.html');
     await driver.quit();
   });
-});
+});

examples/javascript/test/drivers/service.spec.js

@@ -1,5 +1,6 @@
 
 const {Browser, Builder} = require("selenium-webdriver");
+const assert = require('assert')
 
 
 describe('Cookies', function() {
@@ -36,7 +37,7 @@ describe('Cookies', function() {
 
     // Get cookie details with named cookie 'foo'
     await driver.manage().getCookie('foo').then(function(cookie) {
-      console.log('cookie details => ', cookie);
+      assert.equal(cookie.value, 'bar');
     });
   });
 
@@ -49,7 +50,7 @@ describe('Cookies', function() {
 
     // Get all Available cookies
     await driver.manage().getCookies().then(function(cookies) {
-      console.log('cookie details => ', cookies);
+      assert.equal(cookies.filter(cookie => cookie.name.startsWith('test')).length, 2);
     });
   });
 
@@ -65,7 +66,7 @@ describe('Cookies', function() {
 
     // Get all Available cookies
     await driver.manage().getCookies().then(function(cookies) {
-      console.log('cookie details => ', cookies);
+      assert.equal(cookies.filter(cookie => cookie.name.startsWith('test')).length, 1);
     });
   });
 
@@ -79,4 +80,4 @@ describe('Cookies', function() {
     // Delete all cookies
     await driver.manage().deleteAllCookies();
   });
-});
+});