summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test/pom.xml22
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties13
2 files changed, 29 insertions, 6 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 126580380..1b507b051 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -88,6 +88,16 @@
<testSourceDirectory>src/test/it</testSourceDirectory>
<plugins>
<plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testResources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
<executions>
@@ -136,22 +146,22 @@
<configuration>
<tasks>
<copy todir="${project.build.directory}/appserver-base">
- <fileset dir="src/test/resources/appserver-base" />
+ <fileset dir="src/test/it-resources/appserver-base" />
</copy>
<copy todir="${project.build.directory}/repository">
- <fileset dir="src/test/resources/repository" />
+ <fileset dir="src/test/it-resources/repository" />
</copy>
<copy todir="${project.build.directory}/index">
- <fileset dir="src/test/resources/index" />
+ <fileset dir="src/test/it-resources/index" />
</copy>
<copy todir="${project.build.directory}/snapshots">
- <fileset dir="src/test/resources/snapshots" />
+ <fileset dir="src/test/it-resources/snapshots" />
</copy>
<copy todir="${project.build.directory}/projects">
- <fileset dir="src/test/resources/projects" />
+ <fileset dir="src/test/it-resources/projects" />
</copy>
<copy todir="${project.build.directory}/local-repo">
- <fileset dir="src/test/resources/local-repo" />
+ <fileset dir="src/test/it-resources/local-repo" />
</copy>
</tasks>
</configuration>
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties
new file mode 100644
index 000000000..a42183055
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties
@@ -0,0 +1,13 @@
+#properties for integration tests
+
+BASE_URL=http://localhost:9696/archiva
+MAX_WAIT_TIME_IN_MS=60000
+
+ADMIN_USERNAME=admin
+ADMIN_FULLNAME=Administrator
+ADMIN_EMAIL=admin@localhost
+ADMIN_PASSWORD=admin123
+
+SELENIUM_HOST=localhost
+SELENIUM_PORT=4444
+SELENIUM_BROWSER=*firefox