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

[olamy]

Author: olamy
Date: Thu Dec 29 13:54:33 2011
New Revision: 1225534

URL: http://svn.apache.org/viewvc?rev=1225534&view=rev
Log:
fix selenium test add/delete user with webapp-js

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/testng.properties
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html?rev=1225534&r1=1225533&r2=1225534&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html
 Thu Dec 29 13:54:33 2011
@@ -1,18 +1,18 @@
 <script id='alert-message-success' type='text/x-jquery-tmpl'>
   <div class="alert-message fade in success" data-alert="alert">
-    <a class="close" href="#">×</a>
+    <a class="close" href="#" id='alert-message-success-close-a'>×</a>
     <p>${message}</p>
   </div>
 </script>
 <script id='alert-message-error' type='text/x-jquery-tmpl'>
   <div class="alert-message fade in error" data-alert="alert">
-    <a class="close" href="#">×</a>
+    <a class="close" href="#" id='alert-message-error-close-a'>×</a>
     <p>${message}</p>
   </div>
 </script>
 <script id='alert-message-warning' type='text/x-jquery-tmpl'>
   <div class="alert-message fade in warning" data-alert="alert">
-    <a class="close" href="#">×</a>
+    <a class="close" href="#" id='alert-message-warning-close-a'>×</a>
     <p>${message}</p>
   </div>
 </script>

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/testng.properties
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/testng.properties?rev=1225534&r1=1225533&r2=1225534&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/testng.properties
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/testng.properties
 Thu Dec 29 13:54:33 2011
@@ -59,7 +59,7 @@ NEW_USERROLE_PASSWORD=password123
 
 # Guest Role
 GUEST_USERNAME=guest_user
-GUEST_FULLNAME=Guest
+GUEST_FULLNAME=The Test Guest
 # Registered User Role
 REGISTERED_USERNAME=reg_user
 REGISTERED_FULLNAME=Registered User

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=1225534&r1=1225533&r2=1225534&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
 Thu Dec 29 13:54:33 2011
@@ -234,11 +234,7 @@ public abstract class AbstractArchivaTes
 
         clickLinkWithLocator( "user-create-form-register-button", true );
 
-        assertTextPresent( "user created:guest_user" );
-
-        //assertUserRolesPage();
-
-        //clickButtonWithName( "submitRolesButton", true );
+        assertTextPresent( "user created:"+userName );
 
         if ( valid )
         {
@@ -265,8 +261,12 @@ public abstract class AbstractArchivaTes
 
         clickLinkWithLocator( "users-grid-delete-" + userName );
 
+        clickLinkWithLocator( "dialog-confirm-modal-ok" );
+
         assertTextPresent( "user " + userName + " deleted" );
 
+        clickLinkWithLocator( "alert-message-success-close-a" );
+
         assertTextNotPresent( userName );
         assertTextNotPresent( fullName );
 
@@ -724,8 +724,8 @@ public abstract class AbstractArchivaTes
     {
         clickLinkWithText( "Logout" );
         assertTextNotPresent( "Current User:" );
-        assertLinkNotPresent( "Edit Details" );
-        assertLinkNotPresent( "Logout" );
-        assertLinkPresent( "Login" );
+        assertLinkNotVisible( "Edit Details" );
+        assertLinkNotVisible( "Logout" );
+        assertLinkVisible( "Login" );
     }
 }
\ No newline at end of file

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.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/AbstractSeleniumTest.java?rev=1225534&r1=1225533&r2=1225534&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
 Thu Dec 29 13:54:33 2011
@@ -212,6 +212,16 @@ public abstract class AbstractSeleniumTe
         Assert.assertFalse( isElementPresent( "link=" + text ), "The link('" + 
text + "' is present." );
     }
 
+    public void assertLinkNotVisible( String text )
+    {
+        Assert.assertFalse( isElementVisible( "link=" + text ), "The link('" + 
text + "' is visible." );
+    }
+
+    public void assertLinkVisible( String text )
+    {
+        Assert.assertTrue( isElementVisible( "link=" + text ), "The link('" + 
text + "' is not visible." );
+    }
+
     public void assertImgWithAlt( String alt )
     {
         assertElementPresent( "/¯img[@alt='" + alt + "']" );