Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing web tests: Changing jetty module version. Increasing some timeouts.

This commit is contained in:
Martin Stockhammer 2019-01-20 18:49:42 +01:00
parent bc013fa0e4
commit fd76848d46
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archiva-modules/archiva-web/archiva-webapp-test/pom.xml
View File

@ -560,7 +560,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.5.v20170502</version>
<version>${jetty.version}</version>
<configuration>
<stopKey>archivastop</stopKey>
<stopPort>${container.stop.port}</stopPort>
@ -568,6 +568,9 @@
<httpConnector>
<port>${container.http.port}</port>
</httpConnector>
<supportedPackagings>
<supportedPackaging>pom</supportedPackaging>
</supportedPackagings>
</configuration>
<dependencies>
<dependency>

2
archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
View File

@ -90,7 +90,7 @@ public class WebDriverBrowseTest
goTo( url );
// wait until topbar-menu-container is feeded
await().atMost( 5, TimeUnit.SECONDS ).untilPredicate( ( fl ) -> $( "#topbar-menu" ).present() );
await().atMost( 10, TimeUnit.SECONDS ).untilPredicate( ( fl ) -> $( "#topbar-menu" ).present() );
await().atMost( 10, TimeUnit.SECONDS).untilPredicate( (fl) -> el("#create-admin-link-a").conditions().clickable() ||
el("#login-link-a").conditions().clickable()
);

2
archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java
View File

@ -82,7 +82,7 @@ public class WebDriverTest
// wait until topbar-menu-container is feeded
//await().atMost(20, TimeUnit.SECONDS).until($("#topbar-menu")).present();
await().untilPredicate((fl) ->$("#topbar-menu").present());
await().atMost( 10, TimeUnit.SECONDS).untilPredicate((fl) ->$("#topbar-menu").present());
await().atMost( 10, TimeUnit.SECONDS).untilPredicate( ( fl) -> el("#create-admin-link-a").conditions().clickable() ||
el("#login-link-a").conditions().clickable()
);