diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/common/install-features.bat b/testsuite/integration-arquillian/servers/app-server/karaf/common/install-features.bat
index 7abbf5addd..58d14edc61 100644
--- a/testsuite/integration-arquillian/servers/app-server/karaf/common/install-features.bat
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/common/install-features.bat
@@ -28,6 +28,10 @@ if "%UNINSTALL_PAX%" == "true" (
call client.bat %CLIENT_AUTH% -f uninstall-pax.cli
if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
)
+if "%UPDATE_CONFIG%" == "true" (
+ call client.bat %CLIENT_AUTH% -f update-config.cli
+ if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
+)
call client.bat %CLIENT_AUTH% -f install-features.cli
if %ERRORLEVEL% neq 0 set ERROR=%ERRORLEVEL%
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/common/install-features.sh b/testsuite/integration-arquillian/servers/app-server/karaf/common/install-features.sh
index 4173908c30..d094ff4c7d 100755
--- a/testsuite/integration-arquillian/servers/app-server/karaf/common/install-features.sh
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/common/install-features.sh
@@ -22,6 +22,16 @@ do
if [ $? -ne 0 ]; then RESULT=1; fi
fi
+ if "$UPDATE_CONFIG" == "true"; then
+ echo "Updating Config - org.ops4j.pax.url.mvn"
+ ./client $CLIENT_AUTH -f update-config.cli
+ if [ $? -ne 0 ]; then
+ RESULT=1;
+ else
+ ./client $CLIENT_AUTH config:list | grep org.ops4j.pax.url.mvn.
+ fi
+ fi
+
echo "Installing features."
./client $CLIENT_AUTH -f install-features.cli
if [ $? -ne 0 ]; then RESULT=1; fi
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse62/src/main/resources/update-config.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse62/src/main/resources/update-config.cli
new file mode 100644
index 0000000000..d6a425a0f7
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse62/src/main/resources/update-config.cli
@@ -0,0 +1,5 @@
+config:edit org.ops4j.pax.url.mvn
+config:propset org.ops4j.pax.url.mvn.localRepository ${maven.repo.local}
+config:propset org.ops4j.pax.url.mvn.settings ${maven.local.settings}
+config:propappend org.ops4j.pax.url.mvn.repositories ${repositories}
+config:update
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/karaf3/src/main/resources/update-config.cli b/testsuite/integration-arquillian/servers/app-server/karaf/karaf3/src/main/resources/update-config.cli
new file mode 100644
index 0000000000..908bd0e7e4
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/karaf3/src/main/resources/update-config.cli
@@ -0,0 +1,5 @@
+config:edit org.ops4j.pax.url.mvn
+config:property-set org.ops4j.pax.url.mvn.localRepository ${maven.repo.local}
+config:property-set org.ops4j.pax.url.mvn.settings ${maven.local.settings}
+config:property-append org.ops4j.pax.url.mvn.repositories ${repositories}
+config:update
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml b/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
index 849162e549..fa3cdc2d01 100644
--- a/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
@@ -35,6 +35,7 @@
${containers.home}/${app.server.karaf.unpacked.folder.name}
-u karaf
false
+ false
@@ -103,7 +104,7 @@
maven-resources-plugin
- copy-features-clie
+ copy-clis
process-resources
copy-resources
@@ -115,6 +116,7 @@
src/main/resources
install-features.cli
+ update-config.cli
true
@@ -161,6 +163,7 @@
${app.server.java.home}
${app.server.karaf.client.auth}
${app.server.karaf.uninstall.pax}
+ ${app.server.karaf.update.config}
diff --git a/testsuite/integration-arquillian/servers/pom.xml b/testsuite/integration-arquillian/servers/pom.xml
index 52ca04d01b..0a640f57ce 100644
--- a/testsuite/integration-arquillian/servers/pom.xml
+++ b/testsuite/integration-arquillian/servers/pom.xml
@@ -38,7 +38,6 @@
7.0.0.ER6-redhat-1
7.5.6.Final-redhat-2
7.1.1.Final
- 7.5.6.Final-redhat-2
7.0.68
8.0.32
9.0.0.M3
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/fuse/AbstractFuseExample.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/fuse/AbstractFuseExample.java
index 3553d66d1b..ae91ab6bdf 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/fuse/AbstractFuseExample.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/fuse/AbstractFuseExample.java
@@ -42,5 +42,20 @@ public abstract class AbstractFuseExample extends AppServerContextRoot {
}
return url;
}
-
+
+ /*
+ * non-javadoc
+ *
+ * When run tests with phantomjs customer or prutuct portal page isn't properly
+ * loaded. This method reloads page in such case.
+ */
+ @Override
+ public void navigateTo() {
+ super.navigateTo();
+
+ if (driver.getPageSource().contains("")) {
+ log.debug("Page wasn't properly loaded - redirecting.");
+ super.navigateTo();
+ }
+ }
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractFuseExampleAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractFuseExampleAdapterTest.java
index 1119eb76ad..cc137242fe 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractFuseExampleAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/AbstractFuseExampleAdapterTest.java
@@ -58,8 +58,8 @@ public abstract class AbstractFuseExampleAdapterTest extends AbstractExampleAdap
@Override
public void addAdapterTestRealms(List testRealms) {
- RealmRepresentation fureRealm = loadRealm(new File(EXAMPLES_HOME_DIR + "/fuse/testrealm.json"));
- testRealms.add(fureRealm);
+ RealmRepresentation fuseRealm = loadRealm(new File(EXAMPLES_HOME_DIR + "/fuse/testrealm.json"));
+ testRealms.add(fuseRealm);
}
@Override
@@ -121,6 +121,7 @@ public abstract class AbstractFuseExampleAdapterTest extends AbstractExampleAdap
pause(500);
assertCurrentUrlStartsWith(customerPortal);
+ customerPortal.navigateTo();//needed for phantomjs
customerPortal.clickAdminInterfaceLink();
assertCurrentUrlStartsWithLoginUrlOf(testRealmPage);
diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse62/src/test/java/org/keycloak/testsuite/adapter/example/Fuse62ExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse62/src/test/java/org/keycloak/testsuite/adapter/example/Fuse62ExampleAdapterTest.java
index 73af6e9213..1a6e3048b5 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse62/src/test/java/org/keycloak/testsuite/adapter/example/Fuse62ExampleAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse62/src/test/java/org/keycloak/testsuite/adapter/example/Fuse62ExampleAdapterTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2016 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.keycloak.testsuite.adapter.example;
import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;