Skip to content

Commit 5f5285a

Browse files
Update dependency selenium-webdriver to v4.33.0 (#2316)
* Update dependency selenium-webdriver to v4.33.0 * Using Ruby 3.2 in GitHub Actions * Reducing number of retries * Fixing assertion * Adding new jar version * Making assertions more solid * Fixing lines of code * Debugging tests * Debugging tests * Debugging tests * Fixing test assertions and removing debug messages * Using already downloaded jar and waiting for uploaded files to show up * Linting code --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Diego Molina <[email protected]>
1 parent 2f721a5 commit 5f5285a

File tree

18 files changed

+47
-48
lines changed

18 files changed

+47
-48
lines changed

.github/workflows/js-examples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
uses: nick-invision/[email protected]
120120
with:
121121
timeout_minutes: 20
122-
max_attempts: 3
122+
max_attempts: 2
123123
command: |
124124
cd examples/javascript
125125
npm test

.github/workflows/ruby-examples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Set up Ruby
5252
uses: ruby/setup-ruby@v1
5353
with:
54-
ruby-version: 3.1
54+
ruby-version: 3.2
5555
bundler-cache: true
5656
- name: Install Gems Nightly non-Windows
5757
if: matrix.release == 'nightly' && matrix.os != 'windows'
@@ -119,7 +119,7 @@ jobs:
119119
- name: Set up Ruby
120120
uses: ruby/setup-ruby@v1
121121
with:
122-
ruby-version: 3.1
122+
ruby-version: 3.2
123123
bundler-cache: true
124124
- name: Install dependencies
125125
working-directory: ./examples/ruby

examples/javascript/package-lock.json

Lines changed: 7 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/javascript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"license": "Apache-2.0",
99
"dependencies": {
1010
"assert": "2.1.0",
11-
"selenium-webdriver": "4.32.0"
11+
"selenium-webdriver": "4.33.0"
1212
},
1313
"devDependencies": {
1414
"mocha": "11.2.2"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const {By, Origin, Builder} = require('selenium-webdriver');
1+
const {By, Origin, Builder, until } = require('selenium-webdriver');
22
const assert = require('assert');
33

44
describe('Mouse move by offset', function () {
@@ -16,7 +16,7 @@ describe('Mouse move by offset', function () {
1616
const actions = driver.actions({async: true});
1717
await actions.move({x: 8, y: 0, origin: mouseTracker}).perform();
1818

19-
await driver.sleep(500);
19+
await driver.wait(until.elementTextContains(await driver.findElement(By.id('relative-location')), ","), 2000);
2020
let result = await driver.findElement(By.id('relative-location')).getText();
2121
result = result.split(', ');
2222
assert.deepStrictEqual((Math.abs(parseInt(result[0]) - 100 - 8) < 2), true)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ describe('Browsing Context Inspector', function () {
114114

115115
assert.equal(contextInfo.id, windowHandle)
116116
assert.equal(contextInfo.url, 'about:blank')
117-
assert.equal(contextInfo.children, null)
117+
assert.equal(contextInfo.children.length, 0)
118118
assert.equal(contextInfo.parentBrowsingContext, null)
119119
})
120120
})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe('Input module', function () {
3333

3434
let resultElement = await driver.findElement(By.id('result'))
3535
await resultElement.getText().then(function (text) {
36-
assert(text.includes('oquefort parmigiano cheddar'))
36+
assert(text.includes('oquefort parmigiano cheddar'), `text is: ${text}`)
3737
})
3838
})
3939

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ describe('Network events', function () {
2020
})
2121

2222
it('can listen to event before request is sent', async function () {
23-
let beforeRequestEvent = null
23+
let beforeRequestEvent = []
2424
const network = await Network(driver)
2525
await network.beforeRequestSent(function (event) {
26-
beforeRequestEvent = event
26+
beforeRequestEvent.push(event)
2727
})
2828

2929
await driver.get('https://www.selenium.dev/selenium/web/blank.html')
3030

31-
assert.equal(beforeRequestEvent.request.method, 'GET')
32-
const url = beforeRequestEvent.request.url
33-
assert.equal(url, await driver.getCurrentUrl())
31+
const currentUrl = await driver.getCurrentUrl()
32+
const currentUrlFound = beforeRequestEvent.some(event => event.request.url.includes(currentUrl))
33+
assert(currentUrlFound, `${currentUrl} was not requested`)
3434
})
3535

3636
it('can request cookies', async function () {
@@ -50,8 +50,6 @@ describe('Network events', function () {
5050
assert.equal(beforeRequestEvent.request.method, 'GET')
5151
assert.equal(beforeRequestEvent.request.cookies[0].name, 'north')
5252
assert.equal(beforeRequestEvent.request.cookies[0].value.value, 'biryani')
53-
const url = beforeRequestEvent.request.url
54-
assert.equal(url, await driver.getCurrentUrl())
5553

5654
await driver.manage().addCookie({
5755
name: 'south',
@@ -70,13 +68,14 @@ describe('Network events', function () {
7068
beforeRequestEvent.push(event)
7169
})
7270

73-
await driver.get('http://www.selenium.dev/selenium/web/bidi/redirected_http_equiv.html')
71+
await driver.get('https://www.selenium.dev/selenium/web/bidi/redirected_http_equiv.html')
7472
await driver.wait(until.urlContains('redirected.html'), 1000)
7573

7674
assert.equal(beforeRequestEvent[0].request.method, 'GET')
77-
assert(beforeRequestEvent[0].request.url.includes('redirected_http_equiv.html'))
78-
assert.equal(beforeRequestEvent[2].request.method, 'GET')
79-
assert(beforeRequestEvent[3].request.url.includes('redirected.html'))
75+
let redirectedFound = beforeRequestEvent.some(event => event.request.url.includes('redirected.html'))
76+
assert(redirectedFound, 'redirected.html was not requested')
77+
redirectedFound = beforeRequestEvent.some(event => event.request.url.includes('redirected_http_equiv.html'))
78+
assert(redirectedFound, 'redirected_http_equiv.html was not requested')
8079
})
8180

8281
it('can subscribe to response started', async function () {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('Service Test', function () {
2727

2828
options.setChromeBinaryPath(browserPath)
2929

30-
let service = new Chrome.ServiceBuilder().setPath(driverPath)
30+
let service = new Chrome.ServiceBuilder(driverPath)
3131

3232
let driver = new Builder()
3333
.forBrowser(Browser.CHROME)
@@ -50,4 +50,4 @@ describe('Service Test', function () {
5050
await driver.get('https://www.selenium.dev/selenium/web/blank.html');
5151
await driver.quit();
5252
});
53-
});
53+
});

examples/javascript/test/interactions/cookies.spec.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
const {Browser, Builder} = require("selenium-webdriver");
3+
const assert = require('assert')
34

45

56
describe('Cookies', function() {
@@ -36,7 +37,7 @@ describe('Cookies', function() {
3637

3738
// Get cookie details with named cookie 'foo'
3839
await driver.manage().getCookie('foo').then(function(cookie) {
39-
console.log('cookie details => ', cookie);
40+
assert.equal(cookie.value, 'bar');
4041
});
4142
});
4243

@@ -49,7 +50,7 @@ describe('Cookies', function() {
4950

5051
// Get all Available cookies
5152
await driver.manage().getCookies().then(function(cookies) {
52-
console.log('cookie details => ', cookies);
53+
assert.equal(cookies.filter(cookie => cookie.name.startsWith('test')).length, 2);
5354
});
5455
});
5556

@@ -65,7 +66,7 @@ describe('Cookies', function() {
6566

6667
// Get all Available cookies
6768
await driver.manage().getCookies().then(function(cookies) {
68-
console.log('cookie details => ', cookies);
69+
assert.equal(cookies.filter(cookie => cookie.name.startsWith('test')).length, 1);
6970
});
7071
});
7172

@@ -79,4 +80,4 @@ describe('Cookies', function() {
7980
// Delete all cookies
8081
await driver.manage().deleteAllCookies();
8182
});
82-
});
83+
});

examples/ruby/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ gem 'rspec', '~> 3.0'
88
gem 'rubocop', '~> 1.35'
99
gem 'rubocop-rspec', '~> 3.0'
1010
gem 'selenium-devtools', '= 0.136.0'
11-
gem 'selenium-webdriver', '= 4.32.0'
11+
gem 'selenium-webdriver', '= 4.33.0'

examples/ruby/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ GEM
5050
rubyzip (2.4.1)
5151
selenium-devtools (0.136.0)
5252
selenium-webdriver (~> 4.2)
53-
selenium-webdriver (4.32.0)
53+
selenium-webdriver (4.33.0)
5454
base64 (~> 0.2)
5555
logger (~> 1.4)
5656
rexml (~> 3.2, >= 3.2.5)
@@ -76,7 +76,7 @@ DEPENDENCIES
7676
rubocop (~> 1.35)
7777
rubocop-rspec (~> 3.0)
7878
selenium-devtools (= 0.136.0)
79-
selenium-webdriver (= 4.32.0)
79+
selenium-webdriver (= 4.33.0)
8080

8181
BUNDLED WITH
8282
2.5.6

examples/ruby/spec/drivers/remote_webdriver_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
let(:target_directory) { File.join(Dir.tmpdir, SecureRandom.uuid) }
88
let(:wait) { Selenium::WebDriver::Wait.new(timeout: 2) }
99
let(:server) do
10-
Selenium::Server.get(:latest,
10+
Selenium::Server.new(File.expand_path(File.join('..', '..', '..', 'selenium-server-4.33.0.jar'), __dir__),
1111
background: true,
1212
args: %w[--selenium-manager true --enable-managed-downloads true])
1313
end
@@ -35,8 +35,8 @@
3535
file_input.send_keys(upload_file)
3636
driver.find_element(id: 'file-submit').click
3737

38-
file_name = driver.find_element(id: 'uploaded-files')
39-
expect(file_name.text).to eq 'selenium-snapshot.png'
38+
wait.until { driver.find_element(id: 'uploaded-files') }
39+
expect(driver.find_element(id: 'uploaded-files').text).to eq 'selenium-snapshot.png'
4040
end
4141

4242
it 'downloads' do

website_and_docs/content/documentation/webdriver/bidi/w3c/network.en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ This section contains the APIs related to network events.
158158
{{< /tab >}}
159159
{{< tab header="JavaScript" >}}
160160
{{< badge-version version="4.18" >}}
161-
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L83-L89" >}}
161+
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L82-L88" >}}
162162
{{< /tab >}}
163163
{{< tab header="Kotlin" >}}
164164
{{< badge-code >}}
@@ -177,7 +177,7 @@ This section contains the APIs related to network events.
177177
{{< /tab >}}
178178
{{< tab header="JavaScript" >}}
179179
{{< badge-version version="4.18" >}}
180-
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L97-L103" >}}
180+
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L96-L102" >}}
181181
{{< /tab >}}
182182
{{< tab header="Kotlin" >}}
183183
{{< badge-code >}}

website_and_docs/content/documentation/webdriver/bidi/w3c/network.ja.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ This section contains the APIs related to network events.
168168
{{< /tab >}}
169169
{{< tab header="JavaScript" >}}
170170
{{< badge-version version="4.18" >}}
171-
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L83-L89" >}}
171+
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L82-L88" >}}
172172
{{< /tab >}}
173173
{{< tab header="Kotlin" >}}
174174
{{< badge-code >}}
@@ -187,7 +187,7 @@ This section contains the APIs related to network events.
187187
{{< /tab >}}
188188
{{< tab header="JavaScript" >}}
189189
{{< badge-version version="4.18" >}}
190-
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L97-L103" >}}
190+
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L96-L102" >}}
191191
{{< /tab >}}
192192
{{< tab header="Kotlin" >}}
193193
{{< badge-code >}}

website_and_docs/content/documentation/webdriver/bidi/w3c/network.pt-br.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ This section contains the APIs related to network events.
168168
{{< /tab >}}
169169
{{< tab header="JavaScript" >}}
170170
{{< badge-version version="4.18" >}}
171-
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L83-L89" >}}
171+
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L82-L88" >}}
172172
{{< /tab >}}
173173
{{< tab header="Kotlin" >}}
174174
{{< badge-code >}}
@@ -187,7 +187,7 @@ This section contains the APIs related to network events.
187187
{{< /tab >}}
188188
{{< tab header="JavaScript" >}}
189189
{{< badge-version version="4.18" >}}
190-
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L97-L103" >}}
190+
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L96-L102" >}}
191191
{{< /tab >}}
192192
{{< tab header="Kotlin" >}}
193193
{{< badge-code >}}

website_and_docs/content/documentation/webdriver/bidi/w3c/network.zh-cn.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ This section contains the APIs related to network events.
168168
{{< /tab >}}
169169
{{< tab header="JavaScript" >}}
170170
{{< badge-version version="4.18" >}}
171-
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L83-L89" >}}
171+
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L82-L88" >}}
172172
{{< /tab >}}
173173
{{< tab header="Kotlin" >}}
174174
{{< badge-code >}}
@@ -187,7 +187,7 @@ This section contains the APIs related to network events.
187187
{{< /tab >}}
188188
{{< tab header="JavaScript" >}}
189189
{{< badge-version version="4.18" >}}
190-
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L97-L103" >}}
190+
{{< gh-codeblock path="/examples/javascript/test/bidirectional/network_events.spec.js#L96-L102" >}}
191191
{{< /tab >}}
192192
{{< tab header="Kotlin" >}}
193193
{{< badge-code >}}
@@ -210,4 +210,4 @@ This section contains the APIs related to network events.
210210
{{< tab header="Kotlin" >}}
211211
{{< badge-code >}}
212212
{{< /tab >}}
213-
{{< /tabpane >}}
213+
{{< /tabpane >}}

0 commit comments

Comments
 (0)