Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Selenium to 4.26 #457

Merged
merged 8 commits into from
Nov 7, 2024
Merged

Update Selenium to 4.26 #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
47c3260
Update Selenium to 4.25
martingrossmann Oct 28, 2024
9b8999f
Merge branch 'master' into feature/bump-selenium
martingrossmann Oct 28, 2024
1b76950
Updated Selenium to latest version
martingrossmann Nov 4, 2024
79ee597
Updated imports of Chrome devtools
martingrossmann Nov 4, 2024
b5d3c21
Fixed ReportNG test
martingrossmann Nov 5, 2024
e9bffd5
Updated node version
martingrossmann Nov 5, 2024
2fdfc6b
Cleanup build.gradle
martingrossmann Nov 5, 2024
e4404ba
Merge branch 'master' into feature/bump-selenium
martingrossmann Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ ext {
core = project(':core')
report = project(':report-ng')

seleniumVersion = '4.23.0'
seleniumVersion = '4.26.0'
// Must be the same like in Selenium 4
guavaVersion = "33.2.1-jre"
guavaVersion = "33.3.1-jre"

moduleVersion = '2-SNAPSHOT'
if (System.properties.containsKey('ttVersion')) {
Expand Down
8 changes: 4 additions & 4 deletions docs/src/docs/selenium4/selenium4-cdp.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public class ChromeDevToolsTests extends TesterraTest implements
.'Broken' page resources
[source, java]
----
import org.openqa.selenium.devtools.v127.log.model.LogEntry;
import org.openqa.selenium.devtools.v130.log.model.LogEntry;
...

public class ChromeDevToolsTests extends TesterraTest implements
Expand Down Expand Up @@ -211,9 +211,9 @@ public class ChromeDevToolsTests extends TesterraTest implements

[source, java]
----
import org.openqa.selenium.devtools.v127.network.Network;
import org.openqa.selenium.devtools.v127.network.model.RequestWillBeSent;
import org.openqa.selenium.devtools.v127.network.model.ResponseReceived;
import org.openqa.selenium.devtools.v130.network.Network;
import org.openqa.selenium.devtools.v130.network.model.RequestWillBeSent;
import org.openqa.selenium.devtools.v130.network.model.ResponseReceived;
...

public class ChromeDevToolsTests extends TesterraTest implements
Expand Down
6 changes: 3 additions & 3 deletions ...er-ui/src/main/java/eu/tsystems/mms/tic/testframework/testing/SeleniumChromeDevTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.devtools.DevTools;
import org.openqa.selenium.devtools.HasDevTools;
import org.openqa.selenium.devtools.v127.emulation.Emulation;
import org.openqa.selenium.devtools.v127.network.Network;
import org.openqa.selenium.devtools.v127.network.model.Headers;
import org.openqa.selenium.devtools.v130.emulation.Emulation;
import org.openqa.selenium.devtools.v130.network.Network;
import org.openqa.selenium.devtools.v130.network.model.Headers;
import org.openqa.selenium.remote.Augmenter;
import org.openqa.selenium.remote.RemoteWebDriver;

Expand Down
12 changes: 6 additions & 6 deletions ...tests/src/test/java/eu/tsystems/mms/tic/testframework/playground/ChromeDevToolsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
import org.openqa.selenium.devtools.DevTools;
import org.openqa.selenium.devtools.HasDevTools;
import org.openqa.selenium.devtools.events.ConsoleEvent;
import org.openqa.selenium.devtools.v125.emulation.Emulation;
import org.openqa.selenium.devtools.v125.log.Log;
import org.openqa.selenium.devtools.v125.log.model.LogEntry;
import org.openqa.selenium.devtools.v125.network.Network;
import org.openqa.selenium.devtools.v125.network.model.RequestWillBeSent;
import org.openqa.selenium.devtools.v125.network.model.ResponseReceived;
import org.openqa.selenium.devtools.v130.emulation.Emulation;
import org.openqa.selenium.devtools.v130.log.Log;
import org.openqa.selenium.devtools.v130.log.model.LogEntry;
import org.openqa.selenium.devtools.v130.network.Network;
import org.openqa.selenium.devtools.v130.network.model.RequestWillBeSent;
import org.openqa.selenium.devtools.v130.network.model.ResponseReceived;
import org.openqa.selenium.logging.HasLogEvents;
import org.openqa.selenium.remote.Augmenter;
import org.openqa.selenium.remote.RemoteWebDriver;
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/io/testerra/report/test/pages/report/sideBarPages/ReportFailureAspectsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public boolean getContainsFailedStateExistenceInEachRow() {
for (final UiElement row : tableRows) {
statusContainsFailed = false;

final List<UiElement> statusEntriesInTable = row.find(By.xpath(".//td[3]/div")).list().stream().collect(Collectors.toList());
final List<UiElement> statusEntriesInTable = row.find(By.xpath(".//td[4]/div")).list().stream().collect(Collectors.toList());
for (final UiElement statusColumn : statusEntriesInTable) {
final String foundStatusInTable = statusColumn.expect().text().getActual();
if (!foundStatusInTable.contains(Status.FAILED_EXPECTED.title) && foundStatusInTable.contains(Status.FAILED.title)) {
Expand Down
5 changes: 2 additions & 3 deletions report-ng/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

plugins {
id "com.github.node-gradle.node" version "3.0.0-rc6"
id "com.github.node-gradle.node" version "7.0.2"
}

// Deactivate JAR publishing
Expand All @@ -36,8 +36,7 @@ project.afterEvaluate {

node {
download = true
version = "16.4.0"
useGradleProxySettings = true
version = "19.8.1"
}

task buildReport(type: NpmTask) {
Expand Down