summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/compilers/ts.rs4
-rw-r--r--cli/file_fetcher.rs92
-rw-r--r--cli/installer.rs30
-rw-r--r--cli/js/body_test.ts4
-rw-r--r--cli/js/compiler_util.ts2
-rw-r--r--cli/js/fetch_test.ts10
-rw-r--r--cli/js/files_test.ts16
-rw-r--r--cli/js/read_dir_test.ts6
-rw-r--r--cli/js/resources_test.ts2
-rw-r--r--cli/js/stat_test.ts4
-rw-r--r--cli/source_maps.rs4
-rw-r--r--cli/tests/README.md4
-rw-r--r--cli/tests/error_003_typescript.ts.out2
-rw-r--r--cli/tests/error_015_dynamic_import_permissions.js2
-rw-r--r--cli/tests/error_015_dynamic_import_permissions.out2
-rw-r--r--cli/tests/error_016_dynamic_import_permissions2.js2
-rw-r--r--cli/tests/integration_tests.rs2
-rw-r--r--cli/worker.rs4
18 files changed, 99 insertions, 93 deletions
diff --git a/cli/compilers/ts.rs b/cli/compilers/ts.rs
index 5aa299518..b86a1a7ae 100644
--- a/cli/compilers/ts.rs
+++ b/cli/compilers/ts.rs
@@ -700,7 +700,7 @@ mod tests {
let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.parent()
.unwrap()
- .join("tests/002_hello.ts");
+ .join("cli/tests/002_hello.ts");
let specifier =
ModuleSpecifier::resolve_url_or_path(p.to_str().unwrap()).unwrap();
@@ -739,7 +739,7 @@ mod tests {
let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.parent()
.unwrap()
- .join("tests/002_hello.ts");
+ .join("cli/tests/002_hello.ts");
use deno_core::ModuleSpecifier;
let module_name = ModuleSpecifier::resolve_url_or_path(p.to_str().unwrap())
.unwrap()
diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs
index c89166509..d4698e233 100644
--- a/cli/file_fetcher.rs
+++ b/cli/file_fetcher.rs
@@ -1005,7 +1005,7 @@ mod tests {
let fetcher_1 = fetcher.clone();
let fetcher_2 = fetcher.clone();
let module_url =
- Url::parse("http://localhost:4545/tests/subdir/mod2.ts").unwrap();
+ Url::parse("http://localhost:4545/cli/tests/subdir/mod2.ts").unwrap();
let module_url_1 = module_url.clone();
let module_url_2 = module_url.clone();
let headers_file_name = fetcher.deps_cache.location.join(
@@ -1106,7 +1106,8 @@ mod tests {
let (temp_dir, fetcher) = test_setup();
let fetcher_1 = fetcher.clone();
let module_url =
- Url::parse("http://localhost:4545/tests/subdir/mismatch_ext.ts").unwrap();
+ Url::parse("http://localhost:4545/cli/tests/subdir/mismatch_ext.ts")
+ .unwrap();
let module_url_1 = module_url.clone();
let module_url_2 = module_url.clone();
let headers_file_name = fetcher.deps_cache.location.join(
@@ -1183,7 +1184,7 @@ mod tests {
let http_server_guard = crate::test_util::http_server();
let (_temp_dir, fetcher) = test_setup();
let specifier = ModuleSpecifier::resolve_url(
- "http://localhost:4545/tests/subdir/mismatch_ext.ts",
+ "http://localhost:4545/cli/tests/subdir/mismatch_ext.ts",
)
.unwrap();
let headers_file_name = fetcher.deps_cache.location.join(
@@ -1231,22 +1232,24 @@ mod tests {
let http_server_guard = crate::test_util::http_server();
let (_temp_dir, fetcher) = test_setup();
- let redirect_module_url =
- Url::parse("http://localhost:4546/tests/subdir/redirects/redirect1.js")
- .unwrap();
+ let redirect_module_url = Url::parse(
+ "http://localhost:4546/cli/tests/subdir/redirects/redirect1.js",
+ )
+ .unwrap();
let redirect_source_filepath = fetcher
.deps_cache
.location
- .join("http/localhost_PORT4546/tests/subdir/redirects/redirect1.js");
+ .join("http/localhost_PORT4546/cli/tests/subdir/redirects/redirect1.js");
let redirect_source_filename =
redirect_source_filepath.to_str().unwrap().to_string();
- let target_module_url =
- Url::parse("http://localhost:4545/tests/subdir/redirects/redirect1.js")
- .unwrap();
+ let target_module_url = Url::parse(
+ "http://localhost:4545/cli/tests/subdir/redirects/redirect1.js",
+ )
+ .unwrap();
let redirect_target_filepath = fetcher
.deps_cache
.location
- .join("http/localhost_PORT4545/tests/subdir/redirects/redirect1.js");
+ .join("http/localhost_PORT4545/cli/tests/subdir/redirects/redirect1.js");
let redirect_target_filename =
redirect_target_filepath.to_str().unwrap().to_string();
@@ -1263,7 +1266,7 @@ mod tests {
fetcher.get_source_code_headers(&redirect_module_url);
assert_eq!(
redirect_source_headers.redirect_to.unwrap(),
- "http://localhost:4545/tests/subdir/redirects/redirect1.js"
+ "http://localhost:4545/cli/tests/subdir/redirects/redirect1.js"
);
// The target of redirection is downloaded instead.
assert_eq!(
@@ -1286,29 +1289,32 @@ mod tests {
fn test_get_source_code_4() {
let http_server_guard = crate::test_util::http_server();
let (_temp_dir, fetcher) = test_setup();
- let double_redirect_url =
- Url::parse("http://localhost:4548/tests/subdir/redirects/redirect1.js")
- .unwrap();
+ let double_redirect_url = Url::parse(
+ "http://localhost:4548/cli/tests/subdir/redirects/redirect1.js",
+ )
+ .unwrap();
let double_redirect_path = fetcher
.deps_cache
.location
- .join("http/localhost_PORT4548/tests/subdir/redirects/redirect1.js");
+ .join("http/localhost_PORT4548/cli/tests/subdir/redirects/redirect1.js");
- let redirect_url =
- Url::parse("http://localhost:4546/tests/subdir/redirects/redirect1.js")
- .unwrap();
+ let redirect_url = Url::parse(
+ "http://localhost:4546/cli/tests/subdir/redirects/redirect1.js",
+ )
+ .unwrap();
let redirect_path = fetcher
.deps_cache
.location
- .join("http/localhost_PORT4546/tests/subdir/redirects/redirect1.js");
+ .join("http/localhost_PORT4546/cli/tests/subdir/redirects/redirect1.js");
- let target_url =
- Url::parse("http://localhost:4545/tests/subdir/redirects/redirect1.js")
- .unwrap();
+ let target_url = Url::parse(
+ "http://localhost:4545/cli/tests/subdir/redirects/redirect1.js",
+ )
+ .unwrap();
let target_path = fetcher
.deps_cache
.location
- .join("http/localhost_PORT4545/tests/subdir/redirects/redirect1.js");
+ .join("http/localhost_PORT4545/cli/tests/subdir/redirects/redirect1.js");
// Test double redirects and headers recording
let fut = fetcher
@@ -1353,18 +1359,20 @@ mod tests {
let http_server_guard = crate::test_util::http_server();
let (_temp_dir, fetcher) = test_setup();
- let double_redirect_url =
- Url::parse("http://localhost:4548/tests/subdir/redirects/redirect1.js")
- .unwrap();
+ let double_redirect_url = Url::parse(
+ "http://localhost:4548/cli/tests/subdir/redirects/redirect1.js",
+ )
+ .unwrap();
- let redirect_url =
- Url::parse("http://localhost:4546/tests/subdir/redirects/redirect1.js")
- .unwrap();
+ let redirect_url = Url::parse(
+ "http://localhost:4546/cli/tests/subdir/redirects/redirect1.js",
+ )
+ .unwrap();
let target_path = fetcher
.deps_cache
.location
- .join("http/localhost_PORT4545/tests/subdir/redirects/redirect1.js");
+ .join("http/localhost_PORT4545/cli/tests/subdir/redirects/redirect1.js");
let target_path_ = target_path.clone();
// Test that redirect target is not downloaded twice for different redirect source.
@@ -1406,9 +1414,10 @@ mod tests {
fn test_get_source_code_6() {
let http_server_guard = crate::test_util::http_server();
let (_temp_dir, fetcher) = test_setup();
- let double_redirect_url =
- Url::parse("http://localhost:4548/tests/subdir/redirects/redirect1.js")
- .unwrap();
+ let double_redirect_url = Url::parse(
+ "http://localhost:4548/cli/tests/subdir/redirects/redirect1.js",
+ )
+ .unwrap();
// Test that redirections can be limited
let fut = fetcher
@@ -1432,7 +1441,7 @@ mod tests {
let http_server_guard = crate::test_util::http_server();
let (_temp_dir, fetcher) = test_setup();
let module_url =
- Url::parse("http://localhost:4545/tests/002_hello.ts").unwrap();
+ Url::parse("http://localhost:4545/cli/tests/002_hello.ts").unwrap();
// Remote modules are not allowed
let fut = fetcher
.get_source_file_async(&module_url, true, true, false)
@@ -1453,7 +1462,7 @@ mod tests {
let fetcher_1 = fetcher.clone();
let fetcher_2 = fetcher.clone();
let module_url =
- Url::parse("http://localhost:4545/tests/002_hello.ts").unwrap();
+ Url::parse("http://localhost:4545/cli/tests/002_hello.ts").unwrap();
let module_url_1 = module_url.clone();
let module_url_2 = module_url.clone();
// file hasn't been cached before
@@ -1485,7 +1494,7 @@ mod tests {
let http_server_guard = crate::test_util::http_server();
let (_temp_dir, fetcher) = test_setup();
let module_url =
- Url::parse("http://127.0.0.1:4545/tests/subdir/mt_video_mp2t.t3.ts")
+ Url::parse("http://127.0.0.1:4545/cli/tests/subdir/mt_video_mp2t.t3.ts")
.unwrap();
let headers_file_name = fetcher.deps_cache.location.join(
fetcher
@@ -1528,7 +1537,7 @@ mod tests {
let (_temp_dir, fetcher) = test_setup();
let module_url =
- Url::parse("http://localhost:4545/tests/subdir/mt_video_mp2t.t3.ts")
+ Url::parse("http://localhost:4545/cli/tests/subdir/mt_video_mp2t.t3.ts")
.unwrap();
let headers_file_name = fetcher.deps_cache.location.join(
fetcher
@@ -1574,12 +1583,13 @@ mod tests {
let fetcher_2 = fetcher.clone();
let fetcher_3 = fetcher.clone();
let module_url =
- Url::parse("http://localhost:4545/tests/subdir/no_ext").unwrap();
+ Url::parse("http://localhost:4545/cli/tests/subdir/no_ext").unwrap();
let module_url_2 =
- Url::parse("http://localhost:4545/tests/subdir/mismatch_ext.ts").unwrap();
+ Url::parse("http://localhost:4545/cli/tests/subdir/mismatch_ext.ts")
+ .unwrap();
let module_url_2_ = module_url_2.clone();
let module_url_3 =
- Url::parse("http://localhost:4545/tests/subdir/unknown_ext.deno")
+ Url::parse("http://localhost:4545/cli/tests/subdir/unknown_ext.deno")
.unwrap();
let module_url_3_ = module_url_3.clone();
diff --git a/cli/installer.rs b/cli/installer.rs
index 2d47f6a04..d5e90a252 100644
--- a/cli/installer.rs
+++ b/cli/installer.rs
@@ -257,7 +257,7 @@ mod tests {
DenoFlags::default(),
None,
"echo_test",
- "http://localhost:4545/tests/echo_server.ts",
+ "http://localhost:4545/cli/tests/echo_server.ts",
vec![],
)
.expect("Install failed");
@@ -274,11 +274,11 @@ mod tests {
let expected_content = if cfg!(windows) {
r#"% This executable is generated by Deno. Please don't modify it unless you know what it means. %
@IF EXIST "%~dp0\deno.exe" (
- "%~dp0\deno.exe" "run" "http://localhost:4545/tests/echo_server.ts" %*
+ "%~dp0\deno.exe" "run" "http://localhost:4545/cli/tests/echo_server.ts" %*
) ELSE (
@SETLOCAL
@SET PATHEXT=%PATHEXT:;.TS;=;%
- "deno" "run" "http://localhost:4545/tests/echo_server.ts" %*
+ "deno" "run" "http://localhost:4545/cli/tests/echo_server.ts" %*
)
"#
} else {
@@ -291,10 +291,10 @@ case \`uname\` in
esac
if [ -x "$basedir/deno" ]; then
- "$basedir/deno" "run" "http://localhost:4545/tests/echo_server.ts" "$@"
+ "$basedir/deno" "run" "http://localhost:4545/cli/tests/echo_server.ts" "$@"
ret=$?
else
- "deno" "run" "http://localhost:4545/tests/echo_server.ts" "$@"
+ "deno" "run" "http://localhost:4545/cli/tests/echo_server.ts" "$@"
ret=$?
fi
exit $ret
@@ -319,7 +319,7 @@ exit $ret
DenoFlags::default(),
Some(temp_dir.path().to_string_lossy().to_string()),
"echo_test",
- "http://localhost:4545/tests/echo_server.ts",
+ "http://localhost:4545/cli/tests/echo_server.ts",
vec![],
)
.expect("Install failed");
@@ -335,11 +335,11 @@ exit $ret
let expected_content = if cfg!(windows) {
r#"% This executable is generated by Deno. Please don't modify it unless you know what it means. %
@IF EXIST "%~dp0\deno.exe" (
- "%~dp0\deno.exe" "run" "http://localhost:4545/tests/echo_server.ts" %*
+ "%~dp0\deno.exe" "run" "http://localhost:4545/cli/tests/echo_server.ts" %*
) ELSE (
@SETLOCAL
@SET PATHEXT=%PATHEXT:;.TS;=;%
- "deno" "run" "http://localhost:4545/tests/echo_server.ts" %*
+ "deno" "run" "http://localhost:4545/cli/tests/echo_server.ts" %*
)
"#
} else {
@@ -352,10 +352,10 @@ case \`uname\` in
esac
if [ -x "$basedir/deno" ]; then
- "$basedir/deno" "run" "http://localhost:4545/tests/echo_server.ts" "$@"
+ "$basedir/deno" "run" "http://localhost:4545/cli/tests/echo_server.ts" "$@"
ret=$?
else
- "deno" "run" "http://localhost:4545/tests/echo_server.ts" "$@"
+ "deno" "run" "http://localhost:4545/cli/tests/echo_server.ts" "$@"
ret=$?
fi
exit $ret
@@ -377,7 +377,7 @@ exit $ret
},
Some(temp_dir.path().to_string_lossy().to_string()),
"echo_test",
- "http://localhost:4545/tests/echo_server.ts",
+ "http://localhost:4545/cli/tests/echo_server.ts",
vec!["--foobar".to_string()],
)
.expect("Install failed");
@@ -393,11 +393,11 @@ exit $ret
let expected_content = if cfg!(windows) {
r#"% This executable is generated by Deno. Please don't modify it unless you know what it means. %
@IF EXIST "%~dp0\deno.exe" (
- "%~dp0\deno.exe" "run" "--allow-read" "--allow-net" "http://localhost:4545/tests/echo_server.ts" "--foobar" %*
+ "%~dp0\deno.exe" "run" "--allow-read" "--allow-net" "http://localhost:4545/cli/tests/echo_server.ts" "--foobar" %*
) ELSE (
@SETLOCAL
@SET PATHEXT=%PATHEXT:;.TS;=;%
- "deno" "run" "--allow-read" "--allow-net" "http://localhost:4545/tests/echo_server.ts" "--foobar" %*
+ "deno" "run" "--allow-read" "--allow-net" "http://localhost:4545/cli/tests/echo_server.ts" "--foobar" %*
)
"#
} else {
@@ -410,10 +410,10 @@ case \`uname\` in
esac
if [ -x "$basedir/deno" ]; then
- "$basedir/deno" "run" "--allow-read" "--allow-net" "http://localhost:4545/tests/echo_server.ts" "--foobar" "$@"
+ "$basedir/deno" "run" "--allow-read" "--allow-net" "http://localhost:4545/cli/tests/echo_server.ts" "--foobar" "$@"
ret=$?
else
- "deno" "run" "--allow-read" "--allow-net" "http://localhost:4545/tests/echo_server.ts" "--foobar" "$@"
+ "deno" "run" "--allow-read" "--allow-net" "http://localhost:4545/cli/tests/echo_server.ts" "--foobar" "$@"
ret=$?
fi
exit $ret
diff --git a/cli/js/body_test.ts b/cli/js/body_test.ts
index bb4d0a451..2ac4d1314 100644
--- a/cli/js/body_test.ts
+++ b/cli/js/body_test.ts
@@ -34,7 +34,7 @@ test(async function arrayBufferFromByteArrays(): Promise<void> {
//FormData
testPerm({ net: true }, async function bodyMultipartFormData(): Promise<void> {
const response = await fetch(
- "http://localhost:4545/tests/subdir/multipart_form_data.txt"
+ "http://localhost:4545/cli/tests/subdir/multipart_form_data.txt"
);
const text = await response.text();
@@ -51,7 +51,7 @@ testPerm({ net: true }, async function bodyMultipartFormData(): Promise<void> {
testPerm({ net: true }, async function bodyURLEncodedFormData(): Promise<void> {
const response = await fetch(
- "http://localhost:4545/tests/subdir/form_urlencoded.txt"
+ "http://localhost:4545/cli/tests/subdir/form_urlencoded.txt"
);
const text = await response.text();
diff --git a/cli/js/compiler_util.ts b/cli/js/compiler_util.ts
index f541ea46f..b58d8da43 100644
--- a/cli/js/compiler_util.ts
+++ b/cli/js/compiler_util.ts
@@ -293,7 +293,7 @@ export const ignoredDiagnostics = [
// TS5009: Cannot find the common subdirectory path for the input files.
5009,
// TS5055: Cannot write file
- // 'http://localhost:4545/tests/subdir/mt_application_x_javascript.j4.js'
+ // 'http://localhost:4545/cli/tests/subdir/mt_application_x_javascript.j4.js'
// because it would overwrite input file.
5055,
// TypeScript is overly opinionated that only CommonJS modules kinds can
diff --git a/cli/js/fetch_test.ts b/cli/js/fetch_test.ts
index 92d1176cc..b8a7c8641 100644
--- a/cli/js/fetch_test.ts
+++ b/cli/js/fetch_test.ts
@@ -114,7 +114,7 @@ testPerm({ net: true }, async function fetchMultipartFormDataSuccess(): Promise<
void
> {
const response = await fetch(
- "http://localhost:4545/tests/subdir/multipart_form_data.txt"
+ "http://localhost:4545/cli/tests/subdir/multipart_form_data.txt"
);
const formData = await response.formData();
assert(formData.has("field_1"));
@@ -131,7 +131,7 @@ testPerm(
{ net: true },
async function fetchURLEncodedFormDataSuccess(): Promise<void> {
const response = await fetch(
- "http://localhost:4545/tests/subdir/form_urlencoded.txt"
+ "http://localhost:4545/cli/tests/subdir/form_urlencoded.txt"
);
const formData = await response.formData();
assert(formData.has("field_1"));
@@ -153,11 +153,11 @@ testPerm({ net: true }, async function fetchWithRedirection(): Promise<void> {
testPerm({ net: true }, async function fetchWithRelativeRedirection(): Promise<
void
> {
- const response = await fetch("http://localhost:4545/tests"); // will redirect to /tests/
+ const response = await fetch("http://localhost:4545/cli/tests"); // will redirect to /cli/tests/
assertEquals(response.status, 200);
assertEquals(response.statusText, "OK");
const body = await response.text();
- assert(body.includes("<title>Directory listing for /tests/</title>"));
+ assert(body.includes("<title>Directory listing for /cli/tests/</title>"));
});
// The feature below is not implemented, but the test should work after implementation
@@ -165,7 +165,7 @@ testPerm({ net: true }, async function fetchWithRelativeRedirection(): Promise<
testPerm({ net: true }, async function fetchWithInfRedirection(): Promise<
void
> {
- const response = await fetch("http://localhost:4549/tests"); // will redirect to the same place
+ const response = await fetch("http://localhost:4549/cli/tests"); // will redirect to the same place
assertEquals(response.status, 0); // network error
});
*/
diff --git a/cli/js/files_test.ts b/cli/js/files_test.ts
index fca9a3859..8f4beb085 100644
--- a/cli/js/files_test.ts
+++ b/cli/js/files_test.ts
@@ -24,7 +24,7 @@ testPerm({ read: true }, async function filesCopyToStdout(): Promise<void> {
});
testPerm({ read: true }, async function filesToAsyncIterator(): Promise<void> {
- const filename = "tests/hello.txt";
+ const filename = "cli/tests/hello.txt";
const file = await Deno.open(filename);
let totalSize = 0;
@@ -297,7 +297,7 @@ testPerm(
);
testPerm({ read: true }, async function seekStart(): Promise<void> {
- const filename = "tests/hello.txt";
+ const filename = "cli/tests/hello.txt";
const file = await Deno.open(filename);
// Deliberately move 1 step forward
await file.read(new Uint8Array(1)); // "H"
@@ -310,7 +310,7 @@ testPerm({ read: true }, async function seekStart(): Promise<void> {
});
testPerm({ read: true }, function seekSyncStart(): void {
- const filename = "tests/hello.txt";
+ const filename = "cli/tests/hello.txt";
const file = Deno.openSync(filename);
// Deliberately move 1 step forward
file.readSync(new Uint8Array(1)); // "H"
@@ -323,7 +323,7 @@ testPerm({ read: true }, function seekSyncStart(): void {
});
testPerm({ read: true }, async function seekCurrent(): Promise<void> {
- const filename = "tests/hello.txt";
+ const filename = "cli/tests/hello.txt";
const file = await Deno.open(filename);
// Deliberately move 1 step forward
await file.read(new Uint8Array(1)); // "H"
@@ -336,7 +336,7 @@ testPerm({ read: true }, async function seekCurrent(): Promise<void> {
});
testPerm({ read: true }, function seekSyncCurrent(): void {
- const filename = "tests/hello.txt";
+ const filename = "cli/tests/hello.txt";
const file = Deno.openSync(filename);
// Deliberately move 1 step forward
file.readSync(new Uint8Array(1)); // "H"
@@ -349,7 +349,7 @@ testPerm({ read: true }, function seekSyncCurrent(): void {
});
testPerm({ read: true }, async function seekEnd(): Promise<void> {
- const filename = "tests/hello.txt";
+ const filename = "cli/tests/hello.txt";
const file = await Deno.open(filename);
await file.seek(-6, Deno.SeekMode.SEEK_END);
const buf = new Uint8Array(6);
@@ -359,7 +359,7 @@ testPerm({ read: true }, async function seekEnd(): Promise<void> {
});
testPerm({ read: true }, function seekSyncEnd(): void {
- const filename = "tests/hello.txt";
+ const filename = "cli/tests/hello.txt";
const file = Deno.openSync(filename);
file.seekSync(-6, Deno.SeekMode.SEEK_END);
const buf = new Uint8Array(6);
@@ -369,7 +369,7 @@ testPerm({ read: true }, function seekSyncEnd(): void {
});
testPerm({ read: true }, async function seekMode(): Promise<void> {
- const filename = "tests/hello.txt";
+ const filename = "cli/tests/hello.txt";
const file = await Deno.open(filename);
let err;
try {
diff --git a/cli/js/read_dir_test.ts b/cli/js/read_dir_test.ts
index 8cc66caee..77d2cbfe2 100644
--- a/cli/js/read_dir_test.ts
+++ b/cli/js/read_dir_test.ts
@@ -13,7 +13,7 @@ function assertSameContent(files: FileInfo[]): void {
}
if (file.name === "002_hello.ts") {
- assertEquals(file.mode!, Deno.statSync(`tests/${file.name}`).mode!);
+ assertEquals(file.mode!, Deno.statSync(`cli/tests/${file.name}`).mode!);
counter++;
}
}
@@ -22,7 +22,7 @@ function assertSameContent(files: FileInfo[]): void {
}
testPerm({ read: true }, function readDirSyncSuccess(): void {
- const files = Deno.readDirSync("tests/");
+ const files = Deno.readDirSync("cli/tests/");
assertSameContent(files);
});
@@ -67,7 +67,7 @@ testPerm({ read: true }, function readDirSyncNotFound(): void {
});
testPerm({ read: true }, async function readDirSuccess(): Promise<void> {
- const files = await Deno.readDir("tests/");
+ const files = await Deno.readDir("cli/tests/");
assertSameContent(files);
});
diff --git a/cli/js/resources_test.ts b/cli/js/resources_test.ts
index 880727027..367b66217 100644
--- a/cli/js/resources_test.ts
+++ b/cli/js/resources_test.ts
@@ -31,7 +31,7 @@ testPerm({ net: true }, async function resourcesNet(): Promise<void> {
testPerm({ read: true }, async function resourcesFile(): Promise<void> {
const resourcesBefore = Deno.resources();
- await Deno.open("tests/hello.txt");
+ await Deno.open("cli/tests/hello.txt");
const resourcesAfter = Deno.resources();
// check that exactly one new resource (file) was added
diff --git a/cli/js/stat_test.ts b/cli/js/stat_test.ts
index 7b4f06114..9b03c0ece 100644
--- a/cli/js/stat_test.ts
+++ b/cli/js/stat_test.ts
@@ -12,7 +12,7 @@ testPerm({ read: true }, async function statSyncSuccess(): Promise<void> {
assert(modulesInfo.isDirectory());
assert(!modulesInfo.isSymlink());
- const testsInfo = Deno.statSync("tests");
+ const testsInfo = Deno.statSync("cli/tests");
assert(testsInfo.isDirectory());
assert(!testsInfo.isSymlink());
});
@@ -96,7 +96,7 @@ testPerm({ read: true }, async function statSuccess(): Promise<void> {
assert(modulesInfo.isDirectory());
assert(!modulesInfo.isSymlink());
- const i = await Deno.stat("tests");
+ const i = await Deno.stat("cli/tests");
assert(i.isDirectory());
assert(!i.isSymlink());
});
diff --git a/cli/source_maps.rs b/cli/source_maps.rs
index e326c644e..6b177cc69 100644
--- a/cli/source_maps.rs
+++ b/cli/source_maps.rs
@@ -436,12 +436,12 @@ mod tests {
#[test]
fn source_map_from_json() {
- let json = r#"{"version":3,"file":"error_001.js","sourceRoot":"","sources":["file:///Users/rld/src/deno/tests/error_001.ts"],"names":[],"mappings":"AAAA,SAAS,GAAG;IACV,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;AACrB,CAAC;AAED,SAAS,GAAG;IACV,GAAG,EAAE,CAAC;AACR,CAAC;AAED,GAAG,EAAE,CAAC"}"#;
+ let json = r#"{"version":3,"file":"error_001.js","sourceRoot":"","sources":["file:///Users/rld/src/deno/cli/tests/error_001.ts"],"names":[],"mappings":"AAAA,SAAS,GAAG;IACV,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;AACrB,CAAC;AAED,SAAS,GAAG;IACV,GAAG,EAAE,CAAC;AACR,CAAC;AAED,GAAG,EAAE,CAAC"}"#;
let sm = SourceMap::from_json(json).unwrap();
assert_eq!(sm.sources.len(), 1);
assert_eq!(
sm.sources[0],
- "file:///Users/rld/src/deno/tests/error_001.ts"
+ "file:///Users/rld/src/deno/cli/tests/error_001.ts"
);
let mapping = sm
.mappings
diff --git a/cli/tests/README.md b/cli/tests/README.md
index fe9071926..831d2750f 100644
--- a/cli/tests/README.md
+++ b/cli/tests/README.md
@@ -1,7 +1,3 @@
# Integration Tests
This path contains integration tests. See integration_tests.rs for the index.
-
-TODO(ry) Currently //tests is a symlink to //cli/tests, to simplify transition.
-In the future the symlink should be removed when all the many references have
-been updated to the new path.
diff --git a/cli/tests/error_003_typescript.ts.out b/cli/tests/error_003_typescript.ts.out
index ee93bc877..b5854c20f 100644
--- a/cli/tests/error_003_typescript.ts.out
+++ b/cli/tests/error_003_typescript.ts.out
@@ -2,7 +2,7 @@
The types of 'a.b.c().d' are incompatible between these types.
Type 'number' is not assignable to type 'string'.
-[WILDCARD]/tests/error_003_typescript.ts:20:1
+[WILDCARD]/cli/tests/error_003_typescript.ts:20:1
20 x = y;
^
diff --git a/cli/tests/error_015_dynamic_import_permissions.js b/cli/tests/error_015_dynamic_import_permissions.js
index 3460ca787..197339c5e 100644
--- a/cli/tests/error_015_dynamic_import_permissions.js
+++ b/cli/tests/error_015_dynamic_import_permissions.js
@@ -1,3 +1,3 @@
(async () => {
- await import("http://localhost:4545/tests/subdir/mod4.js");
+ await import("http://localhost:4545/cli/tests/subdir/mod4.js");
})();
diff --git a/cli/tests/error_015_dynamic_import_permissions.out b/cli/tests/error_015_dynamic_import_permissions.out
index dcc913e2b..7078ac61c 100644
--- a/cli/tests/error_015_dynamic_import_permissions.out
+++ b/cli/tests/error_015_dynamic_import_permissions.out
@@ -1 +1 @@
-error: Uncaught TypeError: network access to "http://localhost:4545/tests/subdir/mod4.js", run again with the --allow-net flag
+error: Uncaught TypeError: network access to "http://localhost:4545/cli/tests/subdir/mod4.js", run again with the --allow-net flag
diff --git a/cli/tests/error_016_dynamic_import_permissions2.js b/cli/tests/error_016_dynamic_import_permissions2.js
index 71c70815c..34e1a43d2 100644
--- a/cli/tests/error_016_dynamic_import_permissions2.js
+++ b/cli/tests/error_016_dynamic_import_permissions2.js
@@ -1,5 +1,5 @@
// If this is executed with --allow-net but not --allow-read the following
// import should cause a permission denied error.
(async () => {
- await import("http://localhost:4545/tests/subdir/evil_remote_import.js");
+ await import("http://localhost:4545/cli/tests/subdir/evil_remote_import.js");
})();
diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs
index b7dfc4e35..d4cd57e09 100644
--- a/cli/tests/integration_tests.rs
+++ b/cli/tests/integration_tests.rs
@@ -131,7 +131,7 @@ fn installer_test_remote_module_run() {
DenoFlags::default(),
Some(temp_dir.path().to_string_lossy().to_string()),
"echo_test",
- "http://localhost:4545/tests/echo.ts",
+ "http://localhost:4545/cli/tests/echo.ts",
vec!["hello".to_string()],
)
.expect("Failed to install");
diff --git a/cli/worker.rs b/cli/worker.rs
index 84841c4c5..6fb235ceb 100644
--- a/cli/worker.rs
+++ b/cli/worker.rs
@@ -264,7 +264,7 @@ mod tests {
let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.parent()
.unwrap()
- .join("tests/esm_imports_a.js");
+ .join("cli/tests/esm_imports_a.js");
let module_specifier =
ModuleSpecifier::resolve_url_or_path(&p.to_string_lossy()).unwrap();
let global_state = ThreadSafeGlobalState::new(
@@ -436,7 +436,7 @@ mod tests {
let p = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.parent()
.unwrap()
- .join("tests/002_hello.ts");
+ .join("cli/tests/002_hello.ts");
let module_specifier =
ModuleSpecifier::resolve_url_or_path(&p.to_string_lossy()).unwrap();
let result =
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 09:26:35 +0000