Skip to content

Commit 8d72b74

Browse files
jflorezjflorez
authored
Merge branch 'trunk' into patch-1
2 parents 7f2aa0a + fb58d76 commit 8d72b74

14 files changed

+67
-156
lines changed

‎examples/javascript/test/actionsApi/mouse/backAndForwardClick.spec.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
const {By, Button, Browser} = require('selenium-webdriver');
2-
const {suite, ignore} = require('selenium-webdriver/testing');
1+
const {By, Button, Browser, Builder} = require('selenium-webdriver');
2+
33
const assert = require('assert');
44

5-
suite(function (env) {
5+
66
describe('Should be able to perform BACK click and FORWARD click', function () {
77
let driver;
88

99
before(async function () {
10-
driver = await env.builder().build();
10+
driver = new Builder().forBrowser('chrome').build();
1111
});
1212

1313
after(async () => await driver.quit());
1414

15-
ignore(env.browsers(Browser.FIREFOX, Browser.SAFARI)).it('Back click', async function () {
15+
it('Back click', async function () {
1616
await driver.get('https://selenium.dev/selenium/web/mouse_interaction.html');
1717
await driver.findElement(By.id("click")).click();
1818

@@ -24,7 +24,7 @@ suite(function (env) {
2424
assert.deepStrictEqual(await driver.getTitle(), `BasicMouseInterfaceTest`)
2525
});
2626

27-
ignore(env.browsers(Browser.FIREFOX, Browser.SAFARI)).it('Forward click', async function () {
27+
it('Forward click', async function () {
2828
await driver.get('https://selenium.dev/selenium/web/mouse_interaction.html');
2929
await driver.findElement(By.id("click")).click();
3030
await driver.navigate().back();
@@ -37,4 +37,3 @@ suite(function (env) {
3737
assert.deepStrictEqual(await driver.getTitle(), `We Arrive Here`)
3838
});
3939
});
40-
}, { browsers: [Browser.CHROME]});

‎examples/javascript/test/actionsApi/mouse/clickAndHold.spec.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
const {By, Browser} = require('selenium-webdriver');
2-
const {suite} = require('selenium-webdriver/testing');
1+
const {By, Builder} = require('selenium-webdriver');
2+
3+
34

4-
suite(function (env) {
55
describe('Click and hold', function () {
66
let driver;
77

88
before(async function () {
9-
driver = await env.builder().build();
9+
driver = new Builder().forBrowser('chrome').build();
1010
});
1111

1212
after(() => driver.quit());
@@ -19,4 +19,3 @@ suite(function (env) {
1919
});
2020

2121
});
22-
}, { browsers: [Browser.CHROME, Browser.FIREFOX]});

‎examples/javascript/test/actionsApi/mouse/clickAndRelease.spec.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
const {By, Browser} = require('selenium-webdriver');
2-
const {suite} = require('selenium-webdriver/testing');
1+
const {By,Builder} = require('selenium-webdriver');
2+
3+
34

4-
suite(function (env) {
55
describe('Click and release', function () {
66
let driver;
77

88
before(async function () {
9-
driver = await env.builder().build();
9+
driver = new Builder().forBrowser('chrome').build();
1010
});
1111

1212
after(() => driver.quit());
@@ -19,4 +19,3 @@ suite(function (env) {
1919
});
2020

2121
});
22-
}, { browsers: [Browser.CHROME, Browser.FIREFOX]});

‎examples/javascript/test/actionsApi/mouse/doubleClick.spec.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
const {By, Browser} = require('selenium-webdriver');
2-
const {suite} = require('selenium-webdriver/testing');
1+
const {By, Builder} = require('selenium-webdriver');
2+
33
const assert = require("assert");
44

5-
suite(function (env) {
5+
66
describe('Double click', function () {
77
let driver;
88

99
before(async function () {
10-
driver = await env.builder().build();
10+
driver = new Builder().forBrowser('chrome').build();
1111
});
1212

1313
after(async () => await driver.quit());
@@ -23,4 +23,3 @@ suite(function (env) {
2323
assert.deepStrictEqual(status, `double-clicked`)
2424
});
2525
});
26-
}, { browsers: [Browser.CHROME, Browser.FIREFOX]});

‎examples/javascript/test/actionsApi/mouse/dragAndDrop.spec.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
const {By, Browser} = require('selenium-webdriver');
2-
const {suite} = require('selenium-webdriver/testing');
1+
const {By, Builder} = require('selenium-webdriver');
2+
33
const assert = require('assert');
44

5-
suite(function (env) {
5+
66
describe('Drag and Drop', function () {
77
let driver;
88

99
before(async function () {
10-
driver = await env.builder().build();
10+
driver = new Builder().forBrowser('chrome').build();
1111
});
1212

1313
after(async () => await driver.quit());
@@ -35,4 +35,3 @@ suite(function (env) {
3535
assert.deepStrictEqual('dropped', result)
3636
});
3737
});
38-
}, { browsers: [Browser.CHROME, Browser.FIREFOX]});

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
const {By, Origin, Browser} = require('selenium-webdriver');
2-
const {suite} = require('selenium-webdriver/testing');
1+
const {By, Origin, Builder} = require('selenium-webdriver');
2+
33
const assert = require('assert');
44

5-
suite(function (env) {
5+
66
describe('Mouse move by offset', function () {
77
let driver;
88

99
before(async function () {
10-
driver = await env.builder().build();
10+
driver = new Builder().forBrowser('chrome').build();
1111
});
1212

1313
after(async () => await driver.quit());
@@ -47,4 +47,3 @@ suite(function (env) {
4747
assert.deepStrictEqual(Math.abs(parseInt(result[1]) - 3 - 15) < 2, true)
4848
});
4949
});
50-
}, { browsers: [Browser.CHROME, Browser.FIREFOX]});

‎examples/javascript/test/actionsApi/mouse/moveToElement.spec.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
const {By, Browser} = require('selenium-webdriver');
2-
const {suite} = require('selenium-webdriver/testing');
1+
const {By, Builder} = require('selenium-webdriver');
2+
33
const assert = require("assert");
44

5-
suite(function (env) {
5+
66
describe('Move to element', function () {
77
let driver;
88

99
before(async function () {
10-
driver = await env.builder().build();
10+
driver = new Builder().forBrowser('chrome').build();
1111
});
1212

1313
after(async () => await driver.quit());
@@ -22,4 +22,3 @@ suite(function (env) {
2222
assert.deepStrictEqual(status, `hovered`)
2323
});
2424
});
25-
}, { browsers: [Browser.CHROME, Browser.FIREFOX]});

‎examples/javascript/test/actionsApi/mouse/rightClick.spec.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
const {By, Browser} = require('selenium-webdriver');
2-
const {suite} = require('selenium-webdriver/testing');
1+
const {By, Builder} = require('selenium-webdriver');
2+
33
const assert = require('assert');
44

5-
suite(function (env) {
5+
66
describe('Right click', function () {
77
let driver;
88

99
before(async function () {
10-
driver = await env.builder().build();
10+
driver = new Builder().forBrowser('chrome').build();
1111
});
1212

1313
after(async () => await driver.quit());
@@ -23,4 +23,3 @@ suite(function (env) {
2323
assert.deepStrictEqual(clicked, `context-clicked`)
2424
});
2525
});
26-
},{ browsers: [Browser.CHROME, Browser.FIREFOX]});

‎examples/kotlin/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<properties>
1212
<kotlin.version>1.9.23</kotlin.version>
1313

14-
<slf4j.version>2.0.12</slf4j.version>
15-
<logback.version>1.5.4</logback.version>
14+
<slf4j.version>2.0.13</slf4j.version>
15+
<logback.version>1.5.5</logback.version>
1616

1717
<junit5.version>5.10.2</junit5.version>
1818
<wdm.version>5.2.3</wdm.version>

‎website_and_docs/content/blog/2022/using-java11-httpclient.md

+7
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ of modern Java releases.
3636

3737
So as a first step towards this move, the Java 11+ HTTP client from Selenium 4.5.0 and above.
3838

39+
{{% alert title="Attention!" color="warning" %}}
40+
If you are using Selenium 4.14 or higher, the
41+
Java 11 HTTP client is used by default. You do not
42+
need to make any changes to your setup. Feel free
43+
to skip the following section.
44+
{{% /alert %}}
45+
3946
### Using Java 11+ HTTP Client in Selenium
4047

4148
#### Prerequisites:

‎website_and_docs/content/documentation/webdriver/elements/interactions.en.md

+6-28
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,8 @@ Selenium will return an [element click intercepted](https://w3c.github.io/webdri
7373
driver.find_element(name: 'color_input').click
7474

7575
{{< /tab >}}
76-
{{< tab header="JavaScript" >}}
77-
78-
// Navigate to Url
79-
await driver.get('https://www.selenium.dev/selenium/web/inputs.html');
80-
81-
// Click the element
82-
await driver.findElement(By.name('color_input')).click();
83-
76+
{{< tab header="JavaScript" text=true >}}
77+
{{< gh-codeblock path="examples/javascript/test/getting_started/firstScript.spec.js#L20" >}}
8478
{{< /tab >}}
8579
{{< tab header="Kotlin" >}}
8680

@@ -149,17 +143,8 @@ possible keystrokes that WebDriver Supports.
149143
driver.find_element(name: 'email_input').send_keys '[email protected]'
150144

151145
{{< /tab >}}
152-
{{< tab header="JavaScript" >}}
153-
154-
// Navigate to Url
155-
await driver.get('https://www.selenium.dev/selenium/web/inputs.html');
156-
157-
//Clear field to empty it from any previous data
158-
await driver.findElement(By.name('email_input')).clear();
159-
160-
// Enter text
161-
await driver.findElement(By.name('email_input')).sendKeys('[email protected]');
162-
146+
{{< tab header="JavaScript" text=true >}}
147+
{{< gh-codeblock path="examples/javascript/test/elements/interactions.spec.js#L21" >}}
163148
{{< /tab >}}
164149
{{< tab header="Kotlin" >}}
165150

@@ -220,15 +205,8 @@ with a`content-editable` attribute. If these conditions are not met,
220205
driver.find_element(name: 'email_input').clear
221206

222207
{{< /tab >}}
223-
{{< tab header="JavaScript" >}}
224-
225-
// Navigate to Url
226-
await driver.get('https://www.selenium.dev/selenium/web/inputs.html');
227-
228-
//Clear field to empty it from any previous data
229-
await driver.findElement(By.name('email_input')).clear();
230-
231-
208+
{{< tab header="JavaScript" text=true >}}
209+
{{< gh-codeblock path="examples/javascript/test/elements/interactions.spec.js#L20" >}}
232210
{{< /tab >}}
233211
{{< tab header="Kotlin" >}}
234212

‎website_and_docs/content/documentation/webdriver/elements/interactions.ja.md

+6-28
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,8 @@ Selenium will return an [element click intercepted](https://w3c.github.io/webdri
7070
driver.find_element(name: 'color_input').click
7171

7272
{{< /tab >}}
73-
{{< tab header="JavaScript" >}}
74-
75-
// Navigate to Url
76-
await driver.get('https://www.selenium.dev/selenium/web/inputs.html');
77-
78-
// Click the element
79-
await driver.findElement(By.name('color_input')).click();
80-
73+
{{< tab header="JavaScript" text=true >}}
74+
{{< gh-codeblock path="examples/javascript/test/getting_started/firstScript.spec.js#L20" >}}
8175
{{< /tab >}}
8276
{{< tab header="Kotlin" >}}
8377

@@ -145,17 +139,8 @@ possible keystrokes that WebDriver Supports.
145139
driver.find_element(name: 'email_input').send_keys '[email protected]'
146140

147141
{{< /tab >}}
148-
{{< tab header="JavaScript" >}}
149-
150-
// Navigate to Url
151-
await driver.get('https://www.selenium.dev/selenium/web/inputs.html');
152-
153-
//Clear field to empty it from any previous data
154-
await driver.findElement(By.name('email_input')).clear();
155-
156-
// Enter text
157-
await driver.findElement(By.name('email_input')).sendKeys('[email protected]');
158-
142+
{{< tab header="JavaScript" text=true >}}
143+
{{< gh-codeblock path="examples/javascript/test/elements/interactions.spec.js#L21" >}}
159144
{{< /tab >}}
160145
{{< tab header="Kotlin" >}}
161146

@@ -216,15 +201,8 @@ with a`content-editable` attribute. If these conditions are not met,
216201
driver.find_element(name: 'email_input').clear
217202

218203
{{< /tab >}}
219-
{{< tab header="JavaScript" >}}
220-
221-
// Navigate to Url
222-
await driver.get('https://www.selenium.dev/selenium/web/inputs.html');
223-
224-
//Clear field to empty it from any previous data
225-
await driver.findElement(By.name('email_input')).clear();
226-
227-
204+
{{< tab header="JavaScript" text=true >}}
205+
{{< gh-codeblock path="examples/javascript/test/elements/interactions.spec.js#L20" >}}
228206
{{< /tab >}}
229207
{{< tab header="Kotlin" >}}
230208

‎website_and_docs/content/documentation/webdriver/elements/interactions.pt-br.md

+6-28
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,8 @@ Selenium will return an [element click intercepted](https://w3c.github.io/webdri
7171
driver.find_element(name: 'color_input').click
7272

7373
{{< /tab >}}
74-
{{< tab header="JavaScript" >}}
75-
76-
// Navigate to Url
77-
await driver.get('https://www.selenium.dev/selenium/web/inputs.html');
78-
79-
// Click the element
80-
await driver.findElement(By.name('color_input')).click();
81-
74+
{{< tab header="JavaScript" text=true >}}
75+
{{< gh-codeblock path="examples/javascript/test/getting_started/firstScript.spec.js#L20" >}}
8276
{{< /tab >}}
8377
{{< tab header="Kotlin" >}}
8478

@@ -147,17 +141,8 @@ possible keystrokes that WebDriver Supports.
147141
driver.find_element(name: 'email_input').send_keys '[email protected]'
148142

149143
{{< /tab >}}
150-
{{< tab header="JavaScript" >}}
151-
152-
// Navigate to Url
153-
await driver.get('https://www.selenium.dev/selenium/web/inputs.html');
154-
155-
//Clear field to empty it from any previous data
156-
await driver.findElement(By.name('email_input')).clear();
157-
158-
// Enter text
159-
await driver.findElement(By.name('email_input')).sendKeys('[email protected]');
160-
144+
{{< tab header="JavaScript" text=true >}}
145+
{{< gh-codeblock path="examples/javascript/test/elements/interactions.spec.js#L21" >}}
161146
{{< /tab >}}
162147
{{< tab header="Kotlin" >}}
163148

@@ -218,15 +203,8 @@ with a`content-editable` attribute. If these conditions are not met,
218203
driver.find_element(name: 'email_input').clear
219204

220205
{{< /tab >}}
221-
{{< tab header="JavaScript" >}}
222-
223-
// Navigate to Url
224-
await driver.get('https://www.selenium.dev/selenium/web/inputs.html');
225-
226-
//Clear field to empty it from any previous data
227-
await driver.findElement(By.name('email_input')).clear();
228-
229-
206+
{{< tab header="JavaScript" text=true >}}
207+
{{< gh-codeblock path="examples/javascript/test/elements/interactions.spec.js#L20" >}}
230208
{{< /tab >}}
231209
{{< tab header="Kotlin" >}}
232210

0 commit comments

Comments
 (0)