summaryrefslogtreecommitdiff
path: root/test_util/src/lib.rs
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2022-08-26 09:17:48 -0400
committerGitHub <noreply@github.com>2022-08-26 09:17:48 -0400
commitf583a7ebf4f7c4ef21061fba802f80fd2d5299e7 (patch)
tree932cbbd35ee2787e62150238ab6aa391708a1086 /test_util/src/lib.rs
parentf35900eb5b44869626e9e4f3fbc6d0fe268d2b56 (diff)
chore(npm): add test for esm npm binary package (#15609)
Diffstat (limited to 'test_util/src/lib.rs')
-rw-r--r--test_util/src/lib.rs13
1 files changed, 6 insertions, 7 deletions
diff --git a/test_util/src/lib.rs b/test_util/src/lib.rs
index af4c814c4..bf81e01a6 100644
--- a/test_util/src/lib.rs
+++ b/test_util/src/lib.rs
@@ -14,7 +14,7 @@ use hyper::Request;
use hyper::Response;
use hyper::StatusCode;
use lazy_static::lazy_static;
-use npm::custom_npm_cache;
+use npm::CUSTOM_NPM_PACKAGE_CACHE;
use os_pipe::pipe;
use pretty_assertions::assert_eq;
use regex::Regex;
@@ -1009,19 +1009,18 @@ fn handle_custom_npm_registry_path(
.split('/')
.filter(|p| !p.is_empty())
.collect::<Vec<_>>();
- let cache = custom_npm_cache()?;
+ let cache = &CUSTOM_NPM_PACKAGE_CACHE;
let package_name = format!("@denotest/{}", parts[0]);
if parts.len() == 2 {
if let Some(file_bytes) =
- cache.tarball_bytes(&package_name, parts[1].trim_end_matches(".tgz"))
+ cache.tarball_bytes(&package_name, parts[1].trim_end_matches(".tgz"))?
{
- let file_resp = custom_headers("file.tgz", file_bytes.to_owned());
+ let file_resp = custom_headers("file.tgz", file_bytes);
return Ok(Some(file_resp));
}
} else if parts.len() == 1 {
- if let Some(registry_file) = cache.registry_file(&package_name) {
- let file_resp =
- custom_headers("registry.json", registry_file.as_bytes().to_vec());
+ if let Some(registry_file) = cache.registry_file(&package_name)? {
+ let file_resp = custom_headers("registry.json", registry_file);
return Ok(Some(file_resp));
}
}