diff options
Diffstat (limited to 'tests/util')
| -rw-r--r-- | tests/util/server/src/npm.rs | 7 | ||||
| -rw-r--r-- | tests/util/server/src/servers/npm_registry.rs | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/util/server/src/npm.rs b/tests/util/server/src/npm.rs index e7d8d96ab..f1c341738 100644 --- a/tests/util/server/src/npm.rs +++ b/tests/util/server/src/npm.rs @@ -110,7 +110,12 @@ impl TestNpmRegistry { } pub fn package_url(&self, package_name: &str) -> String { - format!("http://{}/{}/", self.hostname, package_name) + let scheme = if self.hostname.starts_with("http://") { + "" + } else { + "http://" + }; + format!("{}{}/{}/", scheme, self.hostname, package_name) } fn get_package_property<TResult>( diff --git a/tests/util/server/src/servers/npm_registry.rs b/tests/util/server/src/servers/npm_registry.rs index 7e5547b5b..f19fa5d92 100644 --- a/tests/util/server/src/servers/npm_registry.rs +++ b/tests/util/server/src/servers/npm_registry.rs @@ -297,6 +297,7 @@ async fn download_npm_registry_file( testdata_file_path: &PathBuf, is_tarball: bool, ) -> Result<(), anyhow::Error> { + let uri_path = uri_path.trim_start_matches('/'); let url_parts = uri_path.split('/').collect::<Vec<_>>(); let package_name = if url_parts[0].starts_with('@') { url_parts.into_iter().take(2).collect::<Vec<_>>().join("/") |