Skip to content

update httpmock generation to support 0.8 #1264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahl merged 1 commit into from
Dec 26, 2025
Merged

update httpmock generation to support 0.8 #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions cargo-progenitor/tests/test_cmd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
// Copyright 2025 Oxide Computer Company

use assert_cmd::Command;

#[test]
fn test_help() {
Command::cargo_bin("cargo-progenitor")
.unwrap()
assert_cmd::cargo::cargo_bin_cmd!()
.arg("progenitor")
.arg("--help")
.assert()
Expand Down
22 changes: 2 additions & 20 deletions progenitor-impl/src/httpmock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,7 @@ impl Generator {
value.to_string(),
))
} else {
Self(self.0.matches(|req| {
req.query_params
.as_ref()
.and_then(|qs| {
qs.iter().find(
|(key, _)| key == #api_name)
})
.is_none()
}))
Self(self.0.query_param_missing(#api_name))
}
},
),
Expand All @@ -229,16 +221,7 @@ impl Generator {
value.to_string()
))
} else {
Self(self.0.matches(|req| {
req.headers
.as_ref()
.and_then(|hs| {
hs.iter().find(
|(key, _)| key == #api_name
)
})
.is_none()
}))
Self(self.0.header_missing(#api_name))
}
},
),
Expand All @@ -247,7 +230,6 @@ impl Generator {
true,
quote! {
Self(self.0.json_body_obj(value))

},
),
OperationParameterType::RawBody => match body_content_type {
Expand Down
21 changes: 3 additions & 18 deletions progenitor-impl/tests/output/src/buildomat_httpmock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,7 @@ pub mod operations {
if let Some(value) = value.into() {
Self(self.0.query_param("minseq", value.to_string()))
} else {
Self(self.0.matches(|req| {
req.query_params
.as_ref()
.and_then(|qs| qs.iter().find(|(key, _)| key == "minseq"))
.is_none()
}))
Self(self.0.query_param_missing("minseq"))
}
}
}
Expand Down Expand Up @@ -763,12 +758,7 @@ pub mod operations {
if let Some(value) = value.into() {
Self(self.0.query_param("id", value.to_string()))
} else {
Self(self.0.matches(|req| {
req.query_params
.as_ref()
.and_then(|qs| qs.iter().find(|(key, _)| key == "id"))
.is_none()
}))
Self(self.0.query_param_missing("id"))
}
}
}
Expand Down Expand Up @@ -814,12 +804,7 @@ pub mod operations {
if let Some(value) = value.into() {
Self(self.0.header("accept-language", value.to_string()))
} else {
Self(self.0.matches(|req| {
req.headers
.as_ref()
.and_then(|hs| hs.iter().find(|(key, _)| key == "accept-language"))
.is_none()
}))
Self(self.0.header_missing("accept-language"))
}
}
}
Expand Down
Loading