Return-Path: X-Original-To: apmail-continuum-commits-archive@www.apache.org Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 42E7D10FC7 for ; Fri, 6 Dec 2013 14:06:32 +0000 (UTC) Received: (qmail 52645 invoked by uid 500); 6 Dec 2013 14:06:31 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 52613 invoked by uid 500); 6 Dec 2013 14:06:31 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 52606 invoked by uid 99); 6 Dec 2013 14:06:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Dec 2013 14:06:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Dec 2013 14:06:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 56E7023889E3; Fri, 6 Dec 2013 14:06:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@continuum.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131206140609.56E7023889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ - + token