summaryrefslogtreecommitdiffstats
path: root/archiva-modules
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-02-03 14:56:10 +0000
committerOlivier Lamy <olamy@apache.org>2012-02-03 14:56:10 +0000
commitc115eeda2bed85f9e21b0a7248ac61b057dad6ff (patch)
tree19ec34e4ba168611fa182bef0b59d6578ae1f1f9 /archiva-modules
parent17eb86b08fe52d6e347f516db05180812b843c29 (diff)
downloadarchiva-c115eeda2bed85f9e21b0a7248ac61b057dad6ff.tar.gz
archiva-c115eeda2bed85f9e21b0a7248ac61b057dad6ff.zip
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
Diffstat (limited to 'archiva-modules')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html2
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
index deb8bc9e4..b0acdd92e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html
@@ -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}}
diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
index f7e51cb4f..dd5dab4c3 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
@@ -236,6 +236,7 @@ public abstract class AbstractArchivaTest
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 AbstractArchivaTest
clickLinkWithLocator( "alert-message-success-close-a" );
- assertTextNotPresent( userName );
+ assertElementNotPresent( "users-grid-user-id-"+userName );
assertTextNotPresent( fullName );