Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
This commit is contained in:
Maria Odea B. Ching 2011-05-24 08:37:00 +00:00
parent eead981577
commit af0ae64f42
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
View File

@ -248,6 +248,15 @@ public class RepositoryTest
assertTextPresent( "You must enter a url." ); 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" } ) @Test( dependsOnMethods = { "testDeleteManageRepo" } )
public void testAddRemoteRepoValidValues() public void testAddRemoteRepoValidValues()
{ {

1
archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
View File

@ -167,6 +167,7 @@ public abstract class AbstractRepositoryTest
selectValue( "connector.proxyId", networkProxy ); selectValue( "connector.proxyId", networkProxy );
selectValue( "connector.sourceRepoId", managedRepo ); selectValue( "connector.sourceRepoId", managedRepo );
selectValue( "connector.targetRepoId", remoteRepo ); selectValue( "connector.targetRepoId", remoteRepo );
clickButtonWithValue( "Add Proxy Connector" );
} }
public void deleteProxyConnector() public void deleteProxyConnector()

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
View File

@ -48,7 +48,7 @@
</td> </td>
<td> <td>
<c:set var="value"> <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> </c:set>
<s:select name="connector.policies['%{#attr.policy.key}']" <s:select name="connector.policies['%{#attr.policy.key}']"
list="%{#attr.policyMap[#attr.policy.key].options}" list="%{#attr.policyMap[#attr.policy.key].options}"