diff options
| author | Maria Odea B. Ching <oching@apache.org> | 2011-05-24 08:37:00 +0000 |
|---|---|---|
| committer | Maria Odea B. Ching <oching@apache.org> | 2011-05-24 08:37:00 +0000 |
| commit | af0ae64f425f5219e70c8363b24ed5b59647c750 (patch) | |
| tree | 14d03cf916c9847ce0209c00c04994a0d8ad1864 /archiva-modules/archiva-web | |
| parent | eead9815772b95e3784eedf8467a6a8f03171962 (diff) | |
| download | archiva-af0ae64f425f5219e70c8363b24ed5b59647c750.tar.gz archiva-af0ae64f425f5219e70c8363b24ed5b59647c750.zip | |
[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
Diffstat (limited to 'archiva-modules/archiva-web')
3 files changed, 11 insertions, 1 deletions
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 e559db452..3c3739832 100644 --- 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 52dfd2089..13b48f43d 100644 --- 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 2fb43d9a0..01ad6149c 100644 --- 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}" |