Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge npm install steps in create-daml-app tests #11287

Merged
merged 1 commit into from
Oct 19, 2021
Merged

Merge npm install steps in create-daml-app tests #11287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions daml-assistant/integration-tests/src/DA/Daml/Assistant/CreateDamlAppTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ tests =
assertFileDoesNotExist (uiDir </> "build" </> "index.html")
withCurrentDirectory uiDir $ do
patchTsDependencies uiDir "package.json"
extraDepsFile <- locateRunfiles (mainWorkspace </> "templates" </> "create-daml-app-test-resources" </> "testDeps.json")
addTestDependencies (uiDir </> "package.json") extraDepsFile
step "Install dependencies for UI"
retry 3 (callCommandSilent "npm-cli.js install")
step "Run linter"
Expand Down Expand Up @@ -118,10 +120,6 @@ tests =

-- Run end to end testing for the app.
withCurrentDirectory (cdaDir </> "ui") $ do
step "Install Jest, Puppeteer and other dependencies"
extraDepsFile <- locateRunfiles (mainWorkspace </> "templates" </> "create-daml-app-test-resources" </> "testDeps.json")
addTestDependencies (uiDir </> "package.json") extraDepsFile
retry 3 (callCommandSilent "npm-cli.js install")
step "Run Puppeteer end-to-end tests"
testFile <- locateRunfiles (mainWorkspace </> "templates" </> "create-daml-app-test-resources" </> "index.test.ts")
testFileContent <- T.readFileUtf8 testFile
Expand Down