Skip to content

Commit 4fae32a

Browse files
jpraynaudjpraynaud
committed
fix: error when upgrading 'http_mock' from '0.7' to '0.8'
1 parent a0f1030 commit 4fae32a

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

‎mithril-client-cli/src/utils/github_release_retriever/reqwest.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ mod tests {
175175
let server = MockServer::start();
176176
let _mock = server.mock(|when, then| {
177177
when.method(GET).path("/endpoint");
178-
then.status(StatusCode::INTERNAL_SERVER_ERROR.into());
178+
then.status(StatusCode::INTERNAL_SERVER_ERROR.as_u16());
179179
});
180180
let client = ReqwestGitHubApiClient::new(None).unwrap();
181181

‎mithril-client/src/aggregator_client.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -825,16 +825,16 @@ mod tests {
825825
let (aggregator, client) = setup_server_and_client();
826826
aggregator.mock(|when, then| {
827827
when.matches(|req| {
828-
let headers = req.headers.clone().expect("HTTP headers not found");
828+
let headers = req.headers();
829829
let accept_encoding_header = headers
830830
.iter()
831-
.find(|(name, _values)| name.to_lowercase() == "accept-encoding")
831+
.find(|(name, _values)| name.to_string().to_lowercase() == "accept-encoding")
832832
.expect("Accept-Encoding header not found");
833833

834834
let header_value = accept_encoding_header.clone().1;
835835
["gzip", "br", "deflate", "zstd"]
836836
.iter()
837-
.all(|&value| header_value.contains(value))
837+
.all(|&value| header_value.to_str().unwrap().contains(value))
838838
});
839839

840840
then.status(200).body("ok");
@@ -853,16 +853,16 @@ mod tests {
853853
let (aggregator, client) = setup_server_and_client_with_custom_headers(http_headers);
854854
aggregator.mock(|when, then| {
855855
when.matches(|req| {
856-
let headers = req.headers.clone().expect("HTTP headers not found");
856+
let headers = req.headers();
857857
let accept_encoding_header = headers
858858
.iter()
859-
.find(|(name, _values)| name.to_lowercase() == "accept-encoding")
859+
.find(|(name, _values)| name.to_string().to_lowercase() == "accept-encoding")
860860
.expect("Accept-Encoding header not found");
861861

862862
let header_value = accept_encoding_header.clone().1;
863863
["gzip", "br", "deflate", "zstd"]
864864
.iter()
865-
.all(|&value| header_value.contains(value))
865+
.all(|&value| header_value.to_str().unwrap().contains(value))
866866
});
867867

868868
then.status(200).body("ok");

‎mithril-relay/src/relay/aggregator.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,17 +250,17 @@ mod tests {
250250
async fn sends_accept_encoding_header_with_correct_values() {
251251
let server = MockServer::start();
252252
let mock = server.mock(|when, then| {
253-
when.matches(|req| {
254-
let headers = req.headers.clone().expect("HTTP headers not found");
253+
when.is_true(|req| {
254+
let headers = req.headers();
255255
let accept_encoding_header = headers
256256
.iter()
257-
.find(|(name, _values)| name.to_lowercase() == "accept-encoding")
257+
.find(|(name, _values)| name.to_string().to_lowercase() == "accept-encoding")
258258
.expect("Accept-Encoding header not found");
259259

260260
let header_value = accept_encoding_header.clone().1;
261261
["gzip", "br", "deflate", "zstd"]
262262
.iter()
263-
.all(|&value| header_value.contains(value))
263+
.all(|&value| header_value.to_str().unwrap().contains(value))
264264
});
265265

266266
then.status(201).body("ok");

‎mithril-relay/src/relay/signer.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -552,17 +552,17 @@ mod tests {
552552
async fn sends_accept_encoding_header_with_correct_values() {
553553
let server = MockServer::start();
554554
let mock = server.mock(|when, then| {
555-
when.matches(|req| {
556-
let headers = req.headers.clone().expect("HTTP headers not found");
555+
when.is_true(|req| {
556+
let headers = req.headers();
557557
let accept_encoding_header = headers
558558
.iter()
559-
.find(|(name, _values)| name.to_lowercase() == "accept-encoding")
559+
.find(|(name, _values)| name.to_string().to_lowercase() == "accept-encoding")
560560
.expect("Accept-Encoding header not found");
561561

562562
let header_value = accept_encoding_header.clone().1;
563563
["gzip", "br", "deflate", "zstd"]
564564
.iter()
565-
.all(|&value| header_value.contains(value))
565+
.all(|&value| header_value.to_str().unwrap().contains(value))
566566
});
567567

568568
then.status(200).body("ok");
@@ -602,7 +602,7 @@ mod tests {
602602
let mock = server.mock(|when, then| {
603603
when.method(POST)
604604
.path("/register-signer")
605-
.body_contains(serde_json::to_string(&message).unwrap());
605+
.json_body_includes(serde_json::to_string(&message).unwrap());
606606
then.status(201).body("ok");
607607
});
608608

@@ -653,7 +653,7 @@ mod tests {
653653
let mock = server.mock(|when, then| {
654654
when.method(POST)
655655
.path("/register-signatures")
656-
.body_contains(serde_json::to_string(&message).unwrap());
656+
.json_body_includes(serde_json::to_string(&message).unwrap());
657657
then.status(201).body("ok");
658658
});
659659

‎mithril-signer/src/services/aggregator_client.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,17 +1022,17 @@ mod tests {
10221022
async fn test_sends_accept_encoding_header() {
10231023
let (server, client) = setup_server_and_client();
10241024
server.mock(|when, then| {
1025-
when.matches(|req| {
1026-
let headers = req.headers.clone().expect("HTTP headers not found");
1025+
when.is_true(|req| {
1026+
let headers = req.headers();
10271027
let accept_encoding_header = headers
10281028
.iter()
1029-
.find(|(name, _values)| name.to_lowercase() == "accept-encoding")
1029+
.find(|(name, _values)| name.to_string().to_lowercase() == "accept-encoding")
10301030
.expect("Accept-Encoding header not found");
10311031

10321032
let header_value = accept_encoding_header.clone().1;
10331033
["gzip", "br", "deflate", "zstd"]
10341034
.iter()
1035-
.all(|&value| header_value.contains(value))
1035+
.all(|&value| header_value.to_str().unwrap().contains(value))
10361036
});
10371037

10381038
then.status(201);

0 commit comments

Comments
 (0)