From 56df61677e9709ec8370ba6f3a0f8b08eb913a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sat, 16 Nov 2024 18:15:42 +0000 Subject: [PATCH] chore: reenable some tests disabled during Deno 1->2 migration (#26898) --- .../specs/npm/workspace_basic/__test__.jsonc | 26 +++++++++++------- .../b/no-exports-sub-path-not-exists.out | 2 +- .../workspace_sub_deno_json/__test__.jsonc | 8 ++---- .../member_with_deno_json/deno.jsonc | 2 +- .../__test__.jsonc | 25 +++++++++++------ .../node_modules/.deno/.deno.lock | 0 .../node_modules/.deno/.deno.lock.poll | 1 + .../node_modules/.deno/.setup-cache.bin | Bin 0 -> 24 bytes .../node_modules/add | 1 + .../node_modules/add-dep | 1 + 10 files changed, 39 insertions(+), 27 deletions(-) create mode 100644 tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/.deno/.deno.lock create mode 100644 tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/.deno/.deno.lock.poll create mode 100644 tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/.deno/.setup-cache.bin create mode 120000 tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/add create mode 120000 tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/add-dep diff --git a/tests/specs/npm/workspace_basic/__test__.jsonc b/tests/specs/npm/workspace_basic/__test__.jsonc index 8ecde6887c..45e414564b 100644 --- a/tests/specs/npm/workspace_basic/__test__.jsonc +++ b/tests/specs/npm/workspace_basic/__test__.jsonc @@ -23,18 +23,24 @@ }] }, "exports_sub_path_not_exists": { - // TODO(2.0): this test appears legitimately broken - "ignore": true, - "args": "run b/exports-sub-path-not-exists.ts", - "output": "b/exports-sub-path-not-exists.out", - "exitCode": 1 + "steps": [{ + "args": "install", + "output": "[WILDCARD]" + }, { + "args": "run b/exports-sub-path-not-exists.ts", + "output": "b/exports-sub-path-not-exists.out", + "exitCode": 1 + }] }, "no_exports_sub_path_not_exists": { - // TODO(2.0): this test appears legitimately broken - "ignore": true, - "args": "run b/no-exports-sub-path-not-exists.ts", - "output": "b/no-exports-sub-path-not-exists.out", - "exitCode": 1 + "steps": [{ + "args": "install", + "output": "[WILDCARD]" + }, { + "args": "run b/no-exports-sub-path-not-exists.ts", + "output": "b/no-exports-sub-path-not-exists.out", + "exitCode": 1 + }] } } } diff --git a/tests/specs/npm/workspace_basic/b/no-exports-sub-path-not-exists.out b/tests/specs/npm/workspace_basic/b/no-exports-sub-path-not-exists.out index f98aa34cb4..a2ae57dfe6 100644 --- a/tests/specs/npm/workspace_basic/b/no-exports-sub-path-not-exists.out +++ b/tests/specs/npm/workspace_basic/b/no-exports-sub-path-not-exists.out @@ -1,3 +1,3 @@ [# not the best error, but it did resolve because there was no exports specified] -error: Module not found "file:///[WILDLINE]/c/non-existent". +error: [ERR_MODULE_NOT_FOUND] Cannot find module 'file:///[WILDLINE]/c/non-existent' imported from 'file:///[WILDLINE]/b/no-exports-sub-path-not-exists.ts' at file:///[WILDLINE]/b/no-exports-sub-path-not-exists.ts:1:20 diff --git a/tests/specs/npm/workspace_sub_deno_json/__test__.jsonc b/tests/specs/npm/workspace_sub_deno_json/__test__.jsonc index dbf35dcb0f..03c5669621 100644 --- a/tests/specs/npm/workspace_sub_deno_json/__test__.jsonc +++ b/tests/specs/npm/workspace_sub_deno_json/__test__.jsonc @@ -2,15 +2,11 @@ "tempDir": true, "tests": { "member": { - // TODO(2.0): this test appears legitimately broken - "ignore": true, - "args": "run --allow-read member/main.ts", + "args": "run --allow-read --node-modules-dir=auto member/main.ts", "output": "member.out" }, "member_with_deno_json": { - // TODO(2.0): this test appears legitimately broken - "ignore": true, - "args": "run --allow-read member_with_deno_json/main.ts", + "args": "run --allow-read --node-modules-dir=auto member_with_deno_json/main.ts", "output": "member.out" }, "non_member": { diff --git a/tests/specs/npm/workspace_sub_deno_json/member_with_deno_json/deno.jsonc b/tests/specs/npm/workspace_sub_deno_json/member_with_deno_json/deno.jsonc index e246bc65df..b80ded2b1e 100644 --- a/tests/specs/npm/workspace_sub_deno_json/member_with_deno_json/deno.jsonc +++ b/tests/specs/npm/workspace_sub_deno_json/member_with_deno_json/deno.jsonc @@ -1,4 +1,4 @@ { // will cause a warning - "nodeModules": "local-auto" + "nodeModulesDir": "auto" } diff --git a/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/__test__.jsonc b/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/__test__.jsonc index cee2fe12d9..91408a7302 100644 --- a/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/__test__.jsonc +++ b/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/__test__.jsonc @@ -1,17 +1,24 @@ { - // TODO(2.0): these tests are actually broken now, some code needs - // to be updated to make them work - "ignore": true, "tests": { "dep_and_workspace_dep": { - "args": "publish --dry-run --no-check --log-level=debug", - "cwd": "subtract", - "output": "publish-subtract.out" + "steps": [{ + "args": "install", + "output": "[WILDCARD]" + }, { + "args": "publish --dry-run --no-check --log-level=debug", + "cwd": "subtract", + "output": "publish-subtract.out" + }] }, "bare_specifier": { - "args": "publish --dry-run --no-check --log-level=debug", - "cwd": "subtract-2", - "output": "publish-subtract2.out" + "steps": [{ + "args": "install", + "output": "[WILDCARD]" + }, { + "args": "publish --dry-run --no-check --log-level=debug", + "cwd": "subtract-2", + "output": "publish-subtract2.out" + }] } } } diff --git a/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/.deno/.deno.lock b/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/.deno/.deno.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/.deno/.deno.lock.poll b/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/.deno/.deno.lock.poll new file mode 100644 index 0000000000..56a6051ca2 --- /dev/null +++ b/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/.deno/.deno.lock.poll @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/.deno/.setup-cache.bin b/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/.deno/.setup-cache.bin new file mode 100644 index 0000000000000000000000000000000000000000..4ac5fc6cf890b46738523c4d4d9d964e312f368f GIT binary patch literal 24 KcmZQzzzzTa7ytnP literal 0 HcmV?d00001 diff --git a/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/add b/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/add new file mode 120000 index 0000000000..7b086589df --- /dev/null +++ b/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/add @@ -0,0 +1 @@ +../add \ No newline at end of file diff --git a/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/add-dep b/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/add-dep new file mode 120000 index 0000000000..7b086589df --- /dev/null +++ b/tests/specs/publish/npm_workspace_jsr_pkg_with_npm_dep/node_modules/add-dep @@ -0,0 +1 @@ +../add \ No newline at end of file