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

Jump to bottom

Organize tests a bit #5116

Merged
merged 8 commits into from
Jun 2, 2023
Merged

Organize tests a bit #5116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0eff1f4
Rename composable config tests to workspace-configs to match feature …
mehulkar May 28, 2023
0003046
Categorize some tests into directories
mehulkar May 28, 2023
13f50a1
Remove prefix from filenames since they are already inside directory
mehulkar May 28, 2023
58bf03a
Hyphenate a directory
mehulkar May 28, 2023
357045a
Move a helper script into helpers dir
mehulkar May 28, 2023
0f9505c
Make run-caching its own directory so we can expand these tests
mehulkar May 28, 2023
9e45c7c
command- prefix for nonrun commands
mehulkar May 28, 2023
ab44068
Move more tests into run folder
mehulkar May 28, 2023
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
0 ...repo-tests/integration/tests/logged_in.sh → ...s/integration/tests/_helpers/logged_in.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion turborepo-tests/integration/tests/link.t → ...po-tests/integration/tests/command-link.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Setup
$ . ${TESTDIR}/../../helpers/setup.sh
$ . ${TESTDIR}/logged_in.sh
$ . ${TESTDIR}/_helpers/logged_in.sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious, what is the underscore convention? Does this get considered as "not a test" by default?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nah just convention for "private", and also sorts it at the top of the list of things in the directory so it's easier to find non-test things. Otherwise, I found that existing helpers get missed and duplicated more easily.


Link Test Run
$ ${TURBO} link --__test-run
Expand Down
0 turborepo-tests/integration/tests/login.t → ...o-tests/integration/tests/command-login.t
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion turborepo-tests/integration/tests/logout.t → ...-tests/integration/tests/command-logout.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Setup
$ . ${TESTDIR}/../../helpers/setup.sh
$ . ${TESTDIR}/logged_in.sh
$ . ${TESTDIR}/_helpers/logged_in.sh

Logout while logged in
$ ${TURBO} logout
Expand Down
0 turborepo-tests/integration/tests/unlink.t → ...-tests/integration/tests/command-unlink.t
View file
Open in desktop
File renamed without changes.
0 ...o-tests/integration/tests/turbo_version.t → ...tests/integration/tests/command-version.t
View file
Open in desktop
File renamed without changes.
0 ...t_dependencies/persistent-1-topological.t → ...s/persistent_dependencies/1-topological.t
View file
Open in desktop
File renamed without changes.
0 ...ent_dependencies/persistent-10-too-many.t → ...sts/persistent_dependencies/10-too-many.t
View file
Open in desktop
File renamed without changes.
0 ...ependencies/persistent-2-same-workspace.t → ...ersistent_dependencies/2-same-workspace.t
View file
Open in desktop
File renamed without changes.
0 ...dencies/persistent-3-workspace-specific.t → ...stent_dependencies/3-workspace-specific.t
View file
Open in desktop
File renamed without changes.
0 ...pendencies/persistent-4-cross-workspace.t → ...rsistent_dependencies/4-cross-workspace.t
View file
Open in desktop
File renamed without changes.
0 ...ependencies/persistent-5-root-workspace.t → ...ersistent_dependencies/5-root-workspace.t
View file
Open in desktop
File renamed without changes.
0 .../persistent-6-topological-unimplemented.t → ...ependencies/6-topological-unimplemented.t
View file
Open in desktop
File renamed without changes.
0 ...dencies/persistent-7-topological-nested.t → ...stent_dependencies/7-topological-nested.t
View file
Open in desktop
File renamed without changes.
0 ...ies/persistent-8-topological-with-extra.t → ...t_dependencies/8-topological-with-extra.t
View file
Open in desktop
File renamed without changes.
0 ...ies/persistent-9-cross-workspace-nested.t → ...t_dependencies/9-cross-workspace-nested.t
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...epo-tests/integration/tests/cache_state.t → ...tegration/tests/run-caching/cache-state.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...tests/integration/tests/excluded_inputs.t → ...ation/tests/run-caching/excluded-inputs.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...epo-tests/integration/tests/errors-only.t → ...tegration/tests/run-logging/errors-only.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...repo-tests/integration/tests/log_prefix.t → ...ntegration/tests/run-logging/log_prefix.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...orepo-tests/integration/tests/verbosity.t → ...integration/tests/run-logging/verbosity.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...integration/tests/run_summary/discovery.t → ...integration/tests/run-summary/discovery.t
View file
Open in desktop
File renamed without changes.
0 ...ts/integration/tests/run_summary/enable.t → ...ts/integration/tests/run-summary/enable.t
View file
Open in desktop
File renamed without changes.
0 ...sts/integration/tests/run_summary/error.t → ...sts/integration/tests/run-summary/error.t
View file
Open in desktop
File renamed without changes.
0 .../integration/tests/run_summary/monorepo.t → .../integration/tests/run-summary/monorepo.t
View file
Open in desktop
File renamed without changes.
0 ...ration/tests/run_summary/single-package.t → ...ration/tests/run-summary/single-package.t
View file
Open in desktop
File renamed without changes.
0 ...ntegration/tests/run_summary/strict_env.t → ...ntegration/tests/run-summary/strict_env.t
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...integration/tests/absolute_path_warning.t → ...gration/tests/run/absolute_path_warning.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions turborepo-tests/integration/tests/continue.t → ...po-tests/integration/tests/run/continue.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions ...orepo-tests/integration/tests/infer_pkg.t → ...o-tests/integration/tests/run/infer_pkg.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions turborepo-tests/integration/tests/run.t → ...sts/integration/tests/run/missing-tasks.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...ests/integration/tests/one_script_error.t → .../integration/tests/run/one-script-error.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions turborepo-tests/integration/tests/profile.t → ...epo-tests/integration/tests/run/profile.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...ts/composable_config/composing-add-keys.t → ...ration/tests/workspace-configs/add-keys.t
View file
Open in desktop
File renamed without changes.
0 ...s/composable_config/composing-add-tasks.t → ...ation/tests/workspace-configs/add-tasks.t
View file
Open in desktop
File renamed without changes.
0 ...ts/composable_config/composing-bad-json.t → ...ration/tests/workspace-configs/bad-json.t
View file
Open in desktop
File renamed without changes.
0 ...tests/composable_config/composing-cache.t → ...tegration/tests/workspace-configs/cache.t
View file
Open in desktop
File renamed without changes.
0 ...mposable_config/composing-config-change.t → ...n/tests/workspace-configs/config-change.t
View file
Open in desktop
File renamed without changes.
0 ...osable_config/composing-cross-workspace.t → ...tests/workspace-configs/cross-workspace.t
View file
Open in desktop
File renamed without changes.
0 ...posable_config/composing-invalid-config.t → .../tests/workspace-configs/invalid-config.t
View file
Open in desktop
File renamed without changes.
0 ...composing-missing-workspace-config-deps.t → ...e-configs/missing-workspace-config-deps.t
View file
Open in desktop
File renamed without changes.
0 ...nfig/composing-missing-workspace-config.t → ...kspace-configs/missing-workspace-config.t
View file
Open in desktop
File renamed without changes.
0 ...posable_config/composing-omit-keys-deps.t → .../tests/workspace-configs/omit-keys-deps.t
View file
Open in desktop
File renamed without changes.
0 ...s/composable_config/composing-omit-keys.t → ...ation/tests/workspace-configs/omit-keys.t
View file
Open in desktop
File renamed without changes.
0 ...e_config/composing-override-values-deps.t → .../workspace-configs/override-values-deps.t
View file
Open in desktop
File renamed without changes.
0 ...osable_config/composing-override-values.t → ...tests/workspace-configs/override-values.t
View file
Open in desktop
File renamed without changes.
0 .../composable_config/composing-persistent.t → ...tion/tests/workspace-configs/persistent.t
View file
Open in desktop
File renamed without changes.