continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1548525 - in /continuum/branches/CONTINUUM-2713: continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
Date Fri, 06 Dec 2013 14:06:09 GMT
Author: brett
Date: Fri Dec  6 14:06:08 2013
New Revision: 1548525

URL: http://svn.apache.org/r1548525
Log:
[CONTINUUM-2713] remove DMI from project group members page

Add test for deleting a project from the members page

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

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java?rev=1548525&r1=1548524&r2=1548525&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java
Fri Dec  6 14:06:08 2013
@@ -34,6 +34,9 @@ import org.testng.annotations.Test;
 public class ProjectGroupTest
     extends AbstractAdminTest
 {
+
+    public static final String TEST_PROJECT_NAME = "ContinuumBuildQueueTestData";
+
     private String projectGroupName;
 
     private String projectGroupId;
@@ -227,4 +230,28 @@ public class ProjectGroupTest
         removeProjectGroup( name3 );
         assertLinkNotPresent( name3 );
     }
+
+    public void testRemoveProjectFromMembers()
+    {
+        goToProjectGroupsSummaryPage();
+        addProjectGroup( projectGroupName, projectGroupId, projectGroupDescription, true
);
+        showProjectGroup( projectGroupName, projectGroupId, projectGroupDescription );
+
+        clickButtonWithValue( "Add" );
+        assertAddMavenTwoProjectPage();
+        setFieldValue( "m2PomUrl", getProperty( "M2_POM_URL" ) );
+        clickButtonWithValue( "Add" );
+        waitAddProject( "Continuum - Project Group" );
+        assertTextPresent( TEST_PROJECT_NAME );
+
+        clickLinkWithText( "Members" );
+        assertTextPresent( TEST_PROJECT_NAME );
+        clickImgWithAlt( "Delete" );
+
+        assertTextPresent( "Delete Continuum Project" );
+        clickButtonWithValue( "Delete" );
+
+        assertProjectGroupSummaryPage( projectGroupName, projectGroupId, projectGroupDescription
);
+        assertTextNotPresent( TEST_PROJECT_NAME );
+    }
 }

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp?rev=1548525&r1=1548524&r2=1548525&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
Fri Dec  6 14:06:08 2013
@@ -88,7 +88,7 @@
               <c:when
                   test="${pageScope.project.state == 1 || pageScope.project.state == 10 ||
pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state ==
4}">
                 <s:token/>  
-                <s:url id="removeProjectUrl" action="deleteProject!default.action">
+                <s:url id="removeProjectUrl" action="deleteProject_default.action">
                   <s:param name="projectId"><c:out value="${pageScope.project.id}"/></s:param>
                   <s:param name="projectName"><c:out value="${pageScope.project.name}"/></s:param>
                   <s:param name="struts.token.name">token</s:param>



Mime
View raw message