From 241fa7bc97c678a8021a136cf9abc142cb0e21a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Tue, 3 Sep 2024 11:43:10 +0100 Subject: [PATCH] test: reenable frozen_lockfile tests (#25381) Ref https://github.com/denoland/deno/issues/25241 --- tests/specs/lockfile/frozen_lockfile/__test__.jsonc | 4 +--- tests/specs/lockfile/frozen_lockfile/deno.json | 2 +- .../specs/lockfile/frozen_lockfile/frozen_new_dep_cache.out | 2 +- .../frozen_lockfile/frozen_new_dep_dynamic_http.out | 2 +- .../lockfile/frozen_lockfile/frozen_new_dep_dynamic_jsr.out | 2 +- .../lockfile/frozen_lockfile/frozen_new_dep_dynamic_npm.out | 2 +- .../lockfile/frozen_lockfile/frozen_new_dep_jsr_cache.out | 2 +- .../lockfile/frozen_lockfile/frozen_new_dep_jsr_run.out | 2 +- tests/specs/lockfile/frozen_lockfile/frozen_new_dep_run.out | 2 +- tests/specs/lockfile/frozen_lockfile/no_lockfile_run.out | 2 +- tests/specs/lockfile/only_package_json/__test__.jsonc | 6 ++---- .../lockfile/only_package_json/{cache.out => install.out} | 0 12 files changed, 12 insertions(+), 16 deletions(-) rename tests/specs/lockfile/only_package_json/{cache.out => install.out} (100%) diff --git a/tests/specs/lockfile/frozen_lockfile/__test__.jsonc b/tests/specs/lockfile/frozen_lockfile/__test__.jsonc index 52cb6321b1..36a1fc71ef 100644 --- a/tests/specs/lockfile/frozen_lockfile/__test__.jsonc +++ b/tests/specs/lockfile/frozen_lockfile/__test__.jsonc @@ -1,7 +1,5 @@ { "tempDir": true, - // TODO(2.0): re-enable after DENO_FUTURE=1 by default lands - "ignore": true, "tests": { "error_with_new_npm_dep": { "steps": [ @@ -64,7 +62,7 @@ { "args": [ "eval", - "Deno.writeTextFileSync('deno.json', `{ \"nodeModules\": \"local-auto\" }`)" + "Deno.writeTextFileSync('deno.json', `{ \"nodeModulesDir\": \"auto\" }`)" ], "output": "[WILDCARD]" }, diff --git a/tests/specs/lockfile/frozen_lockfile/deno.json b/tests/specs/lockfile/frozen_lockfile/deno.json index 176354f98f..fbd70ec480 100644 --- a/tests/specs/lockfile/frozen_lockfile/deno.json +++ b/tests/specs/lockfile/frozen_lockfile/deno.json @@ -1,3 +1,3 @@ { - "nodeModulesDir": true + "nodeModulesDir": "auto" } diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_cache.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_cache.out index 55ada3dc3e..9a25fd413f 100644 --- a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_cache.out +++ b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_cache.out @@ -1,4 +1,4 @@ -error: The lockfile is out of date. Run `deno cache --frozen=false` or rerun with `--frozen=false` to update it. +error: The lockfile is out of date. Run `deno cache --frozen=false`, `deno install --frozen=false`, or rerun with `--frozen=false` to update it. changes: 4 | - "npm:@denotest/add@1": "1.0.0" 4 | + "npm:@denotest/add@1": "1.0.0", diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_http.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_http.out index 3ec45581aa..2e10aaca54 100644 --- a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_http.out +++ b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_http.out @@ -1,5 +1,5 @@ Download http://localhost:4545/welcome.ts -error: Uncaught (in promise) TypeError: The lockfile is out of date. Run `deno cache --frozen=false` or rerun with `--frozen=false` to update it. +error: Uncaught (in promise) TypeError: The lockfile is out of date. Run `deno cache --frozen=false`, `deno install --frozen=false`, or rerun with `--frozen=false` to update it. changes: 10 | - } 10 | + }, diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_jsr.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_jsr.out index e2b29706c0..6a3dcf5c4b 100644 --- a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_jsr.out +++ b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_jsr.out @@ -1,7 +1,7 @@ Download http://127.0.0.1:4250/@denotest/add/meta.json Download http://127.0.0.1:4250/@denotest/add/1.0.0_meta.json Download http://127.0.0.1:4250/@denotest/add/1.0.0/mod.ts -error: Uncaught (in promise) TypeError: The lockfile is out of date. Run `deno cache --frozen=false` or rerun with `--frozen=false` to update it. +error: Uncaught (in promise) TypeError: The lockfile is out of date. Run `deno cache --frozen=false`, `deno install --frozen=false`, or rerun with `--frozen=false` to update it. changes: 4 | - "npm:@denotest/add@1": "1.0.0" 4 | + "jsr:@denotest/add@1": "1.0.0", diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_npm.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_npm.out index 368d8de5e1..1f866f24e8 100644 --- a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_npm.out +++ b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_dynamic_npm.out @@ -1,5 +1,5 @@ Download http://localhost:4260/@denotest/subtract -error: Uncaught (in promise) TypeError: The lockfile is out of date. Run `deno cache --frozen=false` or rerun with `--frozen=false` to update it. +error: Uncaught (in promise) TypeError: The lockfile is out of date. Run `deno cache --frozen=false`, `deno install --frozen=false`, or rerun with `--frozen=false` to update it. changes: 4 | - "npm:@denotest/add@1": "1.0.0" 4 | + "npm:@denotest/add@1": "1.0.0", diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_jsr_cache.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_jsr_cache.out index 5265400ec3..0ed46a9491 100644 --- a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_jsr_cache.out +++ b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_jsr_cache.out @@ -1,4 +1,4 @@ -error: The lockfile is out of date. Run `deno cache --frozen=false` or rerun with `--frozen=false` to update it. +error: The lockfile is out of date. Run `deno cache --frozen=false`, `deno install --frozen=false`, or rerun with `--frozen=false` to update it. changes: 4 | - "jsr:@denotest/add@1": "1.0.0" 5 | - }, diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_jsr_run.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_jsr_run.out index 215427a0d0..6e7a1462f8 100644 --- a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_jsr_run.out +++ b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_jsr_run.out @@ -1,6 +1,6 @@ Download http://127.0.0.1:4250/@denotest/add/0.2.0_meta.json Download http://127.0.0.1:4250/@denotest/add/0.2.0/mod.ts -error: The lockfile is out of date. Run `deno cache --frozen=false` or rerun with `--frozen=false` to update it. +error: The lockfile is out of date. Run `deno cache --frozen=false`, `deno install --frozen=false`, or rerun with `--frozen=false` to update it. changes: 4 | - "jsr:@denotest/add@1": "1.0.0" 5 | - }, diff --git a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_run.out b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_run.out index 351afbae7c..6645c913e0 100644 --- a/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_run.out +++ b/tests/specs/lockfile/frozen_lockfile/frozen_new_dep_run.out @@ -1,5 +1,5 @@ Download http://localhost:4260/@denotest/subtract -error: The lockfile is out of date. Run `deno cache --frozen=false` or rerun with `--frozen=false` to update it. +error: The lockfile is out of date. Run `deno cache --frozen=false`, `deno install --frozen=false`, or rerun with `--frozen=false` to update it. changes: 4 | - "npm:@denotest/add@1": "1.0.0" 4 | + "npm:@denotest/add@1": "1.0.0", diff --git a/tests/specs/lockfile/frozen_lockfile/no_lockfile_run.out b/tests/specs/lockfile/frozen_lockfile/no_lockfile_run.out index f04aea55cb..ba63f475a6 100644 --- a/tests/specs/lockfile/frozen_lockfile/no_lockfile_run.out +++ b/tests/specs/lockfile/frozen_lockfile/no_lockfile_run.out @@ -1,5 +1,5 @@ Download http://localhost:4260/@denotest/add -error: The lockfile is out of date. Run `deno cache --frozen=false` or rerun with `--frozen=false` to update it. +error: The lockfile is out of date. Run `deno cache --frozen=false`, `deno install --frozen=false`, or rerun with `--frozen=false` to update it. changes: 1 | - 1 | +{ diff --git a/tests/specs/lockfile/only_package_json/__test__.jsonc b/tests/specs/lockfile/only_package_json/__test__.jsonc index 5d79d7a872..f53d68f7df 100644 --- a/tests/specs/lockfile/only_package_json/__test__.jsonc +++ b/tests/specs/lockfile/only_package_json/__test__.jsonc @@ -1,11 +1,9 @@ { "tempDir": true, - // TODO(2.0): re-enable after DENO_FUTURE=1 by default lands - "ignore": true, "steps": [ { - "args": "cache index.js", - "output": "cache.out" + "args": "install", + "output": "install.out" }, { "args": [ diff --git a/tests/specs/lockfile/only_package_json/cache.out b/tests/specs/lockfile/only_package_json/install.out similarity index 100% rename from tests/specs/lockfile/only_package_json/cache.out rename to tests/specs/lockfile/only_package_json/install.out