chore: remove DENO_FUTURE=1 from spec tests (#25329)

Towards https://github.com/denoland/deno/issues/25241
2024-11-21 15:04:11 -05:00 · 2024-08-31 22:25:32 +01:00 · 2024-08-31 22:25:32 +01:00 · 4e19474129
commit 4e19474129
parent 3a63572187
43 changed files with 5 additions and 148 deletions
--- 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
--- 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]"
--- 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",
--- 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"
    }
  ]
 }
--- 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"
    }
  ]
 }
--- 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"
    }
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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"
    }
--- 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",
--- 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",
--- 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": [
--- 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"
 }
--- 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"
 }
--- 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": [
    {
--- 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]"
--- 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]"
--- 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]"
--- 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",
--- 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"
 }
--- 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",
--- 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
--- 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": [
--- 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]"
--- 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"
--- 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",
--- 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",
--- 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",
--- 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"
--- 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\\..\\"
  },
--- 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"
  },
--- 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",
--- 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",
--- 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",
--- 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]"
--- 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",
--- 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",
--- 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",
--- 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"
      }, {
--- 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);