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

correct text for dotnet-library type and re-enable Selenium test 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1178020 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2011-10-01 15:35:40 +00:00
parent 027e721634
commit 6fd8ff12c6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
View File

@ -98,7 +98,7 @@ public class ArtifactManagementTest
+ "' was successfully deployed to repository 'internal'" ); + "' was successfully deployed to repository 'internal'" );
} }
@Test( groups = "requiresUpload", enabled = false ) @Test( groups = "requiresUpload" )
public void testDotNetTypes() public void testDotNetTypes()
{ {
String groupId = getProperty( "GROUPID_DOTNETARTIFACT" ); String groupId = getProperty( "GROUPID_DOTNETARTIFACT" );
@ -115,7 +115,6 @@ public class ArtifactManagementTest
String basePath = String basePath =
"/archiva/repository/internal/" + groupId + "/" + artifactId + "/" + getVersion() + "/" + artifactId + "-" "/archiva/repository/internal/" + groupId + "/" + artifactId + "/" + getVersion() + "/" + artifactId + "-"
+ getVersion(); + getVersion();
// FIXME: currently broken - is dotnet-library
assertLinkPresent( ".NET Library" ); assertLinkPresent( ".NET Library" );
assertElementPresent( "//a[@href='" + basePath + ".dll']" ); assertElementPresent( "//a[@href='" + basePath + ".dll']" );
assertElementPresent( "//a[@href='" + basePath + ".pom']" ); assertElementPresent( "//a[@href='" + basePath + ".pom']" );

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
View File

@ -187,7 +187,7 @@
<c:url var="imageUrl" value="/images/download-type-other.png"/> <c:url var="imageUrl" value="/images/download-type-other.png"/>
<c:set var="packageName">JavaDoc Archive</c:set> <c:set var="packageName">JavaDoc Archive</c:set>
</c:when> </c:when>
<c:when test="${a.type == 'library'}"> <c:when test="${a.type == 'library' || a.type == 'dotnet-library'}">
<c:url var="imageUrl" value="/images/download-type-other.png"/> <c:url var="imageUrl" value="/images/download-type-other.png"/>
<c:set var="packageName">.NET Library</c:set> <c:set var="packageName">.NET Library</c:set>
</c:when> </c:when>