Skip to content

Commit

Permalink
Merge pull request #457 from telekom/feature/bump-selenium
Browse files Browse the repository at this point in the history
Update Selenium to 4.26
  • Loading branch information
martingrossmann authored Nov 7, 2024
2 parents bcd7243 + e4404ba commit b4a7bbc
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
4 changes: 2 additions & 2 deletions build.gradle
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
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
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
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
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
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

0 comments on commit b4a7bbc

Please sign in to comment.