diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2024-08-31 22:25:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-31 21:25:32 +0000 |
commit | 4e19474129222b122eeb8fb4c4f289e29a5184bd (patch) | |
tree | 2844e3a47250e6cc3ebfd3aa77d65c9363186cc8 /tests | |
parent | 3a63572187ef435e254a4c753d03a39effae0761 (diff) |
chore: remove DENO_FUTURE=1 from spec tests (#25329)
Towards https://github.com/denoland/deno/issues/25241
Diffstat (limited to 'tests')
43 files changed, 5 insertions, 148 deletions
diff --git a/tests/specs/add/missing_npm_specifier/__test__.jsonc b/tests/specs/add/missing_npm_specifier/__test__.jsonc index 34cc61a37..10e109c95 100644 --- a/tests/specs/add/missing_npm_specifier/__test__.jsonc +++ b/tests/specs/add/missing_npm_specifier/__test__.jsonc @@ -17,9 +17,6 @@ "exitCode": 1 }, { - "envs": { - "DENO_FUTURE": "1" - }, "args": "install ajv@latest", "output": "error: jsr:ajv was not found, but a matching npm package exists. Did you mean `deno install npm:ajv@latest`?\n", "exitCode": 1 diff --git a/tests/specs/compile/byonm_main_sub_dir/__test__.jsonc b/tests/specs/compile/byonm_main_sub_dir/__test__.jsonc index aa225ddd1..28227b4b2 100644 --- a/tests/specs/compile/byonm_main_sub_dir/__test__.jsonc +++ b/tests/specs/compile/byonm_main_sub_dir/__test__.jsonc @@ -1,8 +1,5 @@ { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [{ "args": "install", "output": "[WILDCARD]" diff --git a/tests/specs/compile/npmrc_byonm/__test__.jsonc b/tests/specs/compile/npmrc_byonm/__test__.jsonc index 470e5299c..0cf5c4d7c 100644 --- a/tests/specs/compile/npmrc_byonm/__test__.jsonc +++ b/tests/specs/compile/npmrc_byonm/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "tempDir": true, "steps": [{ "args": "install", diff --git a/tests/specs/future/runtime_api/__test__.jsonc b/tests/specs/future/runtime_api/__test__.jsonc index c1b3b9b17..a52e4299d 100644 --- a/tests/specs/future/runtime_api/__test__.jsonc +++ b/tests/specs/future/runtime_api/__test__.jsonc @@ -2,17 +2,11 @@ "steps": [ { "args": "run -A --unstable-fs --config ../../../config/deno.json main.js", - "output": "main.out", - "envs": { - "DENO_FUTURE": "1" - } + "output": "main.out" }, { "args": "run -A --unstable-fs --config ../../../config/deno.json worker.js", - "output": "main.out", - "envs": { - "DENO_FUTURE": "1" - } + "output": "main.out" } ] } diff --git a/tests/specs/future/unstable_flags/__test__.jsonc b/tests/specs/future/unstable_flags/__test__.jsonc index 008ba1213..d21f60bbd 100644 --- a/tests/specs/future/unstable_flags/__test__.jsonc +++ b/tests/specs/future/unstable_flags/__test__.jsonc @@ -3,18 +3,12 @@ { // Notice `--unstable-*` flags are not needed anymore "args": "run -A --config ../../../config/deno.json main.js", - "output": "main.out", - "envs": { - "DENO_FUTURE": "1" - } + "output": "main.out" }, { // Notice `--unstable-*` flags are not needed anymore "args": "run -A --config ../../../config/deno.json worker.js", - "output": "main.out", - "envs": { - "DENO_FUTURE": "1" - } + "output": "main.out" } ] } diff --git a/tests/specs/install/future_install_add_dist_tag/__test__.jsonc b/tests/specs/install/future_install_add_dist_tag/__test__.jsonc index a3247d160..c1c786188 100644 --- a/tests/specs/install/future_install_add_dist_tag/__test__.jsonc +++ b/tests/specs/install/future_install_add_dist_tag/__test__.jsonc @@ -2,9 +2,6 @@ "tempDir": true, "steps": [ { - "envs": { - "DENO_FUTURE": "1" - }, "args": "install npm:ajv@latest", "output": "install.out" } diff --git a/tests/specs/install/future_install_global/__test__.jsonc b/tests/specs/install/future_install_global/__test__.jsonc index e646164c6..8c5e0cdbd 100644 --- a/tests/specs/install/future_install_global/__test__.jsonc +++ b/tests/specs/install/future_install_global/__test__.jsonc @@ -1,8 +1,5 @@ { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "args": "install --global --root ./bins --name deno-test-bin ./pkg/main.js", diff --git a/tests/specs/install/future_install_local_add_deno/__test__.jsonc b/tests/specs/install/future_install_local_add_deno/__test__.jsonc index eaafafbdd..60112d858 100644 --- a/tests/specs/install/future_install_local_add_deno/__test__.jsonc +++ b/tests/specs/install/future_install_local_add_deno/__test__.jsonc @@ -1,8 +1,5 @@ { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "args": "install npm:@denotest/esm-basic", diff --git a/tests/specs/install/future_install_local_add_npm/__test__.jsonc b/tests/specs/install/future_install_local_add_npm/__test__.jsonc index 19ded2ab5..35d1bfce2 100644 --- a/tests/specs/install/future_install_local_add_npm/__test__.jsonc +++ b/tests/specs/install/future_install_local_add_npm/__test__.jsonc @@ -1,8 +1,5 @@ { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "args": "install npm:@denotest/esm-basic", diff --git a/tests/specs/install/future_install_local_deno/__test__.jsonc b/tests/specs/install/future_install_local_deno/__test__.jsonc index 928030699..bbfee2d9d 100644 --- a/tests/specs/install/future_install_local_deno/__test__.jsonc +++ b/tests/specs/install/future_install_local_deno/__test__.jsonc @@ -1,8 +1,5 @@ { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "args": "install", diff --git a/tests/specs/install/future_install_node_modules/__test__.jsonc b/tests/specs/install/future_install_node_modules/__test__.jsonc index c705ad0f8..94cd8ee2e 100644 --- a/tests/specs/install/future_install_node_modules/__test__.jsonc +++ b/tests/specs/install/future_install_node_modules/__test__.jsonc @@ -2,9 +2,6 @@ "tests": { "install_sets_up_node_modules": { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "args": "install", @@ -27,9 +24,6 @@ }, "install_sets_up_node_modules_with_lockfile": { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "args": "install", @@ -65,9 +59,6 @@ }, "install_errors_corrupted_lockfile": { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "args": "install", diff --git a/tests/specs/install/future_install_node_modules_tag/__test__.jsonc b/tests/specs/install/future_install_node_modules_tag/__test__.jsonc index 31c53749a..254fe8b98 100644 --- a/tests/specs/install/future_install_node_modules_tag/__test__.jsonc +++ b/tests/specs/install/future_install_node_modules_tag/__test__.jsonc @@ -2,9 +2,6 @@ "tempDir": true, "steps": [ { - "envs": { - "DENO_FUTURE": "1" - }, "args": "install", "output": "install.out" } diff --git a/tests/specs/install/install_deprecated_package/__test__.jsonc b/tests/specs/install/install_deprecated_package/__test__.jsonc index 23c9cdb3f..bca03b510 100644 --- a/tests/specs/install/install_deprecated_package/__test__.jsonc +++ b/tests/specs/install/install_deprecated_package/__test__.jsonc @@ -1,8 +1,5 @@ { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "args": "install npm:@denotest/deprecated-package", diff --git a/tests/specs/install/move_after_install/__test__.jsonc b/tests/specs/install/move_after_install/__test__.jsonc index f46f22268..ff79f49cf 100644 --- a/tests/specs/install/move_after_install/__test__.jsonc +++ b/tests/specs/install/move_after_install/__test__.jsonc @@ -1,8 +1,5 @@ { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "cwd": "./test-project", diff --git a/tests/specs/lockfile/frozen_lockfile/__test__.jsonc b/tests/specs/lockfile/frozen_lockfile/__test__.jsonc index 0af7363eb..52cb6321b 100644 --- a/tests/specs/lockfile/frozen_lockfile/__test__.jsonc +++ b/tests/specs/lockfile/frozen_lockfile/__test__.jsonc @@ -60,9 +60,6 @@ ] }, "error_when_package_json_changed": { - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "args": [ diff --git a/tests/specs/node/cjs_dynamic_import_esm_with_exports/__test__.jsonc b/tests/specs/node/cjs_dynamic_import_esm_with_exports/__test__.jsonc index 980245cb9..8955fcda2 100644 --- a/tests/specs/node/cjs_dynamic_import_esm_with_exports/__test__.jsonc +++ b/tests/specs/node/cjs_dynamic_import_esm_with_exports/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "args": "run --check main.ts", "output": "main.out" } diff --git a/tests/specs/node/imports_wildcard/__test__.jsonc b/tests/specs/node/imports_wildcard/__test__.jsonc index a71e27063..1f5a1fb87 100644 --- a/tests/specs/node/imports_wildcard/__test__.jsonc +++ b/tests/specs/node/imports_wildcard/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "args": "run main.mjs", "output": "main.out" } diff --git a/tests/specs/npm/bin_entries_prefer_closer/__test__.jsonc b/tests/specs/npm/bin_entries_prefer_closer/__test__.jsonc index 90d788518..92d43e761 100644 --- a/tests/specs/npm/bin_entries_prefer_closer/__test__.jsonc +++ b/tests/specs/npm/bin_entries_prefer_closer/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "tempDir": true, "steps": [ { diff --git a/tests/specs/npm/byonm/__test__.jsonc b/tests/specs/npm/byonm/__test__.jsonc index 8edb6b0bf..011b4b6c8 100644 --- a/tests/specs/npm/byonm/__test__.jsonc +++ b/tests/specs/npm/byonm/__test__.jsonc @@ -2,9 +2,6 @@ "tempDir": true, "tests": { "future_not_installed": { - "envs": { - "DENO_FUTURE": "1" - }, "steps": [{ "args": "run -A not_installed.ts", "output": "future_not_installed.out", @@ -12,9 +9,6 @@ }] }, "future_invalid_sub_path": { - "envs": { - "DENO_FUTURE": "1" - }, "steps": [{ "args": "install", "output": "[WILDCARD]" diff --git a/tests/specs/npm/check_prefers_non_types_node_pkg/__test__.jsonc b/tests/specs/npm/check_prefers_non_types_node_pkg/__test__.jsonc index d2682e161..fc6746d87 100644 --- a/tests/specs/npm/check_prefers_non_types_node_pkg/__test__.jsonc +++ b/tests/specs/npm/check_prefers_non_types_node_pkg/__test__.jsonc @@ -2,9 +2,6 @@ "tempDir": true, "tests": { "byonm": { - "envs": { - "DENO_FUTURE": "1" - }, "steps": [{ "args": "install", "output": "[WILDCARD]" diff --git a/tests/specs/npm/check_types_in_types_pkg/__test__.jsonc b/tests/specs/npm/check_types_in_types_pkg/__test__.jsonc index 3ca5f23d2..965a58aea 100644 --- a/tests/specs/npm/check_types_in_types_pkg/__test__.jsonc +++ b/tests/specs/npm/check_types_in_types_pkg/__test__.jsonc @@ -2,9 +2,6 @@ "tempDir": true, "tests": { "byonm": { - "envs": { - "DENO_FUTURE": "1" - }, "steps": [{ "args": "install", "output": "[WILDCARD]" diff --git a/tests/specs/npm/cjs_internal_types_default_export/__test__.jsonc b/tests/specs/npm/cjs_internal_types_default_export/__test__.jsonc index dc8aabedb..c207216f4 100644 --- a/tests/specs/npm/cjs_internal_types_default_export/__test__.jsonc +++ b/tests/specs/npm/cjs_internal_types_default_export/__test__.jsonc @@ -1,8 +1,5 @@ { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [{ "commandName": "npm", "args": "install", diff --git a/tests/specs/npm/exec_file_inside_npm_package/__test__.jsonc b/tests/specs/npm/exec_file_inside_npm_package/__test__.jsonc index 01e6cc431..f816bad86 100644 --- a/tests/specs/npm/exec_file_inside_npm_package/__test__.jsonc +++ b/tests/specs/npm/exec_file_inside_npm_package/__test__.jsonc @@ -1,7 +1,4 @@ { "args": "run -A main.ts", - "output": "main.out", - "envs": { - "DENO_FUTURE": "1" - } + "output": "main.out" } diff --git a/tests/specs/npm/future_auto_install_no_package_json/__test__.jsonc b/tests/specs/npm/future_auto_install_no_package_json/__test__.jsonc index ea3cce88f..495b49266 100644 --- a/tests/specs/npm/future_auto_install_no_package_json/__test__.jsonc +++ b/tests/specs/npm/future_auto_install_no_package_json/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "steps": [{ // should auto-install because no package.json "args": "run --quiet main.ts", diff --git a/tests/specs/npm/future_node_modules_dir_setting/__test__.jsonc b/tests/specs/npm/future_node_modules_dir_setting/__test__.jsonc index 745dc9530..e9c9bd81d 100644 --- a/tests/specs/npm/future_node_modules_dir_setting/__test__.jsonc +++ b/tests/specs/npm/future_node_modules_dir_setting/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "tempDir": true, "steps": [{ // byonm where this fails be diff --git a/tests/specs/npm/lifecycle_scripts/__test__.jsonc b/tests/specs/npm/lifecycle_scripts/__test__.jsonc index 6ea9b8f6e..f7a722a8b 100644 --- a/tests/specs/npm/lifecycle_scripts/__test__.jsonc +++ b/tests/specs/npm/lifecycle_scripts/__test__.jsonc @@ -74,9 +74,6 @@ }, "future_install_lifecycle_scripts": { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "args": [ diff --git a/tests/specs/npm/npm_pkg_depend_dep_same_name/__test__.jsonc b/tests/specs/npm/npm_pkg_depend_dep_same_name/__test__.jsonc index d2f4cf6fb..4bca3ecab 100644 --- a/tests/specs/npm/npm_pkg_depend_dep_same_name/__test__.jsonc +++ b/tests/specs/npm/npm_pkg_depend_dep_same_name/__test__.jsonc @@ -1,8 +1,5 @@ { "tempDir": true, - "envs": { - "DENO_FUTURE": "1" - }, "steps": [{ "args": "install", "output": "[WILDCARD]" diff --git a/tests/specs/npm/npmrc/__test__.jsonc b/tests/specs/npm/npmrc/__test__.jsonc index d45c5944c..e7588a779 100644 --- a/tests/specs/npm/npmrc/__test__.jsonc +++ b/tests/specs/npm/npmrc/__test__.jsonc @@ -2,9 +2,6 @@ "tempDir": true, "tests": { "deno_install": { - "envs": { - "DENO_FUTURE": "1" - }, "steps": [{ "args": "install", "output": "install.out" diff --git a/tests/specs/npm/npmrc_bad_registry_config/__test__.jsonc b/tests/specs/npm/npmrc_bad_registry_config/__test__.jsonc index fe99247b1..d1f4855d0 100644 --- a/tests/specs/npm/npmrc_bad_registry_config/__test__.jsonc +++ b/tests/specs/npm/npmrc_bad_registry_config/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "tempDir": true, "args": "install", "output": "main.out", diff --git a/tests/specs/npm/npmrc_bad_token/__test__.jsonc b/tests/specs/npm/npmrc_bad_token/__test__.jsonc index fe99247b1..d1f4855d0 100644 --- a/tests/specs/npm/npmrc_bad_token/__test__.jsonc +++ b/tests/specs/npm/npmrc_bad_token/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "tempDir": true, "args": "install", "output": "main.out", diff --git a/tests/specs/npm/npmrc_basic_auth/__test__.jsonc b/tests/specs/npm/npmrc_basic_auth/__test__.jsonc index 44298ed2f..38cc92e7a 100644 --- a/tests/specs/npm/npmrc_basic_auth/__test__.jsonc +++ b/tests/specs/npm/npmrc_basic_auth/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "tempDir": true, "steps": [{ "args": "install", diff --git a/tests/specs/npm/npmrc_deno_json/__test__.jsonc b/tests/specs/npm/npmrc_deno_json/__test__.jsonc index 5d07b7034..f94250771 100644 --- a/tests/specs/npm/npmrc_deno_json/__test__.jsonc +++ b/tests/specs/npm/npmrc_deno_json/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "tempDir": true, "args": "run -A main.js", "output": "main.out" diff --git a/tests/specs/npm/npmrc_homedir/__test__.jsonc b/tests/specs/npm/npmrc_homedir/__test__.jsonc index fa993901b..45a3c6770 100644 --- a/tests/specs/npm/npmrc_homedir/__test__.jsonc +++ b/tests/specs/npm/npmrc_homedir/__test__.jsonc @@ -1,7 +1,6 @@ { "tempDir": true, "envs": { - "DENO_FUTURE": "1", "HOME": "$PWD/../", "USERPROFILE": "$PWD\\..\\" }, diff --git a/tests/specs/npm/npmrc_not_next_to_package_json/__test__.jsonc b/tests/specs/npm/npmrc_not_next_to_package_json/__test__.jsonc index 56c50bae5..68fa8fdf0 100644 --- a/tests/specs/npm/npmrc_not_next_to_package_json/__test__.jsonc +++ b/tests/specs/npm/npmrc_not_next_to_package_json/__test__.jsonc @@ -1,6 +1,5 @@ { "envs": { - "DENO_FUTURE": "1", "USERPROFILE": "$DENO_DIR", "HOME": "$DENO_DIR" }, diff --git a/tests/specs/npm/npmrc_password_no_username/__test__.jsonc b/tests/specs/npm/npmrc_password_no_username/__test__.jsonc index a36537cb7..ad130c0f6 100644 --- a/tests/specs/npm/npmrc_password_no_username/__test__.jsonc +++ b/tests/specs/npm/npmrc_password_no_username/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "tempDir": true, "steps": [{ "args": "install", diff --git a/tests/specs/npm/npmrc_username_no_password/__test__.jsonc b/tests/specs/npm/npmrc_username_no_password/__test__.jsonc index a36537cb7..ad130c0f6 100644 --- a/tests/specs/npm/npmrc_username_no_password/__test__.jsonc +++ b/tests/specs/npm/npmrc_username_no_password/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "tempDir": true, "steps": [{ "args": "install", diff --git a/tests/specs/npm/npmrc_username_password/__test__.jsonc b/tests/specs/npm/npmrc_username_password/__test__.jsonc index 44298ed2f..38cc92e7a 100644 --- a/tests/specs/npm/npmrc_username_password/__test__.jsonc +++ b/tests/specs/npm/npmrc_username_password/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "tempDir": true, "steps": [{ "args": "install", diff --git a/tests/specs/npm/workspace_basic/__test__.jsonc b/tests/specs/npm/workspace_basic/__test__.jsonc index 763f10649..8ecde6887 100644 --- a/tests/specs/npm/workspace_basic/__test__.jsonc +++ b/tests/specs/npm/workspace_basic/__test__.jsonc @@ -14,9 +14,6 @@ "output": "b/main_node_modules_dir.out" }, "byonm": { - "envs": { - "DENO_FUTURE": "1" - }, "steps": [{ "args": "install", "output": "[WILDCARD]" diff --git a/tests/specs/npm/workspace_conflicting_dep/__test__.jsonc b/tests/specs/npm/workspace_conflicting_dep/__test__.jsonc index 82d59906e..1e5d34381 100644 --- a/tests/specs/npm/workspace_conflicting_dep/__test__.jsonc +++ b/tests/specs/npm/workspace_conflicting_dep/__test__.jsonc @@ -2,9 +2,6 @@ "tempDir": true, "tests": { "conflicting_deps": { - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "args": "install", diff --git a/tests/specs/npm/workspace_dep_aliases/__test__.jsonc b/tests/specs/npm/workspace_dep_aliases/__test__.jsonc index 82d59906e..1e5d34381 100644 --- a/tests/specs/npm/workspace_dep_aliases/__test__.jsonc +++ b/tests/specs/npm/workspace_dep_aliases/__test__.jsonc @@ -2,9 +2,6 @@ "tempDir": true, "tests": { "conflicting_deps": { - "envs": { - "DENO_FUTURE": "1" - }, "steps": [ { "args": "install", diff --git a/tests/specs/publish/byonm_with_package_json/__test__.jsonc b/tests/specs/publish/byonm_with_package_json/__test__.jsonc index 77c23bae1..98dc95fe1 100644 --- a/tests/specs/publish/byonm_with_package_json/__test__.jsonc +++ b/tests/specs/publish/byonm_with_package_json/__test__.jsonc @@ -1,7 +1,4 @@ { - "envs": { - "DENO_FUTURE": "1" - }, "tempDir": true, "steps": [{ "args": "install", diff --git a/tests/specs/task/byonm/__test__.jsonc b/tests/specs/task/byonm/__test__.jsonc index 3d62a7887..508b3e857 100644 --- a/tests/specs/task/byonm/__test__.jsonc +++ b/tests/specs/task/byonm/__test__.jsonc @@ -32,10 +32,6 @@ "args": "install", "output": "[WILDCARD]" }, { - // implied byonm from DENO_FUTURE - "envs": { - "DENO_FUTURE": "1" - }, "args": "task say", "output": "package_json_say.out" }, { diff --git a/tests/util/server/src/builders.rs b/tests/util/server/src/builders.rs index 698543f50..4a4b6a761 100644 --- a/tests/util/server/src/builders.rs +++ b/tests/util/server/src/builders.rs @@ -208,11 +208,6 @@ impl TestContextBuilder { self } - pub fn add_future_env_vars(mut self) -> Self { - self = self.env("DENO_FUTURE", "1"); - self - } - pub fn add_jsr_env_vars(mut self) -> Self { for (key, value) in env_vars_for_jsr_tests() { self = self.env(key, value); |