[MRM-1475] Add proxy connector is broken

submitted by Greg Michael Meneses
o removed id attribute in struts property tag in proxy connector form which was removed in struts 2.1.x
o added selenium test for add proxy connector

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1126927 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
index e559db452150d7979e45546a7c13fafb287fb916..3c3739832260b5f2193617607fd576e78cc3ffc0 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
@@ -247,6 +247,15 @@ public class RepositoryTest
         addRemoteRepository( "remoterepo", "Remote Repository Sample", "", "", "", "", "Maven 2.x Repository" );
         assertTextPresent( "You must enter a url." );
     }
+    
+    @Test( dependsOnMethods = { "testAddRemoteRepoNullURL" } )
+    public void testAddProxyConnectorValidValues() throws Exception
+    {
+        getSelenium().open( "/archiva/admin/addProxyConnector.action" );
+        addProxyConnector( "(direct connection)", "internal", "remoterepo" );
+        assertTextPresent( "remoterepo" );
+        assertTextPresent( "Remote Repository Sample" );
+    }
 
     @Test( dependsOnMethods = { "testDeleteManageRepo" } )
     public void testAddRemoteRepoValidValues()

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
index 52dfd20893db6d657a75a6c6f152b04fcaf162dd..13b48f43d6d179ab5584cfb376162018d58affae 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
@@ -167,6 +167,7 @@ public abstract class AbstractRepositoryTest
         selectValue( "connector.proxyId", networkProxy );
         selectValue( "connector.sourceRepoId", managedRepo );
         selectValue( "connector.targetRepoId", remoteRepo );
+        clickButtonWithValue( "Add Proxy Connector" );
     }
 
     public void deleteProxyConnector()

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
index 2fb43d9a0c1adcb302efce9785aa7850e5ad471f..01ad6149c4a918f87dd72a27724bf980284ad04a 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
@@ -48,7 +48,7 @@
           </td>
           <td>
             <c:set var="value">
-              <s:property id="value" value="%{#attr.connector.policies[#attr.policy.key]}" default="%{#attr.policy.value.defaultOption}" />
+              <s:property value="%{#attr.connector.policies[#attr.policy.key]}" default="%{#attr.policy.value.defaultOption}" />
             </c:set>
             <s:select name="connector.policies['%{#attr.policy.key}']"
                        list="%{#attr.policyMap[#attr.policy.key].options}"