From d64fb69fac313212181e25a6a1f76674ceefa278 Mon Sep 17 00:00:00 2001 From: mhajas Date: Mon, 20 Mar 2017 15:04:32 +0100 Subject: [PATCH 1/2] KEYCLOAK-3961 Fix wrong conflict merge --- .../test-apps/js-console/src/main/webapp/index.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/testsuite/integration-arquillian/test-apps/js-console/src/main/webapp/index.html b/testsuite/integration-arquillian/test-apps/js-console/src/main/webapp/index.html index f34878afd3..0f1d3f2dd2 100755 --- a/testsuite/integration-arquillian/test-apps/js-console/src/main/webapp/index.html +++ b/testsuite/integration-arquillian/test-apps/js-console/src/main/webapp/index.html @@ -194,9 +194,6 @@ TimeSkew: function sendBearerToKeycloak() { var url = 'http://localhost:8180/auth/admin/realms/example/roles'; if (window.location.href.indexOf("8643") > -1) { - url = url.replace("8180","8543"); - url = url.replace("http","https"); - if (window.location.href.indexOf("8543") > -1) { url = url.replace("8180", "8543"); url = url.replace("http", "https"); } From 223910d6efa4fd1ea84236761a66f75bd3b0d111 Mon Sep 17 00:00:00 2001 From: mhajas Date: Fri, 19 May 2017 13:23:41 +0200 Subject: [PATCH 2/2] KEYCLOAK-4938 Ignore testVersion test --- .../adapter/servlet/AbstractDemoServletsAdapterTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java index cf50cce83f..6ce3e21663 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java @@ -445,6 +445,7 @@ public abstract class AbstractDemoServletsAdapterTest extends AbstractServletsAd } @Test + @Ignore public void testVersion() { Client client = ClientBuilder.newClient(); WebTarget target = client.target(authServerPage.createUriBuilder()).path("version");