.

digital-asset · Sep 22, 2022 · 5e21231 · 5e21231
1 parent c5db251
commit 5e21231
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/daml-assistant/integration-tests/BUILD.bazel b/daml-assistant/integration-tests/BUILD.bazel
@@ -77,9 +77,9 @@ ts_libraries = [
 ]
 
 create_daml_app_resources = [
+    "//templates:create-daml-app-test-resources/index.test.ts",
     "//templates:create-daml-app-test-resources/messaging.patch",
     "//templates:create-daml-app-test-resources/testDeps.json",
-    "//templates:create-daml-app-test-resources/index.test.ts",
 ]
 
 da_haskell_library(

diff --git a/daml-assistant/integration-tests/src/DA/Daml/Assistant/CreateDamlAppTests.hs b/daml-assistant/integration-tests/src/DA/Daml/Assistant/CreateDamlAppTests.hs
@@ -134,7 +134,7 @@ tests =
           testFileContent <- T.readFileUtf8 testFile
           T.writeFileUtf8
               (uiDir </> "src" </> "index.test.ts")
-              (T.replace "create-daml-app" (T.pack projectName) testFileContent)
+              (T.replace "\"npm\"" "\"npm-cli.js\"" (T.replace "create-daml-app" (T.pack projectName) testFileContent))
           -- patch daml.yaml, remove JavaScript code generation entry so that patched generated code
           -- is not overwritten
           let damlYaml = cdaDir </> "daml.yaml"

diff --git a/templates/create-daml-app-test-resources/index.test.ts b/templates/create-daml-app-test-resources/index.test.ts
@@ -96,7 +96,7 @@ beforeAll(async () => {
   // https://github.com/facebook/create-react-app/issues/873#issuecomment-266318338
   const env = { ...process.env, BROWSER: "none" };
   console.debug("Starting npm start");
-  uiProc = spawn("bash", ["-c", "npm start >&2"], {
+  uiProc = spawn("npm", ["start"], {
     env,
     stdio: "inherit",
     detached: true,