update to httpmock 0.8 (#1303)

Author: ahl

Cargo.lock

@@ -30,7 +30,7 @@ env_logger = "0.11.8"
 expectorate = { version = "1.2.0", features = ["predicates"] }
 flume = "0.12.0"
 futures = "0.3.31"
-httpmock = "0.7.0"
+httpmock = "0.8.2"
 humantime = "2.3.0"
 indicatif = "0.18.3"
 libc = "0.2.178"

Cargo.toml

@@ -51,7 +51,7 @@ fn test_simple_api_call() {
         .success()
         .stdout(predicate::str::diff("{\n  \"a\": \"b\"\n}\n"));
 
-    mock.assert_hits(2);
+    mock.assert_calls(2);
 }
 
 #[derive(Serialize)]

cli/tests/test_api.rs

@@ -82,10 +82,10 @@ impl<'a> MockOAuth<'a> {
         self.me.assert();
     }
 
-    fn assert_hits(&self, hits: usize) {
-        self.device_auth.assert_hits(hits);
-        self.device_token.assert_hits(hits);
-        self.me.assert_hits(hits);
+    fn assert_calls(&self, hits: usize) {
+        self.device_auth.assert_calls(hits);
+        self.device_token.assert_calls(hits);
+        self.me.assert_calls(hits);
     }
 }
 
@@ -394,7 +394,7 @@ fn test_auth_login_double() {
         &scrub_server(stdout.to_string(), server.url("")),
     );
 
-    mock.assert_hits(2);
+    mock.assert_calls(2);
 
     assert_contents(
         "tests/data/test_auth_double_credentials.toml",
@@ -516,7 +516,7 @@ fn test_cmd_auth_status() {
         .success()
         .stdout(str::is_empty());
 
-    ok.assert_hits(2);
+    ok.assert_calls(2);
     bad.assert();
 }
 
@@ -594,7 +594,7 @@ fn test_cmd_auth_status_env() {
         .failure()
         .stderr(format!("{}\n", oxide::OxideAuthError::HostProfileConflict));
 
-    oxide_mock.assert_hits(2);
+    oxide_mock.assert_calls(2);
 
     let oxide_mock = server.current_user_view(|when, then| {
         when.into_inner()

cli/tests/test_auth.rs

@@ -157,7 +157,7 @@ fn test_disk_import() {
 
     disk_create_mock.assert();
     start_bulk_write_mock.assert();
-    disk_bulk_write_mock.assert_hits(2);
+    disk_bulk_write_mock.assert_calls(2);
     stop_bulk_write_mock.assert();
     finalize_mock.assert();
 }
@@ -466,7 +466,7 @@ fn test_disk_create_fail() {
         .assert()
         .failure();
 
-    disk_view_mock.assert_hits(2);
+    disk_view_mock.assert_calls(2);
     disk_create_mock.assert();
 }
 
@@ -593,10 +593,10 @@ fn test_disk_write_import_fail() {
         .failure()
         .stderr(predicate::str::is_match(output).unwrap());
 
-    disk_view_mock.assert_hits(2);
+    disk_view_mock.assert_calls(2);
     disk_create_mock.assert();
     start_bulk_write_mock.assert();
-    disk_bulk_write_mock.assert_hits(2);
+    disk_bulk_write_mock.assert_calls(2);
 }
 
 // Test for required parameters being supplied

cli/tests/test_disk_import.rs

@@ -313,7 +313,7 @@ fn test_port_config() {
     mock_ports.assert();
     mock_lots.assert();
     mock_lot_blocks.assert();
-    mock_bgp_configs.assert_hits(2);
+    mock_bgp_configs.assert_calls(2);
     mock_switch0_qsfp0_settings_view.assert();
     mock_switch1_qsfp0_settings_view.assert();
 }

cli/tests/test_net.rs

@@ -90,7 +90,7 @@ fn test_project_list_paginated() {
     mock_p1.assert();
     mock_p2.assert();
     // Because we hit the limit, we should not fetch the final page.
-    mock_p3.assert_hits(0);
+    mock_p3.assert_calls(0);
 }
 
 #[test]

cli/tests/test_projects.rs

@@ -113,7 +113,7 @@ async fn test_disk_import() {
     // Assert this endpoint before the next request to avoid defining an
     // expectation for whether this call should be made upon immediate
     // cancellation.
-    disk_view_mock.assert_hits(2);
+    disk_view_mock.assert_calls(2);
 
     let (fut_to_cancel, handle) = client
         .disk_import()
@@ -133,9 +133,9 @@ async fn test_disk_import() {
     );
 
     // No calls received for the cancelled request.
-    disk_create_mock.assert_hits(2);
-    start_bulk_write_mock.assert_hits(2);
-    disk_bulk_write_mock.assert_hits(2);
-    stop_bulk_write_mock.assert_hits(2);
-    finalize_mock.assert_hits(2);
+    disk_create_mock.assert_calls(2);
+    start_bulk_write_mock.assert_calls(2);
+    disk_bulk_write_mock.assert_calls(2);
+    stop_bulk_write_mock.assert_calls(2);
+    finalize_mock.assert_calls(2);
 }