Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,16 @@ fn make_request(
let mut parts = base.into_parts();
parts.path_and_query = Some(
match parts.path_and_query {
Some(path) => format!("{}{}", path, path_suffix).try_into(),
Some(path_and_query) => {
let mut path = path_and_query.path().to_owned();
if !path.ends_with('/') {
path.push('/');
}
path += path_suffix;

// Drop query parameters
path.try_into()
}
None => path_suffix.try_into(),
}
.expect("api_uri path"),
Expand Down
14 changes: 14 additions & 0 deletions src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1342,3 +1342,17 @@ async fn get_package_release_ok() {
}
)
}

#[test]
fn make_request_base_trailing_slash_is_optional() {
let slash = http::Uri::from_static("http://host/path/");
let no_slash = http::Uri::from_static("http://host/path");
let suffix = "suffix";
let expect = "/path/suffix";

let slash = make_request(slash, http::Method::GET, suffix, None);
assert_eq!(slash.uri_ref().unwrap().path(), expect);

let no_slash = make_request(no_slash, http::Method::GET, suffix, None);
assert_eq!(no_slash.uri_ref().unwrap().path(), expect);
}