From c115eeda2bed85f9e21b0a7248ac61b057dad6ff Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 3 Feb 2012 14:56:10 +0000 Subject: [PATCH] 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 --- .../src/main/webapp/js/redback/templates/user-grids.html | 2 +- .../apache/archiva/web/test/parent/AbstractArchivaTest.java | 3 ++- 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}} ${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] } {{/each}} - Edit + Edit {{if row.username()=="admin" || row.username()=="guest"}} {{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 ); -- 2.39.5