svn commit: r1240202 - in /archiva/trunk/archiva-modules/archiva-web: archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java

[olamy]

Author: olamy
Date: Fri Feb  3 14:56:10 2012
New Revision: 1240202

URL: http://svn.apache.org/viewvc?rev=1240202&view=rev
Log:
use id for testing user deleted as now the confirmation message contains the 
user name :-)

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
    
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/redback/templates/user-grids.html
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html?rev=1240202&r1=1240201&r2=1240202&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
 Fri Feb  3 14:56:10 2012
@@ -34,7 +34,7 @@
               {{each(j, columnDefinition) columns}}
               <td>${ typeof columnDefinition.rowText == 'function' ? 
columnDefinition.rowText(row) : row[columnDefinition.rowText] }</td>
               {{/each}}
-              <td><a href="#" data-bind="click: function(){ editUserBox(row) 
}">Edit</a></td>
+              <td id="users-grid-user-id-${row.username()}"><a href="#" 
data-bind="click: function(){ editUserBox(row) }">Edit</a></td>
               {{if row.username()=="admin" || row.username()=="guest"}}
                 <td></td>
               {{else}}

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=1240202&r1=1240201&r2=1240202&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
 Fri Feb  3 14:56:10 2012
@@ -236,6 +236,7 @@ public abstract class AbstractArchivaTes
         clickLinkWithLocator( "user-create-form-register-button", true );
 
         assertTextPresent( "user created:"+userName );
+        assertElementPresent( "users-grid-user-id-"+userName );
 
         if ( valid )
         {
@@ -268,7 +269,7 @@ public abstract class AbstractArchivaTes
 
         clickLinkWithLocator( "alert-message-success-close-a" );
 
-        assertTextNotPresent( userName );
+        assertElementNotPresent( "users-grid-user-id-"+userName );
         assertTextNotPresent( fullName );