Skip to content

Commit aedb7c0

Browse files
EdgarTwiggEdgarTwigg
authored andcommitted
Some windows-specific sanitization.
1 parent bf1d60a commit aedb7c0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ protected StringSelfie expectSelfieErrorMsg(ProcessRunner.Result result) {
367367
int help1 = sanitizedVersion.indexOf("-> [Help 1]");
368368
String trimTrailingString = sanitizedVersion.substring(0, help1);
369369

370-
String sanitizeBiomeNative = trimTrailingString.replaceAll("spotless-data/biome/biome-(.+),", "biome-exe");
370+
String sanitizeBiomeNative = trimTrailingString.replaceAll("[/|\\\\].m2(.*)[/|\\\\]biome\\-(.+),", "biome-exe");
371371
String sanitizeFilePath = sanitizeBiomeNative.replace(rootFolder().getAbsolutePath(), "${PROJECT_DIR}");
372372
String sanitizeUserHome = sanitizeFilePath.replace(System.getProperty("user.home"), "${user.home}");
373373
return Selfie.expectSelfie(sanitizeUserHome);

plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ void failureWhenNotParseable() throws Exception {
249249
assertFile("biome_test.js").sameAsResource("biome/js/fileBefore.js");
250250
expectSelfieErrorMsg(result).toBe("""
251251
Failed to execute goal com.diffplug.spotless:spotless-maven-plugin:VERSION:apply (default-cli) on project spotless-maven-plugin-tests: There were 1 lint error(s), they must be fixed or suppressed.
252-
biome_test.js:LINE_UNDEFINED biome(java.lang.RuntimeException) > arguments: [${user.home}/.m2/repository/com/diffplug/spotless/biome-exe file.json] (...)
252+
biome_test.js:LINE_UNDEFINED biome(java.lang.RuntimeException) > arguments: [${user.home}biome-exe file.json] (...)
253253
Resolve these lints or suppress with `<lintSuppressions>`
254254
""");
255255
}

0 commit comments

Comments
 (0)