You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by me...@apache.org on 2023/01/18 15:58:17 UTC
[myfaces] branch main updated: build(ci): update arquillian drone to 3.0.0-alpha.7 to support latest chromeDriver package. (#485)
This is an automated email from the ASF dual-hosted git repository.
melloware pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/main by this push:
new 7915b6d0a build(ci): update arquillian drone to 3.0.0-alpha.7 to support latest chromeDriver package. (#485)
7915b6d0a is described below
commit 7915b6d0a22d008c880097a3a132ebfcf0a20ffa
Author: Bernd Bohmann <bo...@apache.org>
AuthorDate: Wed Jan 18 16:58:11 2023 +0100
build(ci): update arquillian drone to 3.0.0-alpha.7 to support latest chromeDriver package. (#485)
* build(ci): update arquillian drone to 3.0.0-alpha.7 to support latest chromeDriver package.
remove graphene it's only supporting an old version of selenium.
update selenium and tomcat versions.
minor fixes
* build(ci): update arquillian drone to 3.0.0-alpha.7 to support latest chromeDriver package.
remove graphene it's only supporting an old version of selenium.
update selenium and tomcat versions.
minor fixes
---
.github/workflows/myfaces-ci.yml | 2 +-
Jenkinsfile | 1 +
README.md | 2 +-
integration-tests/ajax/readme.txt | 6 ++--
.../integrationtests/ajax/IntegrationTest.java | 35 ++++++--------------
.../ajax/src/test/resources/arquillian.xml | 7 ++--
.../src/test/resources/arquillian.xml | 7 ++--
.../src/test/resources/arquillian.xml | 7 ++--
.../core/integrationtests/IntegrationTest.java | 27 ++++++++++------
.../exactMapping/src/test/resources/arquillian.xml | 7 ++--
.../src/test/resources/arquillian.xml | 7 ++--
.../src/test/resources/arquillian.xml | 7 ++--
integration-tests/pom.xml | 37 +++++++++++-----------
.../core/integrationtests/IntegrationTest.java | 6 ++--
.../src/test/resources/arquillian.xml | 7 ++--
15 files changed, 81 insertions(+), 84 deletions(-)
diff --git a/.github/workflows/myfaces-ci.yml b/.github/workflows/myfaces-ci.yml
index eac92f1c1..e523c6b90 100644
--- a/.github/workflows/myfaces-ci.yml
+++ b/.github/workflows/myfaces-ci.yml
@@ -70,7 +70,7 @@ jobs:
restore-keys: ${{ runner.os }}-m2
- name: Build with Maven
run: |
- if ! mvn -B -V clean verify checkstyle:check apache-rat:check -Dformats=XML -f pom.xml; then
+ if ! mvn -B -V clean verify checkstyle:check apache-rat:check -Dformats=XML -DchromeDriverVersion=108.0.5359.71 -f pom.xml; then
find . \( -path '*/target/surefire-reports/*.xml' -o -path '*/target/failsafe-reports/*.xml' -o -path '*/target/rat.txt' -o -path '*/target/checkstyle-result.xml' -o -path '*/target/dependency-check-report.xml' \) | zip -q reports.zip -@
exit 1
fi
diff --git a/Jenkinsfile b/Jenkinsfile
index dc5e33e67..1da92b9d1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,6 +54,7 @@ pipeline {
stages {
stage('BuildAndTest') {
steps {
+ sh 'find . -name "debug.log" -exec rm {} \;'
sh 'mvn -V clean verify checkstyle:check apache-rat:check'
}
post {
diff --git a/README.md b/README.md
index 2fa01899b..29a68f0b5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# Apache MyFaces Core
[![Build Status](https://github.com/apache/myfaces/workflows/MyFaces%20CI/badge.svg)](https://github.com/apache/myfaces/actions/workflows/myfaces-ci.yml)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![Build Status ASF](https://ci-builds.apache.org/buildStatus/icon?subject=ASF-Build&job=MyFaces%2FMyFaces%20Core%20Master)](https://ci-builds.apache.org/job/MyFaces/job/MyFaces%20Core%20Master/)
+[![Build Status ASF](https://ci-builds.apache.org/buildStatus/icon?subject=ASF-Build&job=MyFaces%2FMyFaces+Pipeline%2Fmain)](https://ci-builds.apache.org/job/MyFaces/job/MyFaces%20Pipeline/job/main/)
Apache's implementation of the JavaServer Faces (JSF) and Jakarta Faces specification
diff --git a/integration-tests/ajax/readme.txt b/integration-tests/ajax/readme.txt
index 8f106921d..ff5442fe4 100644
--- a/integration-tests/ajax/readme.txt
+++ b/integration-tests/ajax/readme.txt
@@ -1,6 +1,6 @@
-run integration test manually: mvn clean integration-test -Ptomcat-embedded-9
+run integration test manually: mvn clean integration-test -Ptomcat-embedded-10
run jetty: mvn clean package jetty:run-exploded
-JDK baseline JAVA-8
+JDK baseline JAVA-11
-debug tests: mvn clean integration-test -Ptomcat-embedded-9 -Dmaven.surefire.debug
+debug tests: mvn clean integration-test -Ptomcat-embedded-10 -Dmaven.surefire.debug
and remote debug into port 5005
diff --git a/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java b/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java
index 33239f1d5..8b403fd31 100644
--- a/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java
+++ b/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java
@@ -21,8 +21,6 @@ package org.apache.myfaces.core.integrationtests.ajax;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
-import org.jboss.arquillian.graphene.javascript.JavaScript;
-import org.jboss.arquillian.graphene.request.RequestGuard;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -33,17 +31,18 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.openqa.selenium.By;
-import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ByIdOrName;
+import org.openqa.selenium.support.ui.ExpectedCondition;
+import org.openqa.selenium.support.ui.WebDriverWait;
import java.io.File;
import java.net.URL;
+import java.time.Duration;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
-import static org.jboss.arquillian.graphene.Graphene.waitAjax;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -91,14 +90,6 @@ public class IntegrationTest
@ArquillianResource
protected URL contextPath;
- @ArquillianResource
- JavascriptExecutor executor;
-
-
- @JavaScript
- RequestGuard guard;
-
-
@After
public void after()
{
@@ -112,14 +103,8 @@ public class IntegrationTest
public void resetServerValues()
{
- waitAjax().withTimeout(10, TimeUnit.SECONDS).until(new Function<WebDriver, Object>()
- {
-
- public Object apply(WebDriver webDriver)
- {
- return webDriver.findElement(By.id("_reset_all")).isDisplayed();
- }
- });
+ WebDriverWait wait = new WebDriverWait(webDriver, Duration.ofMillis(20));
+ wait.until((ExpectedCondition<Boolean>) driver -> driver.findElement(By.id("_reset_all")).isDisplayed());
webDriver.findElement(new By.ById("_reset_all")).click();
}
@@ -131,7 +116,8 @@ public class IntegrationTest
resetServerValues();
webDriver.findElement(new ByIdOrName("mainForm:press")).click();
- waitAjax().withTimeout(10, TimeUnit.SECONDS).until((Function<WebDriver, Object>) webDriver -> webDriver.getPageSource().contains("Action Performed"));
+ WebDriverWait wait = new WebDriverWait(webDriver, Duration.ofMillis(20));
+ wait.until((ExpectedCondition<Boolean>) driver -> driver.getPageSource().contains("Action Performed"));
assertTrue(webDriver.getPageSource().contains("ViewState"));
assertTrue(webDriver.getPageSource().contains("_ajax_found"));
assertTrue(webDriver.getPageSource().contains("Action Performed"));
@@ -331,12 +317,11 @@ public class IntegrationTest
* @param id the trigger element id
* @param condition a condition resolver which should return true if the condition is met
*/
- void trigger(String id, Function<WebDriver, Object> condition)
+ void trigger(String id, ExpectedCondition<Boolean> condition)
{
webDriver.findElement(new ByIdOrName(id)).click();
- waitAjax()
- .withTimeout(10, TimeUnit.SECONDS)
- .until(condition);
+ WebDriverWait wait = new WebDriverWait(webDriver, Duration.ofMillis(200));
+ wait.until(condition);
}
diff --git a/integration-tests/ajax/src/test/resources/arquillian.xml b/integration-tests/ajax/src/test/resources/arquillian.xml
index 10eb4335f..c65172d61 100644
--- a/integration-tests/ajax/src/test/resources/arquillian.xml
+++ b/integration-tests/ajax/src/test/resources/arquillian.xml
@@ -23,16 +23,17 @@
<extension qualifier="webdriver">
<property name="browser">chromeHeadless</property>
- <property name="chromeDriverVersion">108.0.5359.71</property>
+ <property name="browserVersion">100</property>
+ <property name="chromeDriverVersion">${chromeDriverVersion}</property>
</extension>
<container qualifier="tomcat" default="true">
<configuration>
- <property name="tomcatHome">target/tomcat-embedded-8</property>
+ <property name="tomcatHome">target/tomcat-embedded-10</property>
<property name="workDir">work</property>
<property name="bindHttpPort">8888</property>
<property name="unpackArchive">true</property>
- <property name="serverName">arquillian-tomcat-embedded-8</property>
+ <property name="serverName">arquillian-tomcat-embedded-10</property>
</configuration>
</container>
</arquillian>
diff --git a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/resources/arquillian.xml b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/resources/arquillian.xml
index 10eb4335f..c65172d61 100644
--- a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/resources/arquillian.xml
+++ b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/resources/arquillian.xml
@@ -23,16 +23,17 @@
<extension qualifier="webdriver">
<property name="browser">chromeHeadless</property>
- <property name="chromeDriverVersion">108.0.5359.71</property>
+ <property name="browserVersion">100</property>
+ <property name="chromeDriverVersion">${chromeDriverVersion}</property>
</extension>
<container qualifier="tomcat" default="true">
<configuration>
- <property name="tomcatHome">target/tomcat-embedded-8</property>
+ <property name="tomcatHome">target/tomcat-embedded-10</property>
<property name="workDir">work</property>
<property name="bindHttpPort">8888</property>
<property name="unpackArchive">true</property>
- <property name="serverName">arquillian-tomcat-embedded-8</property>
+ <property name="serverName">arquillian-tomcat-embedded-10</property>
</configuration>
</container>
</arquillian>
diff --git a/integration-tests/automaticExtensionlessMapping/src/test/resources/arquillian.xml b/integration-tests/automaticExtensionlessMapping/src/test/resources/arquillian.xml
index 10eb4335f..c65172d61 100644
--- a/integration-tests/automaticExtensionlessMapping/src/test/resources/arquillian.xml
+++ b/integration-tests/automaticExtensionlessMapping/src/test/resources/arquillian.xml
@@ -23,16 +23,17 @@
<extension qualifier="webdriver">
<property name="browser">chromeHeadless</property>
- <property name="chromeDriverVersion">108.0.5359.71</property>
+ <property name="browserVersion">100</property>
+ <property name="chromeDriverVersion">${chromeDriverVersion}</property>
</extension>
<container qualifier="tomcat" default="true">
<configuration>
- <property name="tomcatHome">target/tomcat-embedded-8</property>
+ <property name="tomcatHome">target/tomcat-embedded-10</property>
<property name="workDir">work</property>
<property name="bindHttpPort">8888</property>
<property name="unpackArchive">true</property>
- <property name="serverName">arquillian-tomcat-embedded-8</property>
+ <property name="serverName">arquillian-tomcat-embedded-10</property>
</configuration>
</container>
</arquillian>
diff --git a/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index 4f4a529e3..6afc468dc 100644
--- a/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -20,11 +20,12 @@ package org.apache.myfaces.core.integrationtests;
import java.io.File;
import java.net.URL;
+import java.time.Duration;
+
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
-import org.jboss.arquillian.graphene.Graphene;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.importer.ZipImporter;
@@ -35,8 +36,10 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.openqa.selenium.By;
-import org.openqa.selenium.Dimension;
import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedCondition;
+import org.openqa.selenium.support.ui.WebDriverWait;
@RunWith(Arquillian.class)
@RunAsClient
@@ -112,7 +115,8 @@ public class IntegrationTest
String url = webDriver.getCurrentUrl();
// post to foo.xhtml
- Graphene.guardHttp(webDriver.findElement(By.id("form:commandButton"))).click();
+ WebElement element = webDriver.findElement(By.id("form:commandButton"));
+ element.click();
// check if method was invoked
Assert.assertTrue(webDriver.getPageSource().contains("foo invoked"));
@@ -130,7 +134,8 @@ public class IntegrationTest
Assert.assertTrue(webDriver.getPageSource().contains("foo-view"));
// navigate to bar.xhtml
- Graphene.guardHttp(webDriver.findElement(By.id("form:button"))).click();
+ WebElement element = webDriver.findElement(By.id("form:button"));
+ element.click();
// check if we are on bar.xhtml
Assert.assertTrue(webDriver.getPageSource().contains("bar-view"));
@@ -150,10 +155,12 @@ public class IntegrationTest
webDriver.get(contextPath + "foo");
// nagivate to non-exact-mapping (bar.xhtml)
- Graphene.guardHttp(webDriver.findElement(By.id("form:button"))).click();
+ WebElement element = webDriver.findElement(By.id("form:button"));
+ element.click();
// post to bar.xhtml
- Graphene.guardHttp(webDriver.findElement(By.id("form:commandButton"))).click();
+ WebElement element1 = webDriver.findElement(By.id("form:commandButton"));
+ element1.click();
// check if post was successful
Assert.assertTrue(webDriver.getPageSource().contains("foo invoked"));
@@ -181,9 +188,9 @@ public class IntegrationTest
webDriver.get(contextPath + "foo");
// call ajax button
- Graphene.guardAjax(webDriver.findElement(By.id("form:commandButtonAjax"))).click();
-
- // check if the button was invoked
- Assert.assertTrue(webDriver.getPageSource().contains("fooAjax invoked"));
+ WebElement element = webDriver.findElement(By.id("form:commandButtonAjax"));
+ element.click();
+ WebDriverWait wait = new WebDriverWait(webDriver, Duration.ofMillis(20));
+ wait.until((ExpectedCondition<Boolean>) driver -> driver.getPageSource().contains("fooAjax invoked"));
}
}
diff --git a/integration-tests/exactMapping/src/test/resources/arquillian.xml b/integration-tests/exactMapping/src/test/resources/arquillian.xml
index 10eb4335f..c65172d61 100644
--- a/integration-tests/exactMapping/src/test/resources/arquillian.xml
+++ b/integration-tests/exactMapping/src/test/resources/arquillian.xml
@@ -23,16 +23,17 @@
<extension qualifier="webdriver">
<property name="browser">chromeHeadless</property>
- <property name="chromeDriverVersion">108.0.5359.71</property>
+ <property name="browserVersion">100</property>
+ <property name="chromeDriverVersion">${chromeDriverVersion}</property>
</extension>
<container qualifier="tomcat" default="true">
<configuration>
- <property name="tomcatHome">target/tomcat-embedded-8</property>
+ <property name="tomcatHome">target/tomcat-embedded-10</property>
<property name="workDir">work</property>
<property name="bindHttpPort">8888</property>
<property name="unpackArchive">true</property>
- <property name="serverName">arquillian-tomcat-embedded-8</property>
+ <property name="serverName">arquillian-tomcat-embedded-10</property>
</configuration>
</container>
</arquillian>
diff --git a/integration-tests/faceletToXhtmlMapping/src/test/resources/arquillian.xml b/integration-tests/faceletToXhtmlMapping/src/test/resources/arquillian.xml
index 10eb4335f..c65172d61 100644
--- a/integration-tests/faceletToXhtmlMapping/src/test/resources/arquillian.xml
+++ b/integration-tests/faceletToXhtmlMapping/src/test/resources/arquillian.xml
@@ -23,16 +23,17 @@
<extension qualifier="webdriver">
<property name="browser">chromeHeadless</property>
- <property name="chromeDriverVersion">108.0.5359.71</property>
+ <property name="browserVersion">100</property>
+ <property name="chromeDriverVersion">${chromeDriverVersion}</property>
</extension>
<container qualifier="tomcat" default="true">
<configuration>
- <property name="tomcatHome">target/tomcat-embedded-8</property>
+ <property name="tomcatHome">target/tomcat-embedded-10</property>
<property name="workDir">work</property>
<property name="bindHttpPort">8888</property>
<property name="unpackArchive">true</property>
- <property name="serverName">arquillian-tomcat-embedded-8</property>
+ <property name="serverName">arquillian-tomcat-embedded-10</property>
</configuration>
</container>
</arquillian>
diff --git a/integration-tests/faceletToXhtmlMappingDisabled/src/test/resources/arquillian.xml b/integration-tests/faceletToXhtmlMappingDisabled/src/test/resources/arquillian.xml
index bad2c0d6d..3561b630b 100644
--- a/integration-tests/faceletToXhtmlMappingDisabled/src/test/resources/arquillian.xml
+++ b/integration-tests/faceletToXhtmlMappingDisabled/src/test/resources/arquillian.xml
@@ -23,16 +23,17 @@
<extension qualifier="webdriver">
<property name="browser">chromeHeadless</property>
- <property name="chromeDriverVersion">108.0.5359.71</property>
+ <property name="browserVersion">100</property>
+ <property name="chromeDriverVersion">${chromeDriverVersion}</property>
</extension>
<container qualifier="tomcat" default="true">
<configuration>
- <property name="tomcatHome">target/tomcat-embedded-8</property>
+ <property name="tomcatHome">target/tomcat-embedded-10</property>
<property name="workDir">work</property>
<property name="bindHttpPort">8888</property>
<property name="unpackArchive">true</property>
- <property name="serverName">arquillian-tomcat-embedded-8</property>
+ <property name="serverName">arquillian-tomcat-embedded-10</property>
</configuration>
</container>
</arquillian>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 10fa82348..092c7b766 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
- <version>10.0.27</version>
+ <version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
- <version>3.14.0</version>
+ <version>4.7.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -158,9 +158,17 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.graphene</groupId>
- <artifactId>graphene-webdriver</artifactId>
- <version>2.3.2</version>
+ <groupId>org.jboss.arquillian.extension</groupId>
+ <artifactId>arquillian-drone-bom</artifactId>
+ <version>${arquillian-drone.version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.extension</groupId>
+ <artifactId>arquillian-drone-webdriver-depchain</artifactId>
+ <version>${arquillian-drone.version}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
@@ -190,17 +198,6 @@
</dependency>
</dependencies>
- <dependencyManagement>
- <dependencies>
- <!-- we need to specify the correct version because of conflict in arquillian-drone-webdriver-depchain -->
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>htmlunit-driver</artifactId>
- <version>4.7.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<modules>
<module>faceletToXhtmlMapping</module>
<module>faceletToXhtmlMappingDisabled</module>
@@ -227,19 +224,19 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>10.0.27</version>
+ <version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
- <version>10.0.27</version>
+ <version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
- <version>10.0.27</version>
+ <version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -255,5 +252,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>11</java.version>
+ <tomcat.version>10.1.5</tomcat.version>
+ <arquillian-drone.version>3.0.0-alpha.7</arquillian-drone.version>
</properties>
</project>
diff --git a/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index fcf18a6e3..9e95875ca 100644
--- a/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -24,7 +24,6 @@ import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
-import org.jboss.arquillian.graphene.Graphene;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.importer.ZipImporter;
@@ -94,9 +93,8 @@ public class IntegrationTest
WebElement link = webDriver.findElement(By.id("link"));
Assert.assertTrue(link.getAttribute("href").contains("jakarta.faces.Token"));
-
- Graphene.guardHttp(link).click();
-
+ link.click();
+
Assert.assertTrue(webDriver.getPageSource().contains("Protected View"));
}
diff --git a/integration-tests/protectedViews/src/test/resources/arquillian.xml b/integration-tests/protectedViews/src/test/resources/arquillian.xml
index 10eb4335f..c65172d61 100644
--- a/integration-tests/protectedViews/src/test/resources/arquillian.xml
+++ b/integration-tests/protectedViews/src/test/resources/arquillian.xml
@@ -23,16 +23,17 @@
<extension qualifier="webdriver">
<property name="browser">chromeHeadless</property>
- <property name="chromeDriverVersion">108.0.5359.71</property>
+ <property name="browserVersion">100</property>
+ <property name="chromeDriverVersion">${chromeDriverVersion}</property>
</extension>
<container qualifier="tomcat" default="true">
<configuration>
- <property name="tomcatHome">target/tomcat-embedded-8</property>
+ <property name="tomcatHome">target/tomcat-embedded-10</property>
<property name="workDir">work</property>
<property name="bindHttpPort">8888</property>
<property name="unpackArchive">true</property>
- <property name="serverName">arquillian-tomcat-embedded-8</property>
+ <property name="serverName">arquillian-tomcat-embedded-10</property>
</configuration>
</container>
</arquillian>