Skip to content

Commit 29a3ecd

Browse files
aguspeaguspe
committed
Merge remote-tracking branch 'origin/update_ruby_examples_for_ie' into update_ruby_examples_for_ie
2 parents f7e0e4b + 8735936 commit 29a3ecd

File tree

16 files changed

+81
-56
lines changed

16 files changed

+81
-56
lines changed

‎examples/dotnet/SeleniumDocs/BaseTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class BaseTest
1717
protected IWebDriver driver;
1818
protected Uri GridUrl;
1919
private Process _webserverProcess;
20-
private const string ServerJarName = "selenium-server-4.20.0.jar";
20+
private const string ServerJarName = "selenium-server-4.21.0.jar";
2121
private static readonly string BaseDirectory = AppContext.BaseDirectory;
2222
private const string RelativePathToGrid = "../../../../../";
2323
private readonly string _examplesDirectory = Path.GetFullPath(Path.Combine(BaseDirectory, RelativePathToGrid));

‎examples/dotnet/SeleniumDocs/Extensions/webextensions-selenium-example.xpi

3.27 KB
Binary file not shown.

‎examples/dotnet/SeleniumDocs/Extensions/webextensions-selenium-example/manifest.json

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
{
2-
"manifest_version": 2,
2+
"manifest_version": 3,
33
"name": "webextensions-selenium-example",
4-
"description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium" ,
4+
"description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium",
55
"version": "0.1",
66
"content_scripts": [
77
{
8-
"matches": ["https://*/*","http://*/*"],
9-
"js": ["inject.js"]
8+
"matches": [
9+
"https://*/*",
10+
"http://*/*"
11+
],
12+
"js": [
13+
"inject.js"
14+
]
1015
}
1116
],
12-
"applications": {
13-
"gecko": {
14-
"id": "webextensions-selenium-example@example.com"
15-
}
16-
}
17-
}
17+
"browser_specific_settings": {
18+
"gecko": {
19+
"id": "webextensions-selenium-example-v3@example.com"
20+
}
21+
}
22+
}

‎examples/java/src/test/java/dev/selenium/browsers/FirefoxTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class FirefoxTest extends BaseTest {
2828
@AfterEach
2929
public void clearProperties() {
3030
System.clearProperty(GeckoDriverService.GECKO_DRIVER_LOG_PROPERTY);
31-
System.clearProperty(GeckoDriverService.GECKO_DRIVER_LOG_LEVEL_PROPERTY);
31+
System.clearProperty(GeckoDriverService.GECKO_DRIVER_LOG_LEVEL_PROPERTY);driver.quit();
3232
}
3333

3434
@Test

‎examples/java/src/test/resources/extensions/selenium-example.xpi

3.27 KB
Binary file not shown.

‎examples/java/src/test/resources/extensions/selenium-example/manifest.json

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
{
2-
"manifest_version": 2,
2+
"manifest_version": 3,
33
"name": "webextensions-selenium-example",
4-
"description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium" ,
4+
"description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium",
55
"version": "0.1",
66
"content_scripts": [
77
{
8-
"matches": ["https://*/*","http://*/*"],
9-
"js": ["inject.js"]
8+
"matches": [
9+
"https://*/*",
10+
"http://*/*"
11+
],
12+
"js": [
13+
"inject.js"
14+
]
1015
}
1116
],
12-
"applications": {
13-
"gecko": {
14-
"id": "webextensions-selenium-example@example.com"
15-
}
16-
}
17-
}
17+
"browser_specific_settings": {
18+
"gecko": {
19+
"id": "webextensions-selenium-example-v3@example.com"
20+
}
21+
}
22+
}

‎examples/javascript/test/resources/extensions/selenium-example.xpi

3.27 KB
Binary file not shown.

‎examples/javascript/test/resources/extensions/selenium-example/manifest.json

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
{
2-
"manifest_version": 2,
2+
"manifest_version": 3,
33
"name": "webextensions-selenium-example",
4-
"description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium" ,
4+
"description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium",
55
"version": "0.1",
66
"content_scripts": [
77
{
8-
"matches": ["https://*/*","http://*/*"],
9-
"js": ["inject.js"]
8+
"matches": [
9+
"https://*/*",
10+
"http://*/*"
11+
],
12+
"js": [
13+
"inject.js"
14+
]
1015
}
1116
],
12-
"applications": {
13-
"gecko": {
14-
"id": "webextensions-selenium-example@example.com"
15-
}
16-
}
17-
}
17+
"browser_specific_settings": {
18+
"gecko": {
19+
"id": "webextensions-selenium-example-v3@example.com"
20+
}
21+
}
22+
}

‎examples/kotlin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<junit5.version>5.10.2</junit5.version>
1818
<wdm.version>5.2.3</wdm.version>
1919

20-
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
20+
<maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
2121

2222
<java.version>1.8</java.version>
2323
<selenium.version>4.21.0</selenium.version>

‎examples/python/tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def server_old(request):
130130
os.path.abspath(__file__)
131131
)
132132
),
133-
"selenium-server-4.20.0.jar",
133+
"selenium-server-4.21.0.jar",
134134
)
135135

136136
def wait_for_server(url, timeout):
@@ -188,7 +188,7 @@ def server():
188188
)
189189
)
190190
),
191-
"selenium-server-4.20.0.jar",
191+
"selenium-server-4.21.0.jar",
192192
)
193193

194194
args = [

0 commit comments

Comments
 (0)