summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-07-14 13:22:43 -0400
committerGitHub <noreply@github.com>2024-07-14 13:22:43 -0400
commit8754a01d43782654c3d32945f6d58f7a40c01b69 (patch)
tree0a9efcd2e195a6194134b98373ddccdac9c8e991
parente0cfc9da39e1d05e6a95c89c41cff8ae34fcbd66 (diff)
fix(init): use bare specifier for `jsr:@std/assert` (#24581)
Closes #24580
-rw-r--r--cli/tools/init/mod.rs16
-rw-r--r--tests/integration/init_tests.rs3
-rw-r--r--tests/registry/jsr/@std/assert/1.0.0/assert.ts4
-rw-r--r--tests/registry/jsr/@std/assert/1.0.0/assert_equals.ts9
-rw-r--r--tests/registry/jsr/@std/assert/1.0.0/fail.ts5
-rw-r--r--tests/registry/jsr/@std/assert/1.0.0/mod.ts22
-rw-r--r--tests/registry/jsr/@std/assert/1.0.0_meta.json8
-rw-r--r--tests/registry/jsr/@std/assert/meta.json3
-rw-r--r--tests/specs/init/lib/test.out10
9 files changed, 68 insertions, 12 deletions
diff --git a/cli/tools/init/mod.rs b/cli/tools/init/mod.rs
index b043ab2c4..bc83bfa2b 100644
--- a/cli/tools/init/mod.rs
+++ b/cli/tools/init/mod.rs
@@ -39,7 +39,7 @@ pub fn init_project(init_flags: InitFlags) -> Result<(), AnyError> {
create_file(
&dir,
"mod_test.ts",
- r#"import { assertEquals } from "jsr:@std/assert";
+ r#"import { assertEquals } from "@std/assert";
import { add } from "./mod.ts";
Deno.test(function addTest() {
@@ -53,11 +53,14 @@ Deno.test(function addTest() {
"deno.json",
&json!({
"name": project_name,
- "version": "1.0.0",
- "exports": "./mod.ts",
+ "version": "0.1.0",
"tasks": {
"dev": "deno test --watch mod.ts"
- }
+ },
+ "imports": {
+ "@std/assert": "jsr:@std/assert@1"
+ },
+ "exports": "./mod.ts"
}),
)?;
} else {
@@ -77,7 +80,7 @@ if (import.meta.main) {
create_file(
&dir,
"main_test.ts",
- r#"import { assertEquals } from "jsr:@std/assert";
+ r#"import { assertEquals } from "@std/assert";
import { add } from "./main.ts";
Deno.test(function addTest() {
@@ -92,6 +95,9 @@ Deno.test(function addTest() {
&json!({
"tasks": {
"dev": "deno run --watch main.ts"
+ },
+ "imports": {
+ "@std/assert": "jsr:@std/assert@1"
}
}),
)?;
diff --git a/tests/integration/init_tests.rs b/tests/integration/init_tests.rs
index d2a9fa59b..65a57eeea 100644
--- a/tests/integration/init_tests.rs
+++ b/tests/integration/init_tests.rs
@@ -81,7 +81,8 @@ fn init_subcommand_with_dir_arg() {
let output = context
.new_command()
.env("NO_COLOR", "1")
- .args("test my_dir/main_test.ts")
+ .current_dir("my_dir")
+ .args("test main_test.ts")
.split_output()
.run();
diff --git a/tests/registry/jsr/@std/assert/1.0.0/assert.ts b/tests/registry/jsr/@std/assert/1.0.0/assert.ts
new file mode 100644
index 000000000..8c20c347a
--- /dev/null
+++ b/tests/registry/jsr/@std/assert/1.0.0/assert.ts
@@ -0,0 +1,4 @@
+// deno-lint-ignore-file
+export function assert(expr: unknown) {
+ return true;
+}
diff --git a/tests/registry/jsr/@std/assert/1.0.0/assert_equals.ts b/tests/registry/jsr/@std/assert/1.0.0/assert_equals.ts
new file mode 100644
index 000000000..bd58194d0
--- /dev/null
+++ b/tests/registry/jsr/@std/assert/1.0.0/assert_equals.ts
@@ -0,0 +1,9 @@
+// deno-lint-ignore-file
+export function assertEquals<T>(
+ actual: T,
+ expected: T,
+ msg?: string,
+ options: { formatter?: (value: unknown) => string } = {},
+) {
+ return true;
+}
diff --git a/tests/registry/jsr/@std/assert/1.0.0/fail.ts b/tests/registry/jsr/@std/assert/1.0.0/fail.ts
new file mode 100644
index 000000000..6c21edda5
--- /dev/null
+++ b/tests/registry/jsr/@std/assert/1.0.0/fail.ts
@@ -0,0 +1,5 @@
+// deno-lint-ignore-file
+
+export function fail() {
+ return true;
+}
diff --git a/tests/registry/jsr/@std/assert/1.0.0/mod.ts b/tests/registry/jsr/@std/assert/1.0.0/mod.ts
new file mode 100644
index 000000000..fdcb56c8c
--- /dev/null
+++ b/tests/registry/jsr/@std/assert/1.0.0/mod.ts
@@ -0,0 +1,22 @@
+// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
+
+/** A library of assertion functions.
+ * If the assertion is false an `AssertionError` will be thrown which will
+ * result in pretty-printed diff of failing assertion.
+ *
+ * This module is browser compatible, but do not rely on good formatting of
+ * values for AssertionError messages in browsers.
+ *
+ * ```ts
+ * import { assert } from "@std/assert/assert";
+ *
+ * assert("I am truthy"); // Doesn't throw
+ * assert(false); // Throws `AssertionError`
+ * ```
+ *
+ * @module
+ */
+
+export * from "./assert_equals.ts";
+export * from "./assert.ts";
+export * from "./fail.ts";
diff --git a/tests/registry/jsr/@std/assert/1.0.0_meta.json b/tests/registry/jsr/@std/assert/1.0.0_meta.json
new file mode 100644
index 000000000..3ca2db93a
--- /dev/null
+++ b/tests/registry/jsr/@std/assert/1.0.0_meta.json
@@ -0,0 +1,8 @@
+{
+ "exports": {
+ ".": "./mod.ts",
+ "./assert": "./assert.ts",
+ "./assert-equals": "./assert-equals.ts",
+ "./fail": "./fail.ts"
+ }
+}
diff --git a/tests/registry/jsr/@std/assert/meta.json b/tests/registry/jsr/@std/assert/meta.json
index 4bb721c89..419b83587 100644
--- a/tests/registry/jsr/@std/assert/meta.json
+++ b/tests/registry/jsr/@std/assert/meta.json
@@ -1,8 +1,9 @@
{
"scope": "std",
"name": "assert",
- "latest": "0.220.1",
+ "latest": "1.0.0",
"versions": {
+ "1.0.0": {},
"0.220.1": {}
}
}
diff --git a/tests/specs/init/lib/test.out b/tests/specs/init/lib/test.out
index 0b225a52b..b4f9823a9 100644
--- a/tests/specs/init/lib/test.out
+++ b/tests/specs/init/lib/test.out
@@ -1,10 +1,10 @@
Download http://127.0.0.1:4250/@std/assert/meta.json
-Download http://127.0.0.1:4250/@std/assert/0.220.1_meta.json
+Download http://127.0.0.1:4250/@std/assert/1.0.0_meta.json
[UNORDERED_START]
-Download http://127.0.0.1:4250/@std/assert/0.220.1/mod.ts
-Download http://127.0.0.1:4250/@std/assert/0.220.1/assert_equals.ts
-Download http://127.0.0.1:4250/@std/assert/0.220.1/assert.ts
-Download http://127.0.0.1:4250/@std/assert/0.220.1/fail.ts
+Download http://127.0.0.1:4250/@std/assert/1.0.0/mod.ts
+Download http://127.0.0.1:4250/@std/assert/1.0.0/assert_equals.ts
+Download http://127.0.0.1:4250/@std/assert/1.0.0/assert.ts
+Download http://127.0.0.1:4250/@std/assert/1.0.0/fail.ts
[UNORDERED_END]
Check file:///[WILDLINE]/mod_test.ts
running 1 test from ./mod_test.ts