diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2021-08-11 10:20:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 10:20:47 -0400 |
| commit | 15a763152f9d392cb80692262f8de5ef8ae15495 (patch) | |
| tree | fcd1a59777f95920bf3502519983d6cc0d882a9a /cli/specifier_handler.rs | |
| parent | a0285e2eb88f6254f6494b0ecd1878db3a3b2a58 (diff) | |
chore: move test files to testdata directory (#11601)
Diffstat (limited to 'cli/specifier_handler.rs')
| -rw-r--r-- | cli/specifier_handler.rs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cli/specifier_handler.rs b/cli/specifier_handler.rs index ddc3adc7e..cd785f015 100644 --- a/cli/specifier_handler.rs +++ b/cli/specifier_handler.rs @@ -572,7 +572,6 @@ pub mod tests { use crate::http_cache::HttpCache; use deno_core::resolve_url_or_path; use deno_runtime::deno_web::BlobStore; - use std::env; use tempfile::TempDir; macro_rules! map ( @@ -618,8 +617,7 @@ pub mod tests { let _http_server_guard = test_util::http_server(); let (_, mut file_fetcher) = setup(); let specifier = - resolve_url_or_path("http://localhost:4545/cli/tests/subdir/mod2.ts") - .unwrap(); + resolve_url_or_path("http://localhost:4545/subdir/mod2.ts").unwrap(); let cached_module: CachedModule = file_fetcher .fetch(specifier.clone(), None, false) .await @@ -639,8 +637,7 @@ pub mod tests { let _http_server_guard = test_util::http_server(); let (_, mut file_fetcher) = setup(); let specifier = - resolve_url_or_path("http://localhost:4545/cli/tests/subdir/mod2.ts") - .unwrap(); + resolve_url_or_path("http://localhost:4545/subdir/mod2.ts").unwrap(); let cached_module: CachedModule = file_fetcher .fetch(specifier.clone(), None, false) .await @@ -665,14 +662,16 @@ pub mod tests { let _http_server_guard = test_util::http_server(); let (_, mut file_fetcher) = setup(); let specifier = - resolve_url_or_path("http://localhost:4545/cli/tests/subdir/mod2.ts") - .unwrap(); + resolve_url_or_path("http://localhost:4545/subdir/mod2.ts").unwrap(); let cached_module: CachedModule = file_fetcher.fetch(specifier, None, false).await.unwrap(); assert!(cached_module.is_remote); - let c = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap()); let specifier = resolve_url_or_path( - c.join("tests/subdir/mod1.ts").as_os_str().to_str().unwrap(), + test_util::testdata_path() + .join("subdir/mod1.ts") + .as_os_str() + .to_str() + .unwrap(), ) .unwrap(); let cached_module: CachedModule = |