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 support (4.13 -> 4.15) #34

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update Selenium support (4.13 -> 4.15) #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aeb5df
Update Selenium support (4.13 -> 4.15)
Dec 2, 2023
8758b5d
Update dependency versions
Dec 2, 2023
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
52 changes: 31 additions & 21 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>kg.apc</groupId>
<artifactId>jmeter-plugins-webdriver</artifactId>
<version>4.13.0.0</version>
<version>4.15.0.0</version>
<packaging>jar</packaging>

<name>WebDriver/Selenium</name>
Expand Down Expand Up @@ -34,15 +34,17 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<selenium.version>4.13.0</selenium.version>
<!-- "Chrome DevTools support is now: v117, v118, and v119 (Firefox still uses v85 for all versions)" -->
<!-- @see https://www.selenium.dev/blog/2023/selenium-4-15-released/ -->
<selenium.version>4.15.0</selenium.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>sonatype-nexus-staging</serverId>
Expand All @@ -51,22 +53,22 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
<configuration>
<argLine>
--add-opens java.base/java.io=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.lang.reflect=ALL-UNNAMED
--add-opens java.base/java.time=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.util.concurrent=ALL-UNNAMED
--add-opens java.base/java.util.stream=ALL-UNNAMED
--add-opens=java.base/sun.security.jca=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
<configuration>
<argLine>
--add-opens java.base/java.io=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.lang.reflect=ALL-UNNAMED
--add-opens java.base/java.time=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.util.concurrent=ALL-UNNAMED
--add-opens java.base/java.util.stream=ALL-UNNAMED
--add-opens=java.base/sun.security.jca=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -141,9 +143,16 @@
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>htmlunit-driver</artifactId>
<artifactId>htmlunit3-driver</artifactId>
<version>4.15.0</version>
</dependency>
<!-- @since 4.15.0.0 -->
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-manager</artifactId>
<version>${selenium.version}</version>
</dependency>

<!-- begin need this libraries for HtmlUnitDriver -->
<dependency>
<groupId>xml-apis</groupId>
Expand Down Expand Up @@ -176,7 +185,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.3</version>
<version>2.16.0</version>
</dependency>
<dependency>
<groupId>de.sciss</groupId>
Expand All @@ -202,4 +211,5 @@
<scope>test</scope>
</dependency>
</dependencies>

</project>
7 changes: 3 additions & 4 deletions src/test/java/com/googlecode/jmeter/plugins/webdriver/config/ChromeDriverConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,14 @@ public void shouldHaveChromeOptionsWhenRemoteIsEnabled() {
@SuppressWarnings("unchecked")
List<String> args = (List<String>) capability.get("args");
assertThat(args, is(notNullValue()));
assertEquals(2, args.size());
assertEquals("--remote-allow-origins=*", args.get(0));
assertEquals("--headless=new", args.get(1));
assertEquals(1, args.size());
assertEquals("--headless=new", args.get(0));
}

@Test
public void shouldNotHaveChromeOptionsWhenRemoteIsNotEnabled() {
final ChromeOptions options = config.createChromeOptions();
org.hamcrest.MatcherAssert.assertThat(options.getCapability(ChromeOptions.CAPABILITY), Matchers.hasToString("{args=[--remote-allow-origins=*], extensions=[]}"));
org.hamcrest.MatcherAssert.assertThat(options.getCapability(ChromeOptions.CAPABILITY), Matchers.hasToString("{args=[], extensions=[]}"));
}

@Test
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/com/googlecode/jmeter/plugins/webdriver/config/EdgeDriverConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,14 @@ public void shouldHaveEdgeOptionsWhenRemoteIsEnabled() {
@SuppressWarnings("unchecked")
List<String> args = (List<String>) capability.get("args");
assertThat(args, is(notNullValue()));
assertEquals(2, args.size());
assertEquals("--remote-allow-origins=*", args.get(0));
assertEquals("--headless=new", args.get(1));
assertEquals(1, args.size());
assertEquals("--headless=new", args.get(0));
}

@Test
public void shouldNotHaveEdgeOptionsWhenRemoteIsNotEnabled() {
final EdgeOptions options = config.createEdgeOptions();
org.hamcrest.MatcherAssert.assertThat(options.getCapability(EdgeOptions.CAPABILITY), Matchers.hasToString("{args=[--remote-allow-origins=*], extensions=[]}"));
org.hamcrest.MatcherAssert.assertThat(options.getCapability(EdgeOptions.CAPABILITY), Matchers.hasToString("{args=[], extensions=[]}"));
}

@Test
Expand Down
9 changes: 4 additions & 5 deletions src/test/java/com/googlecode/jmeter/plugins/webdriver/config/RemoteDriverConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void resetConfig() {
config.clearThreadBrowsers();
JMeterContextService.getContext().setVariables(null);
}

@Test
public void shouldSetTheCapability() throws Exception {
assertThat(config.getSelectedBrowser(), is(RemoteBrowser.CHROME));
Expand Down Expand Up @@ -122,9 +122,8 @@ public void shouldHaveHeadlessInChromeOptionsWhenEnabled() {
@SuppressWarnings("unchecked")
List<String> args = (List<String>) capability.get("args");
assertThat(args, is(notNullValue()));
assertEquals(2, args.size());
assertEquals("--remote-allow-origins=*", args.get(0));
assertEquals("--headless=new", args.get(1));
assertEquals(1, args.size());
assertEquals("--headless=new", args.get(0));
}

@Test
Expand All @@ -137,7 +136,7 @@ public void shouldNotHaveHeadlessInChromeOptionsWhenDisabled() {
@SuppressWarnings("unchecked")
List<String> args = (List<String>) capability.get("args");
assertThat(args, is(notNullValue()));
assertEquals(1, args.size());
assertEquals(0, args.size());
}

@Test
Expand Down