refactor: fix failing tests

vaadin · Jan 9, 2024 · 990bbcb · 990bbcb
1 parent 817e04d
commit 990bbcb
Show file tree

Hide file tree

Showing 4 changed files with 649 additions and 658 deletions.
diff --git a/packages/java/engine-core/src/main/java/com/vaadin/hilla/engine/GeneratorProcessor.java b/packages/java/engine-core/src/main/java/com/vaadin/hilla/engine/GeneratorProcessor.java
@@ -30,8 +30,8 @@ public final class GeneratorProcessor {
     private static final Logger logger = LoggerFactory
             .getLogger(GeneratorProcessor.class);
 
-    private static final Path TSGEN_PATH = Paths.get("node_modules", "@hilla",
-            "generator-typescript-cli", "bin", "index.js");
+    private static final Path TSGEN_PATH = Paths.get("node_modules", "@vaadin",
+            "hilla-generator-cli", "bin", "index.js");
     private final Path baseDir;
     private final String nodeCommand;
     private final Path openAPIFile;

diff --git a/packages/java/engine-runtime/src/test/java/com/vaadin/hilla/internal/TaskTest.java b/packages/java/engine-runtime/src/test/java/com/vaadin/hilla/internal/TaskTest.java
@@ -17,7 +17,6 @@
 import org.junit.jupiter.api.BeforeEach;
 
 import com.vaadin.flow.server.frontend.FrontendUtils;
-
 import com.vaadin.hilla.engine.EngineConfiguration;
 import com.vaadin.hilla.parser.testutils.TestEngineConfigurationPathResolver;
 
@@ -74,12 +73,9 @@ public void setUpTaskApplication() throws IOException, URISyntaxException,
         var npmCmd = Stream.of("npm", "--no-update-notifier", "--no-audit",
                 "install", "--no-save", "--install-links");
 
-        var generatedFiles = Files
-                .list(packagesDirectory).filter(dirName -> dirName.getFileName()
-                        .toString().startsWith("generator-"))
-                .map(Path::toString);
+        var generatorFiles = Files.list(packagesDirectory).map(Path::toString);
 
-        var command = Stream.of(shellCmd, npmCmd, generatedFiles)
+        var command = Stream.of(shellCmd, npmCmd, generatorFiles)
                 .flatMap(Function.identity()).toList();
 
         var processBuilder = FrontendUtils.createProcessBuilder(command)