fix: using indentation of 2 spaces to align with generator prettier c…

…onfiguration Otherwise resources files are not formatted correctly
jhipster · Sep 13, 2024 · 3889fa2 · 3889fa2
1 parent a3d0f57
commit 3889fa2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/test/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactoryTest.java
@@ -26,20 +26,20 @@ void shouldBuildModuleWithoutPrettierLintStaged() {
 
     JHipsterModule module = factory.buildModule(properties);
 
-    assertThatModuleWithFiles(module, packageJsonFile(), withoutPrettierLintStagedConfigFile())
+    assertThatModuleWithFiles(module, packageJsonFile(), lintStagedConfigFileWithoutPrettier())
       .hasFiles(".prettierignore")
       .hasFile(".lintstagedrc.cjs")
       .containing(
         """
         module.exports = {
-            '*.{md,json,yml,html,css,scss,java,xml,feature}': ['prettier --write'],
-            '*.pug': ['eslint --fix', 'prettier --write'],
+          '*.{md,json,yml,html,css,scss,java,xml,feature}': ['prettier --write'],
+          '*.pug': ['eslint --fix', 'prettier --write'],
         };
         """
       )
       .and()
       .hasFile(".prettierrc")
-      .containing("tabWidth: 4")
+      .containing("tabWidth: 2")
       .containing("endOfLine: 'crlf'")
       .containing("@prettier/plugin-xml")
       .containing("prettier-plugin-gherkin")
@@ -68,7 +68,7 @@ void shouldBuildModuleWithEmptyLintStaged() {
       .containing(
         """
         module.exports = {
-            '*.{md,json,yml,html,css,scss,java,xml,feature}': ['prettier --write'],
+          '*.{md,json,yml,html,css,scss,java,xml,feature}': ['prettier --write'],
         };
         """
       );
@@ -78,7 +78,7 @@ private JHipsterModuleProperties properties(String folder) {
     return JHipsterModulesFixture.propertiesBuilder(folder)
       .projectBaseName("testProject")
       .put("projectName", "Test Project")
-      .put("indentSize", 4)
+      .put("indentSize", 2)
       .put("endOfLine", "crlf")
       .build();
   }

diff --git a/...st/java/tech/jhipster/lite/module/infrastructure/secondary/JHipsterModulesAssertions.java b/...st/java/tech/jhipster/lite/module/infrastructure/secondary/JHipsterModulesAssertions.java
@@ -64,7 +64,7 @@ public static ModuleFile emptyLintStagedConfigFile() {
     return file("src/test/resources/projects/init/.lintstagedrc.empty.cjs", ".lintstagedrc.cjs");
   }
 
-  public static ModuleFile withoutPrettierLintStagedConfigFile() {
+  public static ModuleFile lintStagedConfigFileWithoutPrettier() {
     return file("src/test/resources/projects/init/.lintstagedrc.withoutPrettier.cjs", ".lintstagedrc.cjs");
   }
 

diff --git a/src/test/resources/projects/init/.lintstagedrc.withoutPrettier.cjs b/src/test/resources/projects/init/.lintstagedrc.withoutPrettier.cjs
@@ -1,3 +1,3 @@
 module.exports = {
-    '*.pug': ['eslint --fix', 'prettier --write'],
+  '*.pug': ['eslint --fix', 'prettier --write'],
 };