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

wait a little in selenium test to see if fix test on jenkins @asf 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1232331 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-01-17 08:21:01 +00:00
parent 2f5c8c26fd
commit 8a4c361fd8
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
View File

@ -74,7 +74,6 @@ $(function() {
this.managedRepositoriesViewModel = managedRepositoriesViewModel; this.managedRepositoriesViewModel = managedRepositoriesViewModel;
this.update = update; this.update = update;
var self = this; var self = this;
var currentManagedRepository = this.managedRepository;
save=function(){ save=function(){
var valid = $("#main-content #managed-repository-edit-form").valid(); var valid = $("#main-content #managed-repository-edit-form").valid();
if (valid==false) { if (valid==false) {
@ -106,12 +105,12 @@ $(function() {
{ {
type: "POST", type: "POST",
contentType: 'application/json', contentType: 'application/json',
data: "{\"managedRepository\": " + ko.toJSON(currentManagedRepository)+"}", data: "{\"managedRepository\": " + ko.toJSON(self.managedRepository)+"}",
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
//var repo = mapManagedRepository(data); //var repo = mapManagedRepository(data);
//$.log("data:"+repo.name); //$.log("data:"+data.responseText);
self.managedRepositoriesViewModel.managedRepositories.push(currentManagedRepository); self.managedRepositoriesViewModel.managedRepositories.push(self.managedRepository);
displaySuccessMessage($.i18n.prop('managedrepository.added')); displaySuccessMessage($.i18n.prop('managedrepository.added'));
activateManagedRepositoriesGridTab(); activateManagedRepositoriesGridTab();
}, },

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

@ -219,20 +219,11 @@
<goal>test</goal> <goal>test</goal>
</goals> </goals>
<configuration> <configuration>
<systemProperties> <systemPropertyVariables>
<property> <browser>${selenium.browser}</browser>
<name>browser</name> <baseUrl>${baseUrl}</baseUrl>
<value>${selenium.browser}</value> <maxWaitTimeInMs>${maxWaitTimeInMs}</maxWaitTimeInMs>
</property> </systemPropertyVariables>
<property>
<name>baseUrl</name>
<value>${baseUrl}</value>
</property>
<property>
<name>maxWaitTimeInMs</name>
<value>${maxWaitTimeInMs}</value>
</property>
</systemProperties>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

1
archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
View File

@ -102,6 +102,7 @@ public abstract class AbstractArchivaTest
public void goToLoginPage() public void goToLoginPage()
{ {
getSelenium().open( baseUrl ); getSelenium().open( baseUrl );
waitPage();
// are we already logged in ? // are we already logged in ?
if ( isElementVisible( "logout-link" ) ) //isElementPresent( "logoutLink" ) ) if ( isElementVisible( "logout-link" ) ) //isElementPresent( "logoutLink" ) )
{ {