Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-05 04:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2249 from gitbucket/fix-markdown-link

Browse Source 
Fix Markdown links in README at the file list view
This commit is contained in:
Naoki Takezoe
2019-01-14 01:51:29 +09:00
committed by GitHub
parent c160e7a945 1e89e70e57
commit 2bc0b3716a
2 changed files with 74 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/gitbucket/core/view/Markdown.scala
View File

@@ -176,6 +176,10 @@ object Markdown {
} else if (!enableWikiLink) {
if (context.currentPath.contains("/blob/")) {
urlWithRawParam
} else if (context.currentPath.contains("/tree/")) {
val paths = context.currentPath.split("/")
val path = if (paths.length > 3) paths.drop(4).mkString("/") else branch
repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/blob/" + path + "/" + urlWithRawParam
} else {
repository.httpUrl.replaceFirst("/git/", "/").stripSuffix(".git") + "/blob/" + branch + "/" + urlWithRawParam
}

71
src/test/scala/gitbucket/core/view/MarkdownSpec.scala
View File

@@ -1,8 +1,12 @@
package gitbucket.core.view
import gitbucket.core.controller.Context
import gitbucket.core.service.RepositoryService.RepositoryInfo
import org.scalatest.FunSpec
import org.scalatest.mockito.MockitoSugar
import org.mockito.Mockito._
class MarkdownSpec extends FunSpec {
class MarkdownSpec extends FunSpec with MockitoSugar {
import Markdown._
@@ -89,4 +93,69 @@ tasks
assert(after == " -[ ] aaaa")
}
}
describe("toHtml") {
it("should fix url at the repository root") {
val repository = mock[RepositoryInfo]
val context = mock[Context]
when(context.currentPath).thenReturn("/user/repo")
when(repository.httpUrl(context)).thenReturn("http://localhost:8080/git/user/repo.git")
val html = Markdown.toHtml(
markdown = "[ChangeLog](CHANGELOG.md)",
repository = repository,
branch = "master",
enableWikiLink = false,
enableRefsLink = true,
enableAnchor = true,
enableLineBreaks = true
)(context)
assert(
html == """<p><a href="http://localhost:8080/user/repo/blob/master/CHANGELOG.md">ChangeLog</a></p>"""
)
}
it("should fix sub directory url at the file list") {
val repository = mock[RepositoryInfo]
val context = mock[Context]
when(context.currentPath).thenReturn("/user/repo/tree/master/sub/dir")
when(repository.httpUrl(context)).thenReturn("http://localhost:8080/git/user/repo.git")
val html = Markdown.toHtml(
markdown = "[ChangeLog](CHANGELOG.md)",
repository = repository,
branch = "master",
enableWikiLink = false,
enableRefsLink = true,
enableAnchor = true,
enableLineBreaks = true
)(context)
assert(
html == """<p><a href="http://localhost:8080/user/repo/blob/master/sub/dir/CHANGELOG.md">ChangeLog</a></p>"""
)
}
it("should fix sub directory url at the blob view") {
val repository = mock[RepositoryInfo]
val context = mock[Context]
when(context.currentPath).thenReturn("/user/repo/blob/master/sub/dir/README.md")
when(repository.httpUrl(context)).thenReturn("http://localhost:8080/git/user/repo.git")
val html = Markdown.toHtml(
markdown = "[ChangeLog](CHANGELOG.md)",
repository = repository,
branch = "master",
enableWikiLink = false,
enableRefsLink = true,
enableAnchor = true,
enableLineBreaks = true
)(context)
assert(
html == """<p><a href="CHANGELOG.md">ChangeLog</a></p>"""
)
}
}
}