continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1548102 - in /continuum/branches/CONTINUUM-2713: continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
Date Thu, 05 Dec 2013 12:00:25 GMT
Author: brett
Date: Thu Dec  5 12:00:25 2013
New Revision: 1548102

URL: http://svn.apache.org/r1548102
Log:
[CONTINUUM-2713] remove DMI from deleting a notifier from group

Add missing test

Modified:
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java?rev=1548102&r1=1548101&r2=1548102&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java
Thu Dec  5 12:00:25 2013
@@ -206,10 +206,8 @@ public class NotifierTest
         String newHost = "new.test.com";
         String newChannel = "new_test_channel";
         goToProjectInformationPage( projectGroupName, projectName );
-        editIrcNotifier( projectGroupName, projectName, ircNotifierHost, ircNotifierChannel,
newHost, newChannel,
-                         true );
-        editIrcNotifier( projectGroupName, projectName, newHost, newChannel, ircNotifierHost,
ircNotifierChannel,
-                         true );
+        editIrcNotifier( projectGroupName, projectName, ircNotifierHost, ircNotifierChannel,
newHost, newChannel, true );
+        editIrcNotifier( projectGroupName, projectName, newHost, newChannel, ircNotifierHost,
ircNotifierChannel, true );
     }
 
     @Test( dependsOnMethods = { "testAddValidIrcProjectNotifier" } )
@@ -374,8 +372,7 @@ public class NotifierTest
         throws Exception
     {
         goToProjectNotifier( projectGroupName, projectName );
-        addMsnNotifier( projectGroupName, projectName, msnNotifierLogin, msnNotifierPassword,
msnNotifierAddress,
-                        true );
+        addMsnNotifier( projectGroupName, projectName, msnNotifierLogin, msnNotifierPassword,
msnNotifierAddress, true );
     }
 
     public void testAddMsnProjectNotifierWithInvalidValues()
@@ -573,6 +570,27 @@ public class NotifierTest
         assertProjectInformationPage();
     }
 
+    public void testDeleteProjectNotifierFromGroupNotifierPage()
+        throws Exception
+    {
+        goToProjectGroupsSummaryPage();
+        goToProjectNotifier( projectGroupName, projectName );
+        addMailNotifier( projectGroupName, projectName, mailNotifierAddress, true );
+
+        showProjectGroup( projectGroupName, projectGroupId, projectGroupDescription );
+        clickLinkWithText( "Notifiers" );
+        assertGroupNotifierPage( projectGroupName );
+
+        // Delete
+        clickLinkWithXPath( "(//a[contains(@href,'deleteProjectNotifier')])/img" );
+        assertButtonWithValuePresent( "Delete" );
+        assertButtonWithValuePresent( "Cancel" );
+        clickButtonWithValue( "Delete" );
+        assertGroupNotifierPage( projectGroupName );
+
+        assertTextNotPresent( mailNotifierAddress );
+    }
+
     protected void assertGroupNotifierPage( String projectGroupName )
     {
         assertTextPresent( "Project Group Notifiers of group " + projectGroupName );

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=1548102&r1=1548101&r2=1548102&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
Thu Dec  5 12:00:25 2013
@@ -131,7 +131,7 @@
           <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
             <c:choose>
               <c:when test="${!pageScope.projectNotifierSummary.fromProject}">
-                <s:url id="removeUrl" action="deleteProjectNotifier!default.action" namespace="/">
+                <s:url id="removeUrl" action="deleteProjectNotifier_default.action" namespace="/">
                   <s:param name="projectGroupId"><c:out value="${pageScope.projectNotifierSummary.projectGroupId}"/></s:param>
                   <s:param name="projectId"><c:out value="${pageScope.projectNotifierSummary.projectId}"/></s:param>
                   <s:param name="notifierId"><c:out value="${pageScope.projectNotifierSummary.id}"/></s:param>



Mime
View raw message