archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r1126927 - in /archiva/trunk/archiva-modules/archiva-web: archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/ archiva-webapp/src/main/webapp/WEB-INF/jsp/ad...
Date Tue, 24 May 2011 08:37:00 GMT
Author: oching
Date: Tue May 24 08:37:00 2011
New Revision: 1126927

URL: http://svn.apache.org/viewvc?rev=1126927&view=rev
Log:
[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

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java?rev=1126927&r1=1126926&r2=1126927&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
Tue May 24 08:37:00 2011
@@ -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()

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java?rev=1126927&r1=1126926&r2=1126927&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
Tue May 24 08:37:00 2011
@@ -167,6 +167,7 @@ public abstract class AbstractRepository
         selectValue( "connector.proxyId", networkProxy );
         selectValue( "connector.sourceRepoId", managedRepo );
         selectValue( "connector.targetRepoId", remoteRepo );
+        clickButtonWithValue( "Add Proxy Connector" );
     }
 
     public void deleteProxyConnector()

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf?rev=1126927&r1=1126926&r2=1126927&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
Tue May 24 08:37:00 2011
@@ -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}"



Mime
View raw message