svn commit: r1232331 - in /archiva/trunk/archiva-modules/archiva-web: archiva-webapp-js/src/main/webapp/js/archiva/ archiva-webapp-test-js/ archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/

[olamy]

Author: olamy
Date: Tue Jan 17 08:21:01 2012
New Revision: 1232331

URL: http://svn.apache.org/viewvc?rev=1232331&view=rev
Log:
wait a little in selenium test to see if fix test on jenkins @asf

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1232331&r1=1232330&r2=1232331&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
 Tue Jan 17 08:21:01 2012
@@ -74,7 +74,6 @@ $(function() {
     this.managedRepositoriesViewModel = managedRepositoriesViewModel;
     this.update = update;
     var self = this;
-    var currentManagedRepository = this.managedRepository;
     save=function(){
       var valid = $("#main-content #managed-repository-edit-form").valid();
       if (valid==false) {
@@ -106,12 +105,12 @@ $(function() {
           {
             type: "POST",
             contentType: 'application/json',
-            data: "{\"managedRepository\": " + 
ko.toJSON(currentManagedRepository)+"}",
+            data: "{\"managedRepository\": " + 
ko.toJSON(self.managedRepository)+"}",
             dataType: 'json',
             success: function(data) {
               //var repo = mapManagedRepository(data);
-              //$.log("data:"+repo.name);
-              
self.managedRepositoriesViewModel.managedRepositories.push(currentManagedRepository);
+              //$.log("data:"+data.responseText);
+              
self.managedRepositoriesViewModel.managedRepositories.push(self.managedRepository);
               displaySuccessMessage($.i18n.prop('managedrepository.added'));
               activateManagedRepositoriesGridTab();
             },

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml?rev=1232331&r1=1232330&r2=1232331&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml 
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml 
Tue Jan 17 08:21:01 2012
@@ -219,20 +219,11 @@
               <goal>test</goal>
             </goals>
             <configuration>
-              <systemProperties>
-                <property>
-                  <name>browser</name>
-                  <value>${selenium.browser}</value>
-                </property>
-                <property>
-                  <name>baseUrl</name>
-                  <value>${baseUrl}</value>
-                </property>
-                <property>
-                  <name>maxWaitTimeInMs</name>
-                  <value>${maxWaitTimeInMs}</value>
-                </property>
-              </systemProperties>
+              <systemPropertyVariables>
+                <browser>${selenium.browser}</browser>
+                <baseUrl>${baseUrl}</baseUrl>
+                <maxWaitTimeInMs>${maxWaitTimeInMs}</maxWaitTimeInMs>
+              </systemPropertyVariables>
             </configuration>
           </execution>
         </executions>

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java?rev=1232331&r1=1232330&r2=1232331&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
 Tue Jan 17 08:21:01 2012
@@ -102,6 +102,7 @@ public abstract class AbstractArchivaTes
     public void goToLoginPage()
     {
         getSelenium().open( baseUrl );
+        waitPage();
         // are we already logged in ?
         if ( isElementVisible( "logout-link" ) ) //isElementPresent( 
"logoutLink" ) )
         {