Skip to content

Commit 7e0b783

Browse files
diemoldiemol
authored
Merge branch 'trunk' into add-mini-blog
2 parents 54b1e16 + 27e3638 commit 7e0b783

File tree

28 files changed

+574
-106
lines changed

28 files changed

+574
-106
lines changed

‎examples/dotnet/SeleniumDocs/SeleniumDocs.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.23.1" />
1111
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
1212
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
13-
<PackageReference Include="Selenium.Support" Version="4.15.0" />
14-
<PackageReference Include="Selenium.WebDriver" Version="4.15.0" />
13+
<PackageReference Include="Selenium.Support" Version="4.16.1" />
14+
<PackageReference Include="Selenium.WebDriver" Version="4.16.1" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎examples/dotnet/SeleniumDocs/Troubleshooting/LoggingTest.cs

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
using OpenQA.Selenium;
3+
using OpenQA.Selenium.Internal.Logging;
4+
using OpenQA.Selenium.Remote;
5+
using System;
6+
using System.Collections.Generic;
7+
8+
namespace SeleniumDocs.Troubleshooting
9+
{
10+
[TestClass]
11+
public class LoggingTest
12+
{
13+
[TestMethod]
14+
public void Logging()
15+
{
16+
Log.SetLevel(LogEventLevel.Trace);
17+
18+
// TODO: Replace it with coming FileLogHandler
19+
var testLogHandler = new TestLogHandler();
20+
Log.Handlers.Add(testLogHandler);
21+
22+
Log.SetLevel(typeof(RemoteWebDriver), LogEventLevel.Debug);
23+
Log.SetLevel(typeof(SeleniumManager), LogEventLevel.Info);
24+
25+
Warn("this is a warning");
26+
Info("this is useful information");
27+
Debug("this is detailed debug information");
28+
29+
Assert.IsTrue(testLogHandler.Messages.Contains("this is a warning"));
30+
Assert.IsTrue(testLogHandler.Messages.Contains("this is useful information"));
31+
Assert.IsTrue(testLogHandler.Messages.Contains("this is detailed debug information"));
32+
}
33+
34+
[TestCleanup]
35+
public void TestCleanup()
36+
{
37+
// reset log to default
38+
Log.SetLevel(LogEventLevel.Info)
39+
.Handlers.Clear()
40+
.Handlers.Add(new ConsoleLogHandler());
41+
}
42+
43+
// logging is only for internal usage
44+
// hacking it via reflection
45+
46+
private void Debug(string message)
47+
{
48+
LogMessage("Debug", message);
49+
}
50+
51+
private void Warn(string message)
52+
{
53+
LogMessage("Warn", message);
54+
}
55+
56+
private void Info(string message)
57+
{
58+
LogMessage("Info", message);
59+
}
60+
61+
private void LogMessage(string methodName, string message)
62+
{
63+
var getLoggerMethod = typeof(Log).GetMethod("GetLogger", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic, new Type[] { typeof(Type) });
64+
65+
var logger = getLoggerMethod.Invoke(null, new object[] { typeof(LoggingTest) });
66+
67+
var emitMethod = logger.GetType().GetMethod(methodName);
68+
69+
emitMethod.Invoke(logger, new object[] { message });
70+
}
71+
72+
class TestLogHandler : ILogHandler
73+
{
74+
public ILogHandler Clone()
75+
{
76+
return this;
77+
}
78+
79+
public void Handle(LogEvent logEvent)
80+
{
81+
Messages.Add(logEvent.Message);
82+
}
83+
84+
public List<string> Messages { get; } = new List<string>();
85+
}
86+
}
87+
}

‎examples/java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories {
1010
}
1111

1212
dependencies {
13-
testImplementation 'org.seleniumhq.selenium:selenium-java:4.15.0'
13+
testImplementation 'org.seleniumhq.selenium:selenium-java:4.16.1'
1414
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
1515
}
1616

‎examples/java/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
<dependency>
3030
<groupId>org.seleniumhq.selenium</groupId>
3131
<artifactId>selenium-java</artifactId>
32-
<version>4.15.0</version>
32+
<version>4.16.1</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.seleniumhq.selenium</groupId>
3636
<artifactId>selenium-grid</artifactId>
37-
<version>4.15.0</version>
37+
<version>4.16.1</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>org.junit.jupiter</groupId>

‎examples/javascript/package-lock.json

Lines changed: 7 additions & 7 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.0.0",
11-
"selenium-webdriver": "^4.15.0"
11+
"selenium-webdriver": "^4.16.0"
1212
},
1313
"devDependencies": {
1414
"mocha": "^10.2.0"

‎examples/javascript/test/bidirectional/bidi.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ suite(function(env) {
3535
let info = await browsingContext.navigate('https://www.selenium.dev/selenium/web/bidi/logEntryAdded.html')
3636

3737
assert.notEqual(browsingContext.id, null)
38-
assert.equal(info.navigationId, null)
38+
assert.notEqual(info.navigationId, null)
3939
assert(info.url.includes('/bidi/logEntryAdded.html'))
4040

4141
await driver.wait(until.urlIs('https://www.selenium.dev/selenium/web/bidi/logEntryAdded.html'))

‎examples/javascript/test/bidirectional/browsingContext.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ suite(function(env) {
6464
let info = await browsingContext.navigate('https://www.selenium.dev/selenium/web/bidi/logEntryAdded.html')
6565

6666
assert.notEqual(browsingContext.id, null)
67-
assert.equal(info.navigationId, null)
67+
assert.notEqual(info.navigationId, null)
6868
assert(info.url.includes('/bidi/logEntryAdded.html'))
6969
})
7070

@@ -79,7 +79,7 @@ suite(function(env) {
7979
)
8080

8181
assert.notEqual(browsingContext.id, null)
82-
assert.equal(info.navigationId, null)
82+
assert.notEqual(info.navigationId, null)
8383
assert(info.url.includes('/bidi/logEntryAdded.html'))
8484
})
8585

‎examples/kotlin/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
<kotlin.version>1.7.10</kotlin.version>
1313

1414
<slf4j.version>1.7.36</slf4j.version>
15-
<logback.version>1.2.11</logback.version>
15+
<logback.version>1.3.12</logback.version>
1616

17-
<junit5.version>5.9.0</junit5.version>
17+
<junit5.version>5.9.1</junit5.version>
1818
<wdm.version>5.2.3</wdm.version>
1919

20-
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
20+
<maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
2121

2222
<java.version>1.8</java.version>
23-
<selenium.version>4.15.0</selenium.version>
23+
<selenium.version>4.16.0</selenium.version>
2424

2525
<maven.compiler.target>${java.version}</maven.compiler.target>
2626
<maven.compiler.source>${java.version}</maven.compiler.source>

‎examples/python/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
selenium==4.15.2
1+
selenium==4.16.0
22
pytest
33
trio
44
pytest-trio

‎examples/python/tests/drivers/test_remote_webdriver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def test_downloads(server, temp_dir):
4646

4747
files = driver.get_downloadable_files()
4848

49-
assert files == file_names
49+
assert sorted(files) == sorted(file_names)
5050
downloadable_file = files[0]
5151
target_directory = temp_dir
5252

‎examples/ruby/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ gem 'selenium-devtools', '~> 0.119'
1212
if ENV['SE_NIGHTLY']
1313
source 'https://rubygems.pkg.github.com/seleniumhq' do
1414
selenium = 'selenium-webdriver'
15-
gem selenium, '~> 4.16.0.nightly'
15+
gem selenium, '~> 4.17.0.nightly'
1616
end
1717
else
18-
gem 'selenium-webdriver', '= 4.15.0'
18+
gem 'selenium-webdriver', '= 4.16.0'
1919
end

‎examples/ruby/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ GEM
5454
rubyzip (2.3.2)
5555
selenium-devtools (0.119.0)
5656
selenium-webdriver (~> 4.2)
57-
selenium-webdriver (4.15.0)
57+
selenium-webdriver (4.16.0)
5858
rexml (~> 3.2, >= 3.2.5)
5959
rubyzip (>= 1.2.2, < 3.0)
6060
websocket (~> 1.0)
@@ -74,7 +74,7 @@ DEPENDENCIES
7474
rubocop (~> 1.35)
7575
rubocop-rspec (~> 2.12)
7676
selenium-devtools (~> 0.119)
77-
selenium-webdriver (= 4.15.0)
77+
selenium-webdriver (= 4.16.0)
7878

7979
BUNDLED WITH
8080
2.3.11

‎examples/ruby/spec/interactions/windows_spec.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,16 @@
44

55
RSpec.describe 'Windows' do
66
let(:driver) { start_session }
7+
8+
it 'opens new tab' do
9+
driver.switch_to.new_window(:tab)
10+
11+
expect(driver.window_handles.size).to eq 2
12+
end
13+
14+
it 'opens new window' do
15+
driver.switch_to.new_window(:window)
16+
17+
expect(driver.window_handles.size).to eq 2
18+
end
719
end

‎scripts/release-updates.sh

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
VERSION_STR="$1"
4+
NEW_VERSION=$(echo "$VERSION_STR" | cut -d. -f2)
5+
OLD_VERSION=$((NEW_VERSION - 1))
6+
7+
FILES=(
8+
"website_and_docs/layouts/partials/selenium-clients-and-webdriver-bindings.html"
9+
"website_and_docs/layouts/downloads/list.html"
10+
)
11+
12+
for FILE_PATH in "${FILES[@]}"; do
13+
sed -i '' -E "s/4\.$OLD_VERSION\.[0-9]+/4.$NEW_VERSION.0/g" "$FILE_PATH"
14+
done
15+
16+
OLD_BLOG="website_and_docs/content/blog/2023/selenium-4-$OLD_VERSION-released.md"
17+
NEW_BLOG="website_and_docs/content/blog/2023/selenium-4-$NEW_VERSION-released.md"
18+
cp "$OLD_BLOG" "$NEW_BLOG"
19+
git add "$NEW_BLOG"
20+
21+
sed -i '' "s/4\.$OLD_VERSION/4\.$NEW_VERSION/g" "$NEW_BLOG"
22+
23+
echo "Selenium Contributors"
24+
gh api --method GET /repos/seleniumhq/selenium/commits -f since=selenium-4.${OLD_VERSION}.0 -f per_page=1000 \
25+
--jq 'map(.author.login) | unique | sort | map("{{< gh-user \"https://api.github.com/users/" + . + "\" >}}") | .[]'
26+
27+
COMMIT_DATE=$(gh api repos/seleniumhq/selenium/commits/selenium-4.${OLD_VERSION}.0 --jq '.commit.committer.date')
28+
29+
echo
30+
echo "Docs Contributors"
31+
gh api --method GET /repos/seleniumhq/seleniumhq.github.io/commits -f since="$COMMIT_DATE" -f per_page=1000 \
32+
--jq 'map(.author.login) | unique | sort | map("{{< gh-user \"https://api.github.com/users/" + . + "\" >}}") | .[]'
33+
34+
echo
35+
echo "Docker Contributors"
36+
gh api --method GET /repos/seleniumhq/docker-selenium/commits -f since="$COMMIT_DATE" -f per_page=1000 \
37+
--jq 'map(.author.login) | unique | sort | map("{{< gh-user \"https://api.github.com/users/" + . + "\" >}}") | .[]'

‎scripts/update-versions.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ OLD_VERSION=$((NEW_VERSION - 1))
66
NEXT_VERSION=$((NEW_VERSION + 1))
77

88
FILES=(
9-
"website_and_docs/layouts/partials/selenium-clients-and-webdriver-bindings.html"
10-
"website_and_docs/layouts/downloads/list.html"
119
"examples/java/build.gradle"
1210
"examples/dotnet/SeleniumDocs/SeleniumDocs.csproj"
1311
"examples/python/requirements.txt"

0 commit comments

Comments
 (0)