diff --git a/api/build.gradle b/api/build.gradle index adddf4269..535a043af 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -2,8 +2,8 @@ plugins { id 'java-library' id 'halo.publish' id 'jacoco' - id "io.freefair.lombok" - id "com.github.ben-manes.versions" + alias(libs.plugins.lombok) + alias(libs.plugins.versions) } group = 'run.halo.app' diff --git a/application/build.gradle b/application/build.gradle index d58523af8..5ee431b68 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -2,18 +2,18 @@ import de.undercouch.gradle.tasks.download.Download import org.gradle.crypto.checksum.Checksum plugins { - id 'org.springframework.boot' - id 'io.spring.dependency-management' - id "com.gorylenko.gradle-git-properties" id "checkstyle" id 'java' id 'idea' id 'jacoco' - id "de.undercouch.download" - id "io.freefair.lombok" - id 'org.gradle.crypto.checksum' - id 'org.springdoc.openapi-gradle-plugin' - id "com.github.ben-manes.versions" + alias(libs.plugins.spring.boot) + alias(libs.plugins.spring.dependency.management) + alias(libs.plugins.git.properties) + alias(libs.plugins.undercouch.download) + alias(libs.plugins.lombok) + alias(libs.plugins.checksum) + alias(libs.plugins.springdoc.openapi) + alias(libs.plugins.versions) } group = 'run.halo.app' @@ -72,6 +72,10 @@ bootJar { } } +gitProperties { + dotGitDirectory = layout.settingsDirectory.dir('.git') +} + tasks.named('jar') { enabled = false } @@ -180,4 +184,4 @@ tasks.named('generateOpenApiDocs') { outputs.upToDateWhen { false } -} \ No newline at end of file +} diff --git a/application/src/test/java/run/halo/app/infra/utils/FileTypeDetectUtilsTest.java b/application/src/test/java/run/halo/app/infra/utils/FileTypeDetectUtilsTest.java index 8cf0b4fe0..4e1b58fcc 100644 --- a/application/src/test/java/run/halo/app/infra/utils/FileTypeDetectUtilsTest.java +++ b/application/src/test/java/run/halo/app/infra/utils/FileTypeDetectUtilsTest.java @@ -36,7 +36,7 @@ class FileTypeDetectUtilsTest { void detectMimeTypeWithNameTest() throws IOException { var stream = getFileInputStream("classpath:file-type-detect/index.js"); String mimeType = FileTypeDetectUtils.detectMimeType(stream, "index.js"); - assertThat(mimeType).isEqualTo("application/javascript"); + assertThat(mimeType).isEqualTo("text/javascript"); stream = getFileInputStream("classpath:file-type-detect/index.html"); mimeType = diff --git a/application/src/test/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessorIntegrationTest.java b/application/src/test/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessorIntegrationTest.java index 2ab16d454..4f4330acc 100644 --- a/application/src/test/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessorIntegrationTest.java +++ b/application/src/test/java/run/halo/app/theme/dialect/ContentTemplateHeadProcessorIntegrationTest.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -106,11 +107,11 @@ class ContentTemplateHeadProcessorIntegrationTest { .thenReturn(Mono.empty()); lenient().when(applicationContext.getBeanProvider(ExtensionGetter.class)) - .thenAnswer(invocation -> { - var objectProvider = mock(ObjectProvider.class); - when(objectProvider.getIfUnique()).thenReturn(extensionGetter); - return objectProvider; - }); + .thenAnswer(invocation -> { + var objectProvider = mock(ObjectProvider.class); + when(objectProvider.getIfUnique()).thenReturn(extensionGetter); + return objectProvider; + }); lenient().when(extensionGetter.getExtensions(TemplateHeadProcessor.class)).thenReturn( Flux.fromIterable(map.values()).sort(AnnotationAwareOrderComparator.INSTANCE) ); @@ -145,7 +146,9 @@ class ContentTemplateHeadProcessorIntegrationTest { 2. global head meta is overridden by content head meta 3. but global head meta is not overridden by global seo meta */ - assertThat(Jsoup.parse(result).html()).isEqualTo(""" + var outputSettings = new Document.OutputSettings().prettyPrint(true); + var actual = Jsoup.parse(result).outputSettings(outputSettings).html(); + var expected = Jsoup.parse("""
@@ -155,10 +158,10 @@ class ContentTemplateHeadProcessorIntegrationTest { - - this is body - - """); + this is body +