-
Notifications
You must be signed in to change notification settings - Fork 415
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add the link to homepage to the header if homepageLink is provided #3235
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c069217
Add the link to GitHub repo to the header if there are source links d…
whyoleg 52ed1f0
calculate sourceUrl in shared model
whyoleg a9c8eb3
refactor tests to use BaseAbstractTest
whyoleg 506ef29
revert changes in HtmlRenderingOnlyTestBase
whyoleg 6662802
Rework homepage links:
whyoleg 6fd4a09
Update API dump
whyoleg d5eab97
Move new `homepageLink` parameter to the end
whyoleg 5505436
Check all html files except navigation in integration test
whyoleg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
plugins/base/src/test/kotlin/renderers/html/HeaderTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
/* | ||
* Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. | ||
*/ | ||
|
||
package renderers.html | ||
|
||
import org.jetbrains.dokka.DokkaConfiguration | ||
import org.jetbrains.dokka.DokkaConfigurationImpl | ||
import org.jetbrains.dokka.PluginConfigurationImpl | ||
import org.jetbrains.dokka.base.DokkaBase | ||
import org.jetbrains.dokka.base.DokkaBaseConfiguration | ||
import org.jetbrains.dokka.base.templating.toJsonString | ||
import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest | ||
import org.jetbrains.dokka.pages.RootPageNode | ||
import org.jetbrains.dokka.plugability.DokkaContext | ||
import org.jsoup.Jsoup | ||
import utils.TestOutputWriter | ||
import utils.TestOutputWriterPlugin | ||
import kotlin.test.Test | ||
import kotlin.test.assertEquals | ||
import kotlin.test.assertNotNull | ||
import kotlin.test.assertNull | ||
|
||
class HeaderTest : BaseAbstractTest() { | ||
private val configuration = dokkaConfiguration { | ||
sourceSets { | ||
sourceSet { | ||
name = "jvm" | ||
sourceRoots = listOf("src/jvm") | ||
} | ||
sourceSet { | ||
name = "js" | ||
sourceRoots = listOf("src/js") | ||
} | ||
} | ||
} | ||
|
||
@Test | ||
fun `should include homepage link if homepageLink is provided`() { | ||
testRendering( | ||
DokkaBaseConfiguration(homepageLink = "https://github.com/Kotlin/dokka/") | ||
) { _, _, writer -> | ||
val renderedContent = navigationElement(writer) | ||
|
||
val sourceLinkElement = | ||
assertNotNull(renderedContent.getElementById("homepage-link"), "Source link element not found") | ||
val aElement = assertNotNull(sourceLinkElement.selectFirst("a")) | ||
assertEquals("https://github.com/Kotlin/dokka/", aElement.attr("href")) | ||
} | ||
} | ||
|
||
@Test | ||
fun `should not include homepage link by default`() { | ||
testRendering(null) { _, _, writer -> | ||
val renderedContent = navigationElement(writer) | ||
assertNull(renderedContent.getElementById("homepage-link"), "Source link element found") | ||
} | ||
} | ||
|
||
private fun testRendering( | ||
baseConfiguration: DokkaBaseConfiguration?, | ||
block: (RootPageNode, DokkaContext, writer: TestOutputWriter) -> Unit | ||
) { | ||
fun configuration(): DokkaConfigurationImpl { | ||
baseConfiguration ?: return configuration | ||
return configuration.copy( | ||
pluginsConfiguration = listOf( | ||
PluginConfigurationImpl( | ||
DokkaBase::class.java.canonicalName, | ||
DokkaConfiguration.SerializationFormat.JSON, | ||
toJsonString(baseConfiguration) | ||
) | ||
) | ||
) | ||
} | ||
|
||
val writerPlugin = TestOutputWriterPlugin() | ||
testInline( | ||
""" | ||
|/src/jvm/Test.kt | ||
|fun test() {} | ||
|/src/js/Test.kt | ||
|fun test() {} | ||
""", | ||
configuration(), | ||
pluginOverrides = listOf(writerPlugin) | ||
) { | ||
renderingStage = { node, context -> | ||
block(node, context, writerPlugin.writer) | ||
} | ||
} | ||
} | ||
|
||
private fun navigationElement(writer: TestOutputWriter) = | ||
writer | ||
.contents | ||
.getValue("index.html") | ||
.let(Jsoup::parse) | ||
.select(".navigation") | ||
.single() | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have not checked but it seems to be
<a href="${homepageLink}"> <div class="navigation-controls--btn navigation-controls--homepage" id="homepage-link" role="button"/></a>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Im not an html-expert, but at least my variant works. If to switch tags, it doesn't work at my side (may be need to adapt more code)
I think it could be rechecked in scope of #3300