Merge pull request #2201 from storybooks/cli-autocleanup

CLI test: always remove `run` directory before exiting
storybookjs · Nov 1, 2017 · 640dc32 · 640dc32
2 parents 40776bf + d853591
commit 640dc32
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/lib/cli/package.json b/lib/cli/package.json
@@ -22,9 +22,7 @@
  },
  "scripts": {
  "test-latest-cra": "cd test && ./test_latest_cra.sh",
- "posttest-latest-cra": "yarn posttest",
- "test": "cd test && ./run_tests.sh",
- "posttest": "rm -rfd test/run"
+ "test": "cd test && ./run_tests.sh"
  },
  "dependencies": {
  "@storybook/codemod": "^3.3.0-alpha.2",

diff --git a/lib/cli/test/run_tests.sh b/lib/cli/test/run_tests.sh
@@ -3,6 +3,14 @@
 # exit on error
 set -e
 
+declare test_root=$PWD
+
+# remove run directory before exit to prevent yarn.lock spoiling
+function cleanup {
+ rm -rfd ${test_root}/run
+}
+trap cleanup EXIT
+
 update=0
 skip=0
 fixtures_dir='fixtures'
@@ -65,9 +73,9 @@ if [ $update -eq 1 ]
  fi
 
 # install all the dependencies in a single run
-cd ..
+cd ../../..
 yarn --pure-lockfile
-cd test/run
+cd ${test_root}/run
 
 for dir in *
 do