rewrite tests as specs

denoland · bartlomieju · Apr 23, 2024 · Apr 22, 2024 · Apr 22, 2024 · Apr 22, 2024
commit 7fab5f28701d507f02bac0d5013f0f2e30a296d2
diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs
@@ -4918,44 4918,6 @@ itest!(explicit_resource_management {
  output: "run/explicit_resource_management/main.out",
 });
 
-itest!(workspaces_basic {
- args: "run -L debug -A main.ts",
- output: "run/workspaces/basic/main.out",
- cwd: Some("run/workspaces/basic/"),
- copy_temp_dir: Some("run/workspaces/basic/"),
- envs: env_vars_for_npm_tests(),
- http_server: true,
-});
-
-itest!(workspaces_member_outside_root_dir {
- args: "run -A main.ts",
- output: "run/workspaces/member_outside_root_dir/main.out",
- cwd: Some("run/workspaces/member_outside_root_dir/"),
- copy_temp_dir: Some("run/workspaces/member_outside_root_dir/"),
- envs: env_vars_for_npm_tests(),
- http_server: true,
- exit_code: 1,
-});
-
-itest!(workspaces_nested_member {
- args: "run -A main.ts",
- output: "run/workspaces/nested_member/main.out",
- cwd: Some("run/workspaces/nested_member/"),
- copy_temp_dir: Some("run/workspaces/nested_member/"),
- envs: env_vars_for_npm_tests(),
- http_server: true,
- exit_code: 1,
-});
-
-itest!(workspaces_members_are_imports {
- args: "run -A main.ts",
- output: "run/workspaces/members_are_imports/main.out",
- cwd: Some("run/workspaces/members_are_imports/"),
- copy_temp_dir: Some("run/workspaces/members_are_imports/"),
- envs: env_vars_for_npm_tests(),
- http_server: true,
-});
-
 itest!(unsafe_proto {
  args: "run -A run/unsafe_proto/main.js",
  output: "run/unsafe_proto/main.out",

diff --git a/tests/specs/run/workspaces/basic/__test__.jsonc b/tests/specs/run/workspaces/basic/__test__.jsonc
@@ -0,0 1,5 @@
 {
  "args": "run -L debug -A main.ts",
  "output": "main.out",
  "tempDir": true
 }
diff --git a/...stdata/run/workspaces/basic/bar/deno.json → .../specs/run/workspaces/basic/bar/deno.json b/...stdata/run/workspaces/basic/bar/deno.json → .../specs/run/workspaces/basic/bar/deno.json
diff --git a/...ata/run/workspaces/basic/bar/fizz/buzz.ts → ...ecs/run/workspaces/basic/bar/fizz/buzz.ts b/...ata/run/workspaces/basic/bar/fizz/buzz.ts → ...ecs/run/workspaces/basic/bar/fizz/buzz.ts
diff --git a/.../testdata/run/workspaces/basic/bar/mod.ts → tests/specs/run/workspaces/basic/bar/mod.ts b/.../testdata/run/workspaces/basic/bar/mod.ts → tests/specs/run/workspaces/basic/bar/mod.ts
diff --git a/...un/workspaces/basic/bar/some_mod/hello.ts → ...un/workspaces/basic/bar/some_mod/hello.ts b/...un/workspaces/basic/bar/some_mod/hello.ts → ...un/workspaces/basic/bar/some_mod/hello.ts
diff --git a/...s/testdata/run/workspaces/basic/deno.json → tests/specs/run/workspaces/basic/deno.json b/...s/testdata/run/workspaces/basic/deno.json → tests/specs/run/workspaces/basic/deno.json
diff --git a/...ata/run/workspaces/basic/foo/bar/hello.ts → ...ecs/run/workspaces/basic/foo/bar/hello.ts b/...ata/run/workspaces/basic/foo/bar/hello.ts → ...ecs/run/workspaces/basic/foo/bar/hello.ts
diff --git a/...stdata/run/workspaces/basic/foo/deno.json → .../specs/run/workspaces/basic/foo/deno.json b/...stdata/run/workspaces/basic/foo/deno.json → .../specs/run/workspaces/basic/foo/deno.json
diff --git a/...ata/run/workspaces/basic/foo/fizz/buzz.ts → ...ecs/run/workspaces/basic/foo/fizz/buzz.ts b/...ata/run/workspaces/basic/foo/fizz/buzz.ts → ...ecs/run/workspaces/basic/foo/fizz/buzz.ts
diff --git a/.../testdata/run/workspaces/basic/foo/mod.ts → tests/specs/run/workspaces/basic/foo/mod.ts b/.../testdata/run/workspaces/basic/foo/mod.ts → tests/specs/run/workspaces/basic/foo/mod.ts
diff --git a/tests/testdata/run/workspaces/basic/main.out → tests/specs/run/workspaces/basic/main.out b/tests/testdata/run/workspaces/basic/main.out → tests/specs/run/workspaces/basic/main.out
@@ -1,7 1,11 @@
 [WILDCARD]Workspace config generated this import map {
  "imports": {
  "chalk": "npm:chalk",
- "chalk/": "npm:/chalk/"
  "chalk/": "npm:/chalk/",
  "qwerqwer": "jsr:qwerqwer@^0.0.0",
  "qwerqwer/": "jsr:/qwerqwer@^0.0.0/",
  "asdfasdfasdf": "jsr:asdfasdfasdf@^0.0.0",
  "asdfasdfasdf/": "jsr:/asdfasdfasdf@^0.0.0/"
  },
  "scopes": {
  "./foo/": {

diff --git a/tests/testdata/run/workspaces/basic/main.ts → tests/specs/run/workspaces/basic/main.ts b/tests/testdata/run/workspaces/basic/main.ts → tests/specs/run/workspaces/basic/main.ts
diff --git a/tests/specs/run/workspaces/member_outside_root_dir/__test__.jsonc b/tests/specs/run/workspaces/member_outside_root_dir/__test__.jsonc
@@ -0,0 1,6 @@
 {
  "args": "run -A main.ts",
  "output": "main.out",
  "tempDir": true,
  "exitCode": 1
 }
diff --git a/...kspaces/member_outside_root_dir/deno.json → ...kspaces/member_outside_root_dir/deno.json b/...kspaces/member_outside_root_dir/deno.json → ...kspaces/member_outside_root_dir/deno.json
diff --git a/.../member_outside_root_dir/foo/bar/hello.ts → .../member_outside_root_dir/foo/bar/hello.ts b/.../member_outside_root_dir/foo/bar/hello.ts → .../member_outside_root_dir/foo/bar/hello.ts
diff --git a/...ces/member_outside_root_dir/foo/deno.json → ...ces/member_outside_root_dir/foo/deno.json b/...ces/member_outside_root_dir/foo/deno.json → ...ces/member_outside_root_dir/foo/deno.json
diff --git a/.../member_outside_root_dir/foo/fizz/buzz.ts → .../member_outside_root_dir/foo/fizz/buzz.ts b/.../member_outside_root_dir/foo/fizz/buzz.ts → .../member_outside_root_dir/foo/fizz/buzz.ts
diff --git a/...spaces/member_outside_root_dir/foo/mod.ts → ...spaces/member_outside_root_dir/foo/mod.ts b/...spaces/member_outside_root_dir/foo/mod.ts → ...spaces/member_outside_root_dir/foo/mod.ts
diff --git a/...rkspaces/member_outside_root_dir/main.out → ...rkspaces/member_outside_root_dir/main.out b/...rkspaces/member_outside_root_dir/main.out → ...rkspaces/member_outside_root_dir/main.out
diff --git a/...orkspaces/member_outside_root_dir/main.ts → ...orkspaces/member_outside_root_dir/main.ts b/...orkspaces/member_outside_root_dir/main.ts → ...orkspaces/member_outside_root_dir/main.ts
diff --git a/tests/specs/run/workspaces/members_are_imports/__test__.jsonc b/tests/specs/run/workspaces/members_are_imports/__test__.jsonc
@@ -0,0 1,5 @@
 {
  "args": "run -A main.ts",
  "output": "main.out",
  "tempDir": true
 }
diff --git a/...spaces/members_are_imports/bar/deno.jsonc → ...spaces/members_are_imports/bar/deno.jsonc b/...spaces/members_are_imports/bar/deno.jsonc → ...spaces/members_are_imports/bar/deno.jsonc
diff --git a/...workspaces/members_are_imports/bar/mod.ts → ...workspaces/members_are_imports/bar/mod.ts b/...workspaces/members_are_imports/bar/mod.ts → ...workspaces/members_are_imports/bar/mod.ts
diff --git a/.../workspaces/members_are_imports/deno.json → .../workspaces/members_are_imports/deno.json b/.../workspaces/members_are_imports/deno.json → .../workspaces/members_are_imports/deno.json
diff --git a/...spaces/members_are_imports/foo/deno.jsonc → ...spaces/members_are_imports/foo/deno.jsonc b/...spaces/members_are_imports/foo/deno.jsonc → ...spaces/members_are_imports/foo/deno.jsonc
diff --git a/...workspaces/members_are_imports/foo/mod.ts → ...workspaces/members_are_imports/foo/mod.ts b/...workspaces/members_are_imports/foo/mod.ts → ...workspaces/members_are_imports/foo/mod.ts
diff --git a/...n/workspaces/members_are_imports/main.out → ...n/workspaces/members_are_imports/main.out b/...n/workspaces/members_are_imports/main.out → ...n/workspaces/members_are_imports/main.out
diff --git a/...un/workspaces/members_are_imports/main.ts → ...un/workspaces/members_are_imports/main.ts b/...un/workspaces/members_are_imports/main.ts → ...un/workspaces/members_are_imports/main.ts
diff --git a/tests/specs/run/workspaces/nested_member/__test__.jsonc b/tests/specs/run/workspaces/nested_member/__test__.jsonc
@@ -0,0 1,6 @@
 {
  "args": "run -A main.ts",
  "output": "main.out",
  "tempDir": true,
  "exitCode": 1
 }
diff --git a/...un/workspaces/nested_member/bar/deno.json → ...un/workspaces/nested_member/bar/deno.json b/...un/workspaces/nested_member/bar/deno.json → ...un/workspaces/nested_member/bar/deno.json
diff --git a/...workspaces/nested_member/bar/fizz/buzz.ts → ...workspaces/nested_member/bar/fizz/buzz.ts b/...workspaces/nested_member/bar/fizz/buzz.ts → ...workspaces/nested_member/bar/fizz/buzz.ts
diff --git a/...a/run/workspaces/nested_member/bar/mod.ts → ...s/run/workspaces/nested_member/bar/mod.ts b/...a/run/workspaces/nested_member/bar/mod.ts → ...s/run/workspaces/nested_member/bar/mod.ts
diff --git a/...paces/nested_member/bar/some_mod/hello.ts → ...paces/nested_member/bar/some_mod/hello.ts b/...paces/nested_member/bar/some_mod/hello.ts → ...paces/nested_member/bar/some_mod/hello.ts
diff --git a/...ta/run/workspaces/nested_member/deno.json → ...cs/run/workspaces/nested_member/deno.json b/...ta/run/workspaces/nested_member/deno.json → ...cs/run/workspaces/nested_member/deno.json
diff --git a/...orkspaces/nested_member/foo/bar/deno.json → ...orkspaces/nested_member/foo/bar/deno.json b/...orkspaces/nested_member/foo/bar/deno.json → ...orkspaces/nested_member/foo/bar/deno.json
diff --git a/...workspaces/nested_member/foo/bar/hello.ts → ...workspaces/nested_member/foo/bar/hello.ts b/...workspaces/nested_member/foo/bar/hello.ts → ...workspaces/nested_member/foo/bar/hello.ts
diff --git a/...un/workspaces/nested_member/foo/deno.json → ...un/workspaces/nested_member/foo/deno.json b/...un/workspaces/nested_member/foo/deno.json → ...un/workspaces/nested_member/foo/deno.json
diff --git a/...workspaces/nested_member/foo/fizz/buzz.ts → ...workspaces/nested_member/foo/fizz/buzz.ts b/...workspaces/nested_member/foo/fizz/buzz.ts → ...workspaces/nested_member/foo/fizz/buzz.ts
diff --git a/...a/run/workspaces/nested_member/foo/mod.ts → ...s/run/workspaces/nested_member/foo/mod.ts b/...a/run/workspaces/nested_member/foo/mod.ts → ...s/run/workspaces/nested_member/foo/mod.ts
diff --git a/...ata/run/workspaces/nested_member/main.out → ...ecs/run/workspaces/nested_member/main.out b/...ata/run/workspaces/nested_member/main.out → ...ecs/run/workspaces/nested_member/main.out
diff --git a/...data/run/workspaces/nested_member/main.ts → ...pecs/run/workspaces/nested_member/main.ts b/...data/run/workspaces/nested_member/main.ts → ...pecs/run/workspaces/nested_member/main.ts
diff --git a/tools/lint.js b/tools/lint.js
@@ -213,7 213,7 @@ async function ensureNoNewITests() {
  "pm_tests.rs": 0,
  "publish_tests.rs": 28,
  "repl_tests.rs": 0,
- "run_tests.rs": 382,
  "run_tests.rs": 379,
  "shared_library_tests.rs": 0,
  "task_tests.rs": 30,
  "test_tests.rs": 80,