From a35c8e6588fec21586bcb19146cad19fa01f4f23 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Mon, 13 Mar 2023 17:04:00 -0400
Subject: fix(info/doc): add missing `--no-lock` and `--lock` flags (#18166)

Closes #18159
---
 cli/tests/integration/bench_tests.rs               | 15 +++++++++++++++
 cli/tests/integration/doc_tests.rs                 | 15 +++++++++++++++
 cli/tests/integration/info_tests.rs                | 15 +++++++++++++++
 cli/tests/integration/test_tests.rs                | 15 +++++++++++++++
 cli/tests/testdata/lockfile/basic/bench.nolock.out |  7 +++++++
 cli/tests/testdata/lockfile/basic/deno.json        |  5 +++++
 cli/tests/testdata/lockfile/basic/deno.lock        |  6 ++++++
 cli/tests/testdata/lockfile/basic/doc.nolock.out   |  1 +
 cli/tests/testdata/lockfile/basic/fail.out         |  4 ++++
 cli/tests/testdata/lockfile/basic/info.nolock.out  |  8 ++++++++
 cli/tests/testdata/lockfile/basic/main.bench.ts    |  8 ++++++++
 cli/tests/testdata/lockfile/basic/main.test.ts     |  8 ++++++++
 cli/tests/testdata/lockfile/basic/main.ts          |  1 +
 cli/tests/testdata/lockfile/basic/mod.ts           |  1 +
 cli/tests/testdata/lockfile/basic/test.nolock.out  |  5 +++++
 15 files changed, 114 insertions(+)
 create mode 100644 cli/tests/testdata/lockfile/basic/bench.nolock.out
 create mode 100644 cli/tests/testdata/lockfile/basic/deno.json
 create mode 100644 cli/tests/testdata/lockfile/basic/deno.lock
 create mode 100644 cli/tests/testdata/lockfile/basic/doc.nolock.out
 create mode 100644 cli/tests/testdata/lockfile/basic/fail.out
 create mode 100644 cli/tests/testdata/lockfile/basic/info.nolock.out
 create mode 100644 cli/tests/testdata/lockfile/basic/main.bench.ts
 create mode 100644 cli/tests/testdata/lockfile/basic/main.test.ts
 create mode 100644 cli/tests/testdata/lockfile/basic/main.ts
 create mode 100644 cli/tests/testdata/lockfile/basic/mod.ts
 create mode 100644 cli/tests/testdata/lockfile/basic/test.nolock.out

(limited to 'cli/tests')

diff --git a/cli/tests/integration/bench_tests.rs b/cli/tests/integration/bench_tests.rs
index b2cd38475..e5174025e 100644
--- a/cli/tests/integration/bench_tests.rs
+++ b/cli/tests/integration/bench_tests.rs
@@ -224,3 +224,18 @@ itest!(package_json_basic {
   copy_temp_dir: Some("package_json/basic"),
   exit_code: 0,
 });
+
+itest!(bench_lock {
+  args: "bench",
+  http_server: true,
+  cwd: Some("lockfile/basic"),
+  exit_code: 10,
+  output: "lockfile/basic/fail.out",
+});
+
+itest!(bench_no_lock {
+  args: "bench --no-lock",
+  http_server: true,
+  cwd: Some("lockfile/basic"),
+  output: "lockfile/basic/bench.nolock.out",
+});
diff --git a/cli/tests/integration/doc_tests.rs b/cli/tests/integration/doc_tests.rs
index de611d405..72f5f4314 100644
--- a/cli/tests/integration/doc_tests.rs
+++ b/cli/tests/integration/doc_tests.rs
@@ -64,3 +64,18 @@ itest!(deno_doc_invalid_url {
   output: "doc/invalid_url.out",
   exit_code: 1,
 });
+
+itest!(doc_lock {
+  args: "doc main.ts",
+  http_server: true,
+  cwd: Some("lockfile/basic"),
+  exit_code: 10,
+  output: "lockfile/basic/fail.out",
+});
+
+itest!(doc_no_lock {
+  args: "doc --no-lock main.ts",
+  http_server: true,
+  cwd: Some("lockfile/basic"),
+  output: "lockfile/basic/doc.nolock.out",
+});
diff --git a/cli/tests/integration/info_tests.rs b/cli/tests/integration/info_tests.rs
index 704aaa7af..5b2f2d740 100644
--- a/cli/tests/integration/info_tests.rs
+++ b/cli/tests/integration/info_tests.rs
@@ -94,6 +94,21 @@ itest!(info_missing_module {
   output: "info/info_missing_module.out",
 });
 
+itest!(info_lock {
+  args: "info main.ts",
+  http_server: true,
+  cwd: Some("lockfile/basic"),
+  exit_code: 10,
+  output: "lockfile/basic/fail.out",
+});
+
+itest!(info_no_lock {
+  args: "info --no-lock main.ts",
+  http_server: true,
+  cwd: Some("lockfile/basic"),
+  output: "lockfile/basic/info.nolock.out",
+});
+
 itest!(info_recursive_modules {
   args: "info --quiet info/info_recursive_imports_test.ts",
   output: "info/info_recursive_imports_test.out",
diff --git a/cli/tests/integration/test_tests.rs b/cli/tests/integration/test_tests.rs
index de7bc5fed..047dcbc7e 100644
--- a/cli/tests/integration/test_tests.rs
+++ b/cli/tests/integration/test_tests.rs
@@ -453,3 +453,18 @@ itest!(package_json_basic {
   copy_temp_dir: Some("package_json/basic"),
   exit_code: 0,
 });
+
+itest!(test_lock {
+  args: "test",
+  http_server: true,
+  cwd: Some("lockfile/basic"),
+  exit_code: 10,
+  output: "lockfile/basic/fail.out",
+});
+
+itest!(test_no_lock {
+  args: "test --no-lock",
+  http_server: true,
+  cwd: Some("lockfile/basic"),
+  output: "lockfile/basic/test.nolock.out",
+});
diff --git a/cli/tests/testdata/lockfile/basic/bench.nolock.out b/cli/tests/testdata/lockfile/basic/bench.nolock.out
new file mode 100644
index 000000000..e81474f2a
--- /dev/null
+++ b/cli/tests/testdata/lockfile/basic/bench.nolock.out
@@ -0,0 +1,7 @@
+Download http://localhost:4545/lockfile/basic/mod.ts
+Check file:///[WILDCARD]/main.bench.ts
+5
+cpu: [WILDCARD]
+runtime: [WILDCARD]
+
+[WILDCARD]
diff --git a/cli/tests/testdata/lockfile/basic/deno.json b/cli/tests/testdata/lockfile/basic/deno.json
new file mode 100644
index 000000000..d6541b78e
--- /dev/null
+++ b/cli/tests/testdata/lockfile/basic/deno.json
@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "mod": "http://localhost:4545/lockfile/basic/mod.ts"
+  }
+}
diff --git a/cli/tests/testdata/lockfile/basic/deno.lock b/cli/tests/testdata/lockfile/basic/deno.lock
new file mode 100644
index 000000000..42ab94f9b
--- /dev/null
+++ b/cli/tests/testdata/lockfile/basic/deno.lock
@@ -0,0 +1,6 @@
+{
+  "version": "2",
+  "remote": {
+    "http://localhost:4545/lockfile/basic/mod.ts": "invalid"
+  }
+}
diff --git a/cli/tests/testdata/lockfile/basic/doc.nolock.out b/cli/tests/testdata/lockfile/basic/doc.nolock.out
new file mode 100644
index 000000000..e2d66c027
--- /dev/null
+++ b/cli/tests/testdata/lockfile/basic/doc.nolock.out
@@ -0,0 +1 @@
+Download http://localhost:4545/lockfile/basic/mod.ts
diff --git a/cli/tests/testdata/lockfile/basic/fail.out b/cli/tests/testdata/lockfile/basic/fail.out
new file mode 100644
index 000000000..6a808c0a5
--- /dev/null
+++ b/cli/tests/testdata/lockfile/basic/fail.out
@@ -0,0 +1,4 @@
+Download http://localhost:4545/lockfile/basic/mod.ts
+error: The source code is invalid, as it does not match the expected hash in the lock file.
+  Specifier: [WILDCARD]mod.ts
+  Lock file: [WILDCARD]deno.lock
diff --git a/cli/tests/testdata/lockfile/basic/info.nolock.out b/cli/tests/testdata/lockfile/basic/info.nolock.out
new file mode 100644
index 000000000..d1ef82e49
--- /dev/null
+++ b/cli/tests/testdata/lockfile/basic/info.nolock.out
@@ -0,0 +1,8 @@
+Download http://localhost:4545/lockfile/basic/mod.ts
+local: [WILDCARD]main.ts
+type: TypeScript
+dependencies: 1 unique
+size: [WILDCARD]
+
+file:///[WILDCARD]/main.ts ([WILDCARD])
+└── http://localhost:4545/lockfile/basic/mod.ts ([WILDCARD])
diff --git a/cli/tests/testdata/lockfile/basic/main.bench.ts b/cli/tests/testdata/lockfile/basic/main.bench.ts
new file mode 100644
index 000000000..2a7457680
--- /dev/null
+++ b/cli/tests/testdata/lockfile/basic/main.bench.ts
@@ -0,0 +1,8 @@
+import "./main.ts";
+
+Deno.bench("bench", () => {
+  const testing = 1 + 2;
+  if (testing !== 3) {
+    throw "FAIL";
+  }
+});
diff --git a/cli/tests/testdata/lockfile/basic/main.test.ts b/cli/tests/testdata/lockfile/basic/main.test.ts
new file mode 100644
index 000000000..bb757de23
--- /dev/null
+++ b/cli/tests/testdata/lockfile/basic/main.test.ts
@@ -0,0 +1,8 @@
+import "./main.ts";
+
+Deno.test("test", () => {
+  const testing = 1 + 2;
+  if (testing !== 3) {
+    throw "FAIL";
+  }
+});
diff --git a/cli/tests/testdata/lockfile/basic/main.ts b/cli/tests/testdata/lockfile/basic/main.ts
new file mode 100644
index 000000000..5eed100f5
--- /dev/null
+++ b/cli/tests/testdata/lockfile/basic/main.ts
@@ -0,0 +1 @@
+import "mod";
diff --git a/cli/tests/testdata/lockfile/basic/mod.ts b/cli/tests/testdata/lockfile/basic/mod.ts
new file mode 100644
index 000000000..0f3785f91
--- /dev/null
+++ b/cli/tests/testdata/lockfile/basic/mod.ts
@@ -0,0 +1 @@
+console.log(5);
diff --git a/cli/tests/testdata/lockfile/basic/test.nolock.out b/cli/tests/testdata/lockfile/basic/test.nolock.out
new file mode 100644
index 000000000..3b5999513
--- /dev/null
+++ b/cli/tests/testdata/lockfile/basic/test.nolock.out
@@ -0,0 +1,5 @@
+Download http://localhost:4545/lockfile/basic/mod.ts
+Check file:///[WILDCARD]/main.test.ts
+5
+running 1 test from ./main.test.ts
+[WILDCARD]
-- 
cgit v1.2.3