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

use id for testing user deleted as now the confirmation message contains the user name :-) 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1240202 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-02-03 14:56:10 +00:00
parent 17eb86b08f
commit c115eeda2b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
View File

@ -34,7 +34,7 @@
{{each(j, columnDefinition) columns}} {{each(j, columnDefinition) columns}}
<td>${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] }</td> <td>${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] }</td>
{{/each}} {{/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"}} {{if row.username()=="admin" || row.username()=="guest"}}
<td></td> <td></td>
{{else}} {{else}}

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

@ -236,6 +236,7 @@ public abstract class AbstractArchivaTest
clickLinkWithLocator( "user-create-form-register-button", true ); clickLinkWithLocator( "user-create-form-register-button", true );
assertTextPresent( "user created:"+userName ); assertTextPresent( "user created:"+userName );
assertElementPresent( "users-grid-user-id-"+userName );
if ( valid ) if ( valid )
{ {
@ -268,7 +269,7 @@ public abstract class AbstractArchivaTest
clickLinkWithLocator( "alert-message-success-close-a" ); clickLinkWithLocator( "alert-message-success-close-a" );
assertTextNotPresent( userName ); assertElementNotPresent( "users-grid-user-id-"+userName );
assertTextNotPresent( fullName ); assertTextNotPresent( fullName );