chore: make ApprovalTests reporter configuration global

jhipster · Sep 17, 2024 · abcfa2a · abcfa2a
1 parent aeffff1
commit abcfa2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/test/java/tech/jhipster/lite/PackageSettings.java b/src/test/java/tech/jhipster/lite/PackageSettings.java
@@ -1,9 +1,16 @@
 package tech.jhipster.lite;
 
+import org.approvaltests.core.ApprovalFailureReporter;
+import org.approvaltests.reporters.*;
+
 /**
  * ApprovalTests.Java configuration.
  * */
 public class PackageSettings {
 
   private static final String ApprovalBaseDirectory = "../resources";
+  private static final ApprovalFailureReporter UseReporter = new FirstWorkingReporter(
+    new AutoApproveWhenEmptyReporter(),
+    new DiffReporter()
+  );
 }
diff --git a/...st/java/tech/jhipster/lite/module/infrastructure/secondary/JHipsterModulesAssertions.java b/...st/java/tech/jhipster/lite/module/infrastructure/secondary/JHipsterModulesAssertions.java
@@ -13,9 +13,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.approvaltests.Approvals;
-import org.approvaltests.core.ApprovalFailureReporter;
 import org.approvaltests.core.Scrubber;
-import org.approvaltests.reporters.*;
 import org.approvaltests.scrubbers.NoOpScrubber;
 import org.approvaltests.scrubbers.RegExScrubber;
 import org.assertj.core.api.SoftAssertions;
@@ -343,10 +341,9 @@ private void assertFileExists() {
      */
     public JHipsterModuleFileAsserter<T> matchingSavedSnapshot() {
       String shortFileName = Arrays.stream(file.split("/")).toList().getLast();
-      ApprovalFailureReporter reporter = new FirstWorkingReporter(new AutoApproveWhenEmptyReporter(), new DiffReporter());
       Approvals.verify(
         contentNormalizingNewLines(projectFolder.filePath(file)),
-        Approvals.NAMES.withParameters(shortFileName).withScrubber(scrubberFor(file)).addReporter(reporter)
+        Approvals.NAMES.withParameters(shortFileName).withScrubber(scrubberFor(file))
       );
 
       return this;