continuum-commits mailing list archives

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

URL: http://svn.apache.org/r1548526
Log:
[CONTINUUM-2713] remove DMI from build definition editing

Add missing tests

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

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java?rev=1548526&r1=1548525&r2=1548526&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java
Fri Dec  6 14:06:18 2013
@@ -301,4 +301,45 @@ public class BuildDefinitionTest
         assertTextPresent( "Ant build filename*:" );
         assertTextPresent( "Targets:" );
     }
+
+    public void testEditBuildDefinitionFromSummary()
+        throws Exception
+    {
+        goToProjectInformationPage( projectGroupName, projectName );
+        clickLinkWithLocator( "buildDefinition_0" ); // Add button for project build definition
+        String description = "testEditBuildDefinitionFromSummary";
+        addEditGroupBuildDefinition( null, buildDefinitionPomName, buildDefinitionGoals,
+                                     buildDefinitionArguments, description, false, false,
+                                     false, MAVEN_PROJECT_TYPE, true );
+
+        assertProjectInformationPage();
+        String xPath = "//preceding::td[text()='" + description + "']//following::img[@alt='Edit']";
+        clickLinkWithXPath( xPath );
+
+        addEditGroupBuildDefinition( null, buildDefinitionPomName, "new goals", buildDefinitionArguments,
+                                     description, false, false, false, MAVEN_PROJECT_TYPE,
true );
+
+        assertProjectInformationPage();
+        assertTextPresent( "new goals" );
+    }
+
+    public void testEditGroupBuildDefinitionFromSummary()
+        throws Exception
+    {
+        goToGroupBuildDefinitionPage( projectGroupName, projectGroupId, projectGroupDescription
);
+        clickButtonWithValue( "Add" );
+        String description = "testEditGroupBuildDefinitionFromSummary";
+        addEditGroupBuildDefinition( projectGroupName, buildDefinitionPomName, buildDefinitionGoals,
+                                     buildDefinitionArguments, description, false, false,
+                                     false, MAVEN_PROJECT_TYPE, true );
+
+        goToProjectInformationPage( projectGroupName, projectName );
+        String xPath = "//preceding::td[text()='" + description + "']//following::img[@alt='Edit']";
+        clickLinkWithXPath( xPath );
+
+        addEditGroupBuildDefinition( projectGroupName, buildDefinitionPomName, "new goals",
buildDefinitionArguments,
+                                     description, false, false, false, MAVEN_PROJECT_TYPE,
true );
+
+        assertTextPresent( "new goals" );
+    }
 }

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=1548526&r1=1548525&r2=1548526&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Fri Dec  6 14:06:18 2013
@@ -70,7 +70,7 @@
         <c:choose>
           <c:when test="${pageScope.buildDefinitionSummary.from=='PROJECT'}">
             <redback:ifAuthorized permission="continuum-modify-project-build-definition"
resource="${projectGroupName}">
-              <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
+              <s:url id="editUrl" action="buildDefinition" namespace="/">
                 <s:param name="projectId"><c:out value="${projectId}"/></s:param>
                 <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
               </s:url>
@@ -82,7 +82,7 @@
           </c:when>
           <c:otherwise>
             <redback:ifAuthorized permission="continuum-modify-group-build-definition"
resource="${projectGroupName}">
-              <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
+              <s:url id="editUrl" action="buildDefinition" namespace="/">
                 <s:param name="projectGroupId"><c:out value="${pageScope.buildDefinitionSummary.projectGroupId}"/></s:param>
                 <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
                 <s:param name="groupBuildDefinition">true</s:param>



Mime
View raw message