Merge pull request #3930 from vmuzikar/KEYCLOAK-4554-2

KEYCLOAK-4554 Fix WelcomePage test

testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/welcomepage/WelcomePageTest.java

@@ -1,6 +1,30 @@
-package org.keycloak.testsuite.console.pages;
+/*
+ * Copyright 2017 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.welcomepage;
 
 import org.jboss.arquillian.graphene.page.Page;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
 import org.junit.runners.MethodSorters;
 import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.testsuite.AbstractKeycloakTest;
@@ -25,7 +49,12 @@ public class WelcomePageTest extends AbstractKeycloakTest {
 
     @Page
     protected OIDCLogin loginPage;
-    
+
+    @BeforeClass
+    public static void beforeWelcomePageTest() {
+        Assume.assumeTrue(Boolean.parseBoolean(System.getProperty("skip.add.user.json")));
+    }
+
     @Override
     public void addTestRealms(List<RealmRepresentation> testRealms) {
         // no operation
@@ -39,7 +68,6 @@ public class WelcomePageTest extends AbstractKeycloakTest {
     @Override
     public void beforeAbstractKeycloakTest() {
         setDefaultPageUriParameters();
-        driverSettings();
     }
 
     @After

testsuite/integration-arquillian/tests/other/console_no_users/pom.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ 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.
-  -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.keycloak.testsuite</groupId>
-        <artifactId>integration-arquillian-tests-other</artifactId>
-        <version>3.0.0.CR1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>integration-arquillian-tests-console-no-users</artifactId>
-
-    <name>Admin Console UI Tests - Without pre-configured accounts</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-admin-user-json-file</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

testsuite/integration-arquillian/tests/other/pom.xml

@@ -130,12 +130,6 @@
                 <module>console</module>
             </modules>
         </profile>
-        <profile>
-            <id>console-ui-no-users-tests</id>
-            <modules>
-                <module>console_no_users</module>
-            </modules>
-        </profile>
         <profile>
             <id>mod_auth_mellon</id>
             <modules>