CLI tests: replace rsync with cp

storybookjs · Sep 30, 2018 · 621a4ed · 621a4ed
1 parent 910108a
commit 621a4ed
Show file tree

Hide file tree

Showing 5 changed files with 2,827 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -250,8 +250,6 @@ jobs:
  command: yarn coverage
  cli:
  <<: *defaults
- docker:
- - image: andthensome/docker-node-rsync
  environment:
  BASH_ENV: ~/.bashrc
  steps:
@@ -264,8 +262,6 @@ jobs:
  no_output_timeout: 1800
  cli-latest-cra:
  <<: *defaults
- docker:
- - image: andthensome/docker-node-rsync
  environment:
  BASH_ENV: ~/.bashrc
  steps:

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliTest.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliTest.kt
@@ -26,12 +26,12 @@ object OpenSourceProjects_Storybook_CliTest : BuildType({
  yarn
  yarn bootstrap --core
  """.trimIndent()
- dockerImage = "amfio/node-rsync"
+ dockerImage = "node:%docker.node.version%"
  }
  script {
  name = "Test"
  scriptContent = "yarn test --cli"
- dockerImage = "amfio/node-rsync"
+ dockerImage = "node:%docker.node.version%"
  }
  }
 

diff --git a/.../OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliTestLatestCra.kt b/.../OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliTestLatestCra.kt
@@ -26,12 +26,12 @@ object OpenSourceProjects_Storybook_CliTestLatestCra : BuildType({
  yarn
  yarn bootstrap --core
  """.trimIndent()
- dockerImage = "amfio/node-rsync"
+ dockerImage = "node:%docker.node.version%"
  }
  script {
  name = "Test"
  scriptContent = "yarn test-latest-cra"
- dockerImage = "amfio/node-rsync"
+ dockerImage = "node:%docker.node.version%"
  }
  }
 

diff --git a/lib/cli/test/run_tests.sh b/lib/cli/test/run_tests.sh
@@ -24,7 +24,8 @@ while getopts ":uosf:" opt; do
 done
 
 # copy all files from fixtures directory to `run`
-rsync -rl --delete --exclude=yarn.lock $fixtures_dir/ run
+rm -rfd run
+cp -r $fixtures_dir run
 cd run
 
 for dir in *