Changing tests to WebDriver

3 files changed, 156 insertions, 1 deletions

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index b88e7ba6e..0ebd605a4 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -963,6 +963,143 @@
       </plugin>
       -->
       <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>9.4.5.v20170502</version>
+        <configuration>
+          <scanIntervalSeconds>10</scanIntervalSeconds>
+          <webApp>
+            <contextPath>/archiva</contextPath>
+          </webApp>
+          <jettyXml>${basedir}/src/test/jetty/jetty-env.xml</jettyXml>
+
+          <systemProperties>
+            <systemProperty>
+              <name>plexus.home</name>
+              <value>${archivaAppServerBase}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>appserver.base</name>
+              <value>${archivaAppServerBase}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>appserver.home</name>
+              <value>${archivaAppServerBase}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>derby.system.home</name>
+              <value>${archivaAppServerBase}/logs</value>
+            </systemProperty>
+            <systemProperty>
+              <name>java.io.tmpdir</name>
+              <value>${project.build.directory}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>archiva.user.configFileName</name>
+              <value>${archivaAppServerBase}/conf/archiva.xml</value>
+            </systemProperty>
+            <systemProperty>
+              <name>archiva.devMode</name>
+              <value>${archiva.devMode}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>archiva.javascriptLog</name>
+              <value>${archiva.javascriptLog}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>archiva.logMissingI18n</name>
+              <value>${archiva.logMissingI18n}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>cassandra.host</name>
+              <value>${cassandra.host}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>cassandra.port</name>
+              <value>${cassandra.port}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>archiva.repositorySessionFactory.id</name>
+              <value>${archiva.repositorySessionFactory.id}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>org.apache.sirona.configuration.sirona.properties</name>
+              <value>${archiva.sirona.configuration}</value>
+            </systemProperty>
+            <systemProperty>
+              <name>AsyncLoggerConfig.WaitStrategy</name>
+              <value>Block</value>
+            </systemProperty>
+            <systemProperty>
+              <name>AsyncLogger.WaitStrategy</name>
+              <value>Block</value>
+            </systemProperty>
+            <systemProperty>
+              <name>openjpa.Log</name>
+              <value>${openjpa.Log}</value>
+            </systemProperty>
+          </systemProperties>
+
+        </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.derby</groupId>
+              <artifactId>derby</artifactId>
+              <version>${derbyVersion}</version>
+            </dependency>
+            <dependency>
+              <groupId>javax.mail</groupId>
+              <artifactId>mail</artifactId>
+              <version>${javaxMailVersion}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.openjpa</groupId>
+              <artifactId>openjpa</artifactId>
+              <version>${openjpaVersion}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.geronimo.specs</groupId>
+              <artifactId>geronimo-jpa_2.0_spec</artifactId>
+              <version>1.1</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.geronimo.specs</groupId>
+              <artifactId>geronimo-jta_1.1_spec</artifactId>
+              <version>1.1.1</version>
+            </dependency>
+            <dependency>
+              <groupId>net.sourceforge.serp</groupId>
+              <artifactId>serp</artifactId>
+              <version>1.15.1</version>
+            </dependency>
+
+            <dependency>
+              <groupId>org.eclipse.jetty</groupId>
+              <artifactId>jetty-io</artifactId>
+              <version>9.4.5.v20170502</version>
+            </dependency>
+            <dependency>
+              <groupId>org.eclipse.jetty</groupId>
+              <artifactId>jetty-util</artifactId>
+              <version>9.4.5.v20170502</version>
+            </dependency>
+            <dependency>
+              <groupId>org.eclipse.jetty</groupId>
+              <artifactId>jetty-client</artifactId>
+              <version>9.4.5.v20170502</version>
+            </dependency>
+            <dependency>
+              <groupId>org.eclipse.jetty.websocket</groupId>
+              <artifactId>websocket-client</artifactId>
+              <version>9.4.5.v20170502</version>
+            </dependency>
+
+          </dependencies>
+
+      </plugin>
+
+
+      <plugin>
         <groupId>org.apache.tomcat.maven</groupId>
         <artifactId>tomcat7-maven-plugin</artifactId>
         <configuration>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
index df8c42e4a..30bb2615f 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
@@ -88,7 +88,7 @@
               </a>
             </li>
             <li id="login-link" style="display: none">
-              <a onclick="loginBox();" id="login-link-a">
+              <a onclick="loginBox(); return false;" id="login-link-a">
                 <span class="btn btn-success label force-upper-case">${$.i18n.prop('login')}</span>
               </a>
             </li>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/jetty/jetty-env.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/jetty/jetty-env.xml
index 1668649ca..bed63bfa3 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/jetty/jetty-env.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/jetty/jetty-env.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0"  encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you 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.
+  -->
 <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 <Configure id="wac" class="org.eclipse.jetty.webapp.WebAppContext">