Skip to content

Commit a82ed5a

Browse files
authored
Merge branch 'trunk' into renovate/rubocop-rspec-2.x-lockfile
2 parents 23415c3 + 84cf25b commit a82ed5a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1546
-289
lines changed

Diff for: examples/javascript/test/browser/edgeSpecificCaps.spec.js

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
const {Browser} = require('selenium-webdriver');
1+
const {Browser, By} = require('selenium-webdriver');
22
const {suite} = require('selenium-webdriver/testing');
33
const edge = require('selenium-webdriver/edge');
44
const options = new edge.Options();
5+
const assert = require("assert");
56

67
suite(function (env) {
78
describe('Should be able to Test Command line arguments', function () {
@@ -47,5 +48,17 @@ suite(function (env) {
4748
await driver.get('https://www.selenium.dev/selenium/web/blank.html');
4849
await driver.quit();
4950
});
51+
52+
it('Add Extension', async function () {
53+
let driver = await env
54+
.builder()
55+
.setEdgeOptions(options.addExtensions(['./test/resources/extensions/webextensions-selenium-example.crx']))
56+
.build();
57+
58+
await driver.get('https://www.selenium.dev/selenium/web/blank.html');
59+
let injected = await driver.findElement(By.id('webextensions-selenium-example'));
60+
assert.equal(await injected.getText(), `Content injected by webextensions-selenium-example`)
61+
await driver.quit();
62+
});
5063
});
5164
}, { browsers: [Browser.EDGE]});

Diff for: examples/javascript/test/capabilities/pageLoading.spec.js

+9
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,14 @@ suite(function (env) {
3434
await driver.get('https://www.selenium.dev/selenium/web/blank.html');
3535
await driver.quit();
3636
});
37+
it('Should be able to accept certs', async function () {
38+
let driver = await env
39+
.builder()
40+
.setChromeOptions(options.setAcceptInsecureCerts(true))
41+
.build();
42+
43+
await driver.get('https://www.selenium.dev/selenium/web/blank.html');
44+
await driver.quit();
45+
});
3746
});
3847
}, { browsers: [Browser.CHROME, Browser.FIREFOX]});

Diff for: examples/javascript/test/waits/waits.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ suite(function (env) {
4747
await driver.get('https://www.selenium.dev/selenium/web/dynamic.html');
4848
let revealed = await driver.findElement(By.id("revealed"));
4949
await driver.findElement(By.id("reveal")).click();
50-
await driver.wait(until.elementIsVisible(revealed), 2000);
50+
await driver.wait(until.elementIsDisabled(revealed), 2000);
5151
await revealed.sendKeys("Displayed");
5252
assert.equal(await revealed.getAttribute("value"), "Displayed")
5353
})

Diff for: examples/kotlin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<version>1.0.0</version>
1010

1111
<properties>
12-
<kotlin.version>1.9.23</kotlin.version>
12+
<kotlin.version>1.9.24</kotlin.version>
1313

1414
<slf4j.version>2.0.13</slf4j.version>
1515
<logback.version>1.5.6</logback.version>

Diff for: examples/ruby/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ cd seleniumhq.github.io/examples/ruby
2020
bundler install
2121
```
2222

23-
4. Run all all tests
23+
4. Run all tests
2424

2525
```
2626
bundle exec rspec

Diff for: examples/ruby/spec/browsers/edge_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929

3030
it 'add extensions' do
3131
extension_file_path = File.expand_path('../spec_support/extensions/webextensions-selenium-example.crx', __dir__)
32-
options = Selenium::WebDriver::Options.chrome
32+
options = Selenium::WebDriver::Options.edge
3333

3434
options.add_extension(extension_file_path)
3535

36-
@driver = Selenium::WebDriver.for :chrome, options: options
36+
@driver = Selenium::WebDriver.for :edge, options: options
3737
@driver.get('https://www.selenium.dev/selenium/web/blank.html')
3838
injected = @driver.find_element(:id, 'webextensions-selenium-example')
3939
expect(injected.text).to eq 'Content injected by webextensions-selenium-example'

Diff for: examples/ruby/spec/drivers/http_client_spec.rb

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
1-
# frozen_string_literal: true
2-
31
require 'spec_helper'
42

53
RSpec.describe 'HTTP Client' do
4+
let(:url) { 'https://www.selenium.dev/selenium/web/' }
5+
6+
it 'sets client configuration' do
7+
client = Selenium::WebDriver::Remote::Http::Default.new(open_timeout: 30, read_timeout: 30)
8+
expect(client.open_timeout).to eq 30
9+
end
10+
11+
it 'uses the custom http client' do
12+
client = Selenium::WebDriver::Remote::Http::Default.new
13+
driver = Selenium::WebDriver.for :chrome, http_client: client
14+
driver.get(url)
15+
driver.quit
16+
end
617
end

0 commit comments

Comments
 (0)