diff --git a/pom.xml b/pom.xml index 2d407e8..25b08a4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ kg.apc jmeter-plugins-webdriver - 4.13.0.0 + 4.15.0.0 jar WebDriver/Selenium @@ -34,7 +34,9 @@ UTF-8 1.8 1.8 - 4.13.0 + + + 4.15.0 @@ -42,7 +44,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.13 true sonatype-nexus-staging @@ -51,22 +53,22 @@ - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M7 - - - --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 - - - + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M7 + + + --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 + + + @@ -141,9 +143,16 @@ org.seleniumhq.selenium - htmlunit-driver + htmlunit3-driver + 4.15.0 + + + + org.seleniumhq.selenium + selenium-manager ${selenium.version} + xml-apis @@ -176,7 +185,7 @@ com.fasterxml.jackson.core jackson-databind - 2.15.3 + 2.16.0 de.sciss @@ -202,4 +211,5 @@ test + diff --git a/src/test/java/com/googlecode/jmeter/plugins/webdriver/config/ChromeDriverConfigTest.java b/src/test/java/com/googlecode/jmeter/plugins/webdriver/config/ChromeDriverConfigTest.java index 350fa13..f9fdd45 100644 --- a/src/test/java/com/googlecode/jmeter/plugins/webdriver/config/ChromeDriverConfigTest.java +++ b/src/test/java/com/googlecode/jmeter/plugins/webdriver/config/ChromeDriverConfigTest.java @@ -179,15 +179,14 @@ public void shouldHaveChromeOptionsWhenRemoteIsEnabled() { @SuppressWarnings("unchecked") List args = (List) 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 diff --git a/src/test/java/com/googlecode/jmeter/plugins/webdriver/config/EdgeDriverConfigTest.java b/src/test/java/com/googlecode/jmeter/plugins/webdriver/config/EdgeDriverConfigTest.java index b7441af..8af76a1 100644 --- a/src/test/java/com/googlecode/jmeter/plugins/webdriver/config/EdgeDriverConfigTest.java +++ b/src/test/java/com/googlecode/jmeter/plugins/webdriver/config/EdgeDriverConfigTest.java @@ -179,15 +179,14 @@ public void shouldHaveEdgeOptionsWhenRemoteIsEnabled() { @SuppressWarnings("unchecked") List args = (List) 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 diff --git a/src/test/java/com/googlecode/jmeter/plugins/webdriver/config/RemoteDriverConfigTest.java b/src/test/java/com/googlecode/jmeter/plugins/webdriver/config/RemoteDriverConfigTest.java index 3c87869..cdb5564 100644 --- a/src/test/java/com/googlecode/jmeter/plugins/webdriver/config/RemoteDriverConfigTest.java +++ b/src/test/java/com/googlecode/jmeter/plugins/webdriver/config/RemoteDriverConfigTest.java @@ -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)); @@ -122,9 +122,8 @@ public void shouldHaveHeadlessInChromeOptionsWhenEnabled() { @SuppressWarnings("unchecked") List args = (List) 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 @@ -137,7 +136,7 @@ public void shouldNotHaveHeadlessInChromeOptionsWhenDisabled() { @SuppressWarnings("unchecked") List args = (List) capability.get("args"); assertThat(args, is(notNullValue())); - assertEquals(1, args.size()); + assertEquals(0, args.size()); } @Test