foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 07:14:47 -05:00
Code Issues Packages 1 Wiki Activity

Clean up some fetch_remote_source tets (#6446)

Browse source
This commit is contained in:
Ryan Dahl 2020-06-24 14:12:04 -04:00 committed by GitHub
parent 3cbd1075c7
commit 0620862605
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
cli/file_fetcher.rs
View file

@ -1380,25 +1380,14 @@ mod tests {
} }
#[tokio::test] #[tokio::test]
async fn test_fetch_source_2() { async fn fetch_remote_source_no_ext() {
let http_server_guard = test_util::http_server(); let g = test_util::http_server();
let (_temp_dir, fetcher) = test_setup(); let (_temp_dir, fetcher) = test_setup();
let fetcher_1 = fetcher.clone();
let fetcher_2 = fetcher.clone();
let module_url = let module_url =
Url::parse("http://localhost:4545/cli/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/cli/tests/subdir/mismatch_ext.ts")
.unwrap();
let module_url_2_ = module_url_2.clone();
let module_url_3 =
Url::parse("http://localhost:4545/cli/tests/subdir/unknown_ext.deno")
.unwrap();
let module_url_3_ = module_url_3.clone();
let result = fetcher let result = fetcher
.fetch_remote_source( .fetch_remote_source(
&module_url, module_url,
false, false,
false, false,
10, 10,
@ -1409,11 +1398,21 @@ mod tests {
let r = result.unwrap(); let r = result.unwrap();
assert_eq!(r.source_code, b"export const loaded = true;\n"); assert_eq!(r.source_code, b"export const loaded = true;\n");
assert_eq!(&(r.media_type), &msg::MediaType::TypeScript); assert_eq!(&(r.media_type), &msg::MediaType::TypeScript);
let (_, headers) = fetcher.http_cache.get(&module_url).unwrap(); let (_, headers) = fetcher.http_cache.get(module_url).unwrap();
assert_eq!(headers.get("content-type").unwrap(), "text/typescript"); assert_eq!(headers.get("content-type").unwrap(), "text/typescript");
let result = fetcher_1 drop(g)
}
#[tokio::test]
async fn fetch_remote_source_mismatch_ext() {
let g = test_util::http_server();
let (_temp_dir, fetcher) = test_setup();
let module_url =
&Url::parse("http://localhost:4545/cli/tests/subdir/mismatch_ext.ts")
.unwrap();
let result = fetcher
.fetch_remote_source( .fetch_remote_source(
&module_url_2, module_url,
false, false,
false, false,
10, 10,
@ -1424,13 +1423,21 @@ mod tests {
let r2 = result.unwrap(); let r2 = result.unwrap();
assert_eq!(r2.source_code, b"export const loaded = true;\n"); assert_eq!(r2.source_code, b"export const loaded = true;\n");
assert_eq!(&(r2.media_type), &msg::MediaType::JavaScript); assert_eq!(&(r2.media_type), &msg::MediaType::JavaScript);
let (_, headers) = fetcher.http_cache.get(&module_url_2_).unwrap(); let (_, headers) = fetcher.http_cache.get(module_url).unwrap();
assert_eq!(headers.get("content-type").unwrap(), "text/javascript"); assert_eq!(headers.get("content-type").unwrap(), "text/javascript");
drop(g);
}
// test unknown extension #[tokio::test]
let result = fetcher_2 async fn fetch_remote_source_unknown_ext() {
let g = test_util::http_server();
let (_temp_dir, fetcher) = test_setup();
let module_url =
&Url::parse("http://localhost:4545/cli/tests/subdir/unknown_ext.deno")
.unwrap();
let result = fetcher
.fetch_remote_source( .fetch_remote_source(
&module_url_3, module_url,
false, false,
false, false,
10, 10,
@ -1441,10 +1448,9 @@ mod tests {
let r3 = result.unwrap(); let r3 = result.unwrap();
assert_eq!(r3.source_code, b"export const loaded = true;\n"); assert_eq!(r3.source_code, b"export const loaded = true;\n");
assert_eq!(&(r3.media_type), &msg::MediaType::TypeScript); assert_eq!(&(r3.media_type), &msg::MediaType::TypeScript);
let (_, headers) = fetcher.http_cache.get(&module_url_3_).unwrap(); let (_, headers) = fetcher.http_cache.get(module_url).unwrap();
assert_eq!(headers.get("content-type").unwrap(), "text/typescript"); assert_eq!(headers.get("content-type").unwrap(), "text/typescript");
drop(g);
drop(http_server_guard);
} }
#[tokio::test] #[tokio::test]