chore: organize integration tests (#5116)

Some aesthetic changes to make it easier to find tests and helpers.
vercel · Jun 2, 2023 · 689cd60 · 689cd60
1 parent 9ce240a
commit 689cd60
Show file tree

Hide file tree

Showing 47 changed files with 24 additions and 24 deletions.
diff --git a/...repo-tests/integration/tests/logged_in.sh → ...s/integration/tests/_helpers/logged_in.sh b/...repo-tests/integration/tests/logged_in.sh → ...s/integration/tests/_helpers/logged_in.sh
diff --git a/turborepo-tests/integration/tests/link.t → ...po-tests/integration/tests/command-link.t b/turborepo-tests/integration/tests/link.t → ...po-tests/integration/tests/command-link.t
@@ -1,6 +1,6 @@
 Setup
   $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/logged_in.sh
+  $ . ${TESTDIR}/_helpers/logged_in.sh
 
 Link Test Run
   $ ${TURBO} link --__test-run

diff --git a/turborepo-tests/integration/tests/login.t → ...o-tests/integration/tests/command-login.t b/turborepo-tests/integration/tests/login.t → ...o-tests/integration/tests/command-login.t
diff --git a/turborepo-tests/integration/tests/logout.t → ...-tests/integration/tests/command-logout.t b/turborepo-tests/integration/tests/logout.t → ...-tests/integration/tests/command-logout.t
@@ -1,6 +1,6 @@
 Setup
   $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/logged_in.sh
+  $ . ${TESTDIR}/_helpers/logged_in.sh
 
 Logout while logged in
   $ ${TURBO} logout

diff --git a/turborepo-tests/integration/tests/unlink.t → ...-tests/integration/tests/command-unlink.t b/turborepo-tests/integration/tests/unlink.t → ...-tests/integration/tests/command-unlink.t
diff --git a/...o-tests/integration/tests/turbo_version.t → ...tests/integration/tests/command-version.t b/...o-tests/integration/tests/turbo_version.t → ...tests/integration/tests/command-version.t
diff --git a/...t_dependencies/persistent-1-topological.t → ...s/persistent_dependencies/1-topological.t b/...t_dependencies/persistent-1-topological.t → ...s/persistent_dependencies/1-topological.t
diff --git a/...ent_dependencies/persistent-10-too-many.t → ...sts/persistent_dependencies/10-too-many.t b/...ent_dependencies/persistent-10-too-many.t → ...sts/persistent_dependencies/10-too-many.t
diff --git a/...ependencies/persistent-2-same-workspace.t → ...ersistent_dependencies/2-same-workspace.t b/...ependencies/persistent-2-same-workspace.t → ...ersistent_dependencies/2-same-workspace.t
diff --git a/...dencies/persistent-3-workspace-specific.t → ...stent_dependencies/3-workspace-specific.t b/...dencies/persistent-3-workspace-specific.t → ...stent_dependencies/3-workspace-specific.t
diff --git a/...pendencies/persistent-4-cross-workspace.t → ...rsistent_dependencies/4-cross-workspace.t b/...pendencies/persistent-4-cross-workspace.t → ...rsistent_dependencies/4-cross-workspace.t
diff --git a/...ependencies/persistent-5-root-workspace.t → ...ersistent_dependencies/5-root-workspace.t b/...ependencies/persistent-5-root-workspace.t → ...ersistent_dependencies/5-root-workspace.t
diff --git a/.../persistent-6-topological-unimplemented.t → ...ependencies/6-topological-unimplemented.t b/.../persistent-6-topological-unimplemented.t → ...ependencies/6-topological-unimplemented.t
diff --git a/...dencies/persistent-7-topological-nested.t → ...stent_dependencies/7-topological-nested.t b/...dencies/persistent-7-topological-nested.t → ...stent_dependencies/7-topological-nested.t
diff --git a/...ies/persistent-8-topological-with-extra.t → ...t_dependencies/8-topological-with-extra.t b/...ies/persistent-8-topological-with-extra.t → ...t_dependencies/8-topological-with-extra.t
diff --git a/...ies/persistent-9-cross-workspace-nested.t → ...t_dependencies/9-cross-workspace-nested.t b/...ies/persistent-9-cross-workspace-nested.t → ...t_dependencies/9-cross-workspace-nested.t
diff --git a/...epo-tests/integration/tests/cache_state.t → ...tegration/tests/run-caching/cache-state.t b/...epo-tests/integration/tests/cache_state.t → ...tegration/tests/run-caching/cache-state.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/_helpers/setup_monorepo.sh $(pwd)
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd)
 
 Run a build to get a local cache.
   $ ${TURBO} run build --output-logs=none

diff --git a/...tests/integration/tests/excluded_inputs.t → ...ation/tests/run-caching/excluded-inputs.t b/...tests/integration/tests/excluded_inputs.t → ...ation/tests/run-caching/excluded-inputs.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/_helpers/setup_monorepo.sh $(pwd) inputs
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) inputs
 
 Running build for my-app succeeds
   $ ${TURBO} run build

diff --git a/...epo-tests/integration/tests/errors-only.t → ...tegration/tests/run-logging/errors-only.t b/...epo-tests/integration/tests/errors-only.t → ...tegration/tests/run-logging/errors-only.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/_helpers/setup_monorepo.sh $(pwd) run_logging
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) run_logging
 
 # [ ] error exit
 # [ ] outputMode: errors-only

diff --git a/...repo-tests/integration/tests/log_prefix.t → ...ntegration/tests/run-logging/log_prefix.t b/...repo-tests/integration/tests/log_prefix.t → ...ntegration/tests/run-logging/log_prefix.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/_helpers/setup_monorepo.sh $(pwd) run_logging
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) run_logging
 
 # Run for the first time with --log-prefix=none
   $ ${TURBO} run build --log-prefix=none

diff --git a/...orepo-tests/integration/tests/verbosity.t → ...integration/tests/run-logging/verbosity.t b/...orepo-tests/integration/tests/verbosity.t → ...integration/tests/run-logging/verbosity.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/_helpers/setup_monorepo.sh $(pwd)
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd)
 
 Verbosity level 1
   $ ${TURBO} build -v --filter=util --force

diff --git a/...integration/tests/run_summary/discovery.t → ...integration/tests/run-summary/discovery.t b/...integration/tests/run_summary/discovery.t → ...integration/tests/run-summary/discovery.t
diff --git a/...ts/integration/tests/run_summary/enable.t → ...ts/integration/tests/run-summary/enable.t b/...ts/integration/tests/run_summary/enable.t → ...ts/integration/tests/run-summary/enable.t
diff --git a/...sts/integration/tests/run_summary/error.t → ...sts/integration/tests/run-summary/error.t b/...sts/integration/tests/run_summary/error.t → ...sts/integration/tests/run-summary/error.t
diff --git a/.../integration/tests/run_summary/monorepo.t → .../integration/tests/run-summary/monorepo.t b/.../integration/tests/run_summary/monorepo.t → .../integration/tests/run-summary/monorepo.t
diff --git a/...ration/tests/run_summary/single-package.t → ...ration/tests/run-summary/single-package.t b/...ration/tests/run_summary/single-package.t → ...ration/tests/run-summary/single-package.t
diff --git a/...ntegration/tests/run_summary/strict_env.t → ...ntegration/tests/run-summary/strict_env.t b/...ntegration/tests/run_summary/strict_env.t → ...ntegration/tests/run-summary/strict_env.t
diff --git a/...integration/tests/absolute_path_warning.t → ...gration/tests/run/absolute_path_warning.t b/...integration/tests/absolute_path_warning.t → ...gration/tests/run/absolute_path_warning.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/_helpers/setup_monorepo.sh $(pwd) invalid_turbo_json
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) invalid_turbo_json
 
 Expect warnings
   $ ${TURBO} build -v --dry > /dev/null

diff --git a/turborepo-tests/integration/tests/continue.t → ...po-tests/integration/tests/run/continue.t b/turborepo-tests/integration/tests/continue.t → ...po-tests/integration/tests/run/continue.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/_helpers/setup_monorepo.sh $(pwd) monorepo_dependency_error
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) monorepo_dependency_error
 Run without --continue
   $ ${TURBO} build
   \xe2\x80\xa2 Packages in scope: my-app, other-app, some-lib (esc)

diff --git a/...orepo-tests/integration/tests/infer_pkg.t → ...o-tests/integration/tests/run/infer_pkg.t b/...orepo-tests/integration/tests/infer_pkg.t → ...o-tests/integration/tests/run/infer_pkg.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/_helpers/setup_monorepo.sh $(pwd)
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd)
 
 Run a dry run
   $ ${TURBO} build --dry=json | jq .packages

diff --git a/turborepo-tests/integration/tests/run.t → ...sts/integration/tests/run/missing-tasks.t b/turborepo-tests/integration/tests/run.t → ...sts/integration/tests/run/missing-tasks.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/_helpers/setup_monorepo.sh $(pwd)
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd)
 
 # Running non-existent tasks errors
   $ ${TURBO} run doesnotexist

diff --git a/...ests/integration/tests/one_script_error.t → .../integration/tests/run/one-script-error.t b/...ests/integration/tests/one_script_error.t → .../integration/tests/run/one-script-error.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/_helpers/setup_monorepo.sh $(pwd) monorepo_one_script_error
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd) monorepo_one_script_error
 
 Check error is properly reported
 Note that npm reports any failed script as exit code 1, even though we "exit 2"

diff --git a/turborepo-tests/integration/tests/profile.t → ...epo-tests/integration/tests/run/profile.t b/turborepo-tests/integration/tests/profile.t → ...epo-tests/integration/tests/run/profile.t
@@ -1,6 +1,6 @@
 Setup
-  $ . ${TESTDIR}/../../helpers/setup.sh
-  $ . ${TESTDIR}/_helpers/setup_monorepo.sh $(pwd)
+  $ . ${TESTDIR}/../../../helpers/setup.sh
+  $ . ${TESTDIR}/../_helpers/setup_monorepo.sh $(pwd)
 
 Run build and record a trace
 Ignore output since we want to focus on testing the generated profile

diff --git a/...ts/composable_config/composing-add-keys.t → ...ration/tests/workspace-configs/add-keys.t b/...ts/composable_config/composing-add-keys.t → ...ration/tests/workspace-configs/add-keys.t
diff --git a/...s/composable_config/composing-add-tasks.t → ...ation/tests/workspace-configs/add-tasks.t b/...s/composable_config/composing-add-tasks.t → ...ation/tests/workspace-configs/add-tasks.t
diff --git a/...ts/composable_config/composing-bad-json.t → ...ration/tests/workspace-configs/bad-json.t b/...ts/composable_config/composing-bad-json.t → ...ration/tests/workspace-configs/bad-json.t
diff --git a/...tests/composable_config/composing-cache.t → ...tegration/tests/workspace-configs/cache.t b/...tests/composable_config/composing-cache.t → ...tegration/tests/workspace-configs/cache.t
diff --git a/...mposable_config/composing-config-change.t → ...n/tests/workspace-configs/config-change.t b/...mposable_config/composing-config-change.t → ...n/tests/workspace-configs/config-change.t
diff --git a/...osable_config/composing-cross-workspace.t → ...tests/workspace-configs/cross-workspace.t b/...osable_config/composing-cross-workspace.t → ...tests/workspace-configs/cross-workspace.t
diff --git a/...posable_config/composing-invalid-config.t → .../tests/workspace-configs/invalid-config.t b/...posable_config/composing-invalid-config.t → .../tests/workspace-configs/invalid-config.t
diff --git a/...composing-missing-workspace-config-deps.t → ...e-configs/missing-workspace-config-deps.t b/...composing-missing-workspace-config-deps.t → ...e-configs/missing-workspace-config-deps.t
diff --git a/...nfig/composing-missing-workspace-config.t → ...kspace-configs/missing-workspace-config.t b/...nfig/composing-missing-workspace-config.t → ...kspace-configs/missing-workspace-config.t
diff --git a/...posable_config/composing-omit-keys-deps.t → .../tests/workspace-configs/omit-keys-deps.t b/...posable_config/composing-omit-keys-deps.t → .../tests/workspace-configs/omit-keys-deps.t
diff --git a/...s/composable_config/composing-omit-keys.t → ...ation/tests/workspace-configs/omit-keys.t b/...s/composable_config/composing-omit-keys.t → ...ation/tests/workspace-configs/omit-keys.t
diff --git a/...e_config/composing-override-values-deps.t → .../workspace-configs/override-values-deps.t b/...e_config/composing-override-values-deps.t → .../workspace-configs/override-values-deps.t
diff --git a/...osable_config/composing-override-values.t → ...tests/workspace-configs/override-values.t b/...osable_config/composing-override-values.t → ...tests/workspace-configs/override-values.t
diff --git a/.../composable_config/composing-persistent.t → ...tion/tests/workspace-configs/persistent.t b/.../composable_config/composing-persistent.t → ...tion/tests/workspace-configs/persistent.t