Use insta snapshot rather than custom type+field assertion

Author: carols10cents

src/tests/mod.rs

@@ -85,22 +85,6 @@ pub struct OkBool {
     ok: bool,
 }
 #[derive(Deserialize, Debug)]
-pub struct AdminListResponse {
-    user_email: Option<String>,
-    user_email_verified: bool,
-    crates: Vec<AdminCrateInfo>,
-}
-#[derive(Deserialize, Debug)]
-pub struct AdminCrateInfo {
-    name: String,
-    description: Option<String>,
-    downloads: i64,
-    num_versions: usize,
-    yanked: bool,
-    default_version_num: String,
-    num_rev_deps: i64,
-}
-#[derive(Deserialize, Debug)]
 pub struct OwnerResp {
     // server must include `ok: true` to support old cargo clients
     ok: bool,

src/tests/routes/crates/admin.rs

@@ -7,20 +7,20 @@ use crate::{
 };
 use diesel::prelude::*;
 use diesel_async::RunQueryDsl;
-use insta::assert_snapshot;
+use insta::{assert_json_snapshot, assert_snapshot};
 
 #[tokio::test(flavor = "multi_thread")]
 async fn admin_list_by_a_non_admin_fails() {
     let (_app, anon, user) = TestApp::init().with_user().await;
 
-    let response = anon.admin_list("anything").await;
+    let response = anon.admin_list::<()>("anything").await;
     assert_snapshot!(response.status(), @"403 Forbidden");
     assert_snapshot!(
         response.text(),
         @r#"{"errors":[{"detail":"this action requires authentication"}]}"#
     );
 
-    let response = user.admin_list("anything").await;
+    let response = user.admin_list::<()>("anything").await;
     assert_snapshot!(response.status(), @"403 Forbidden");
     assert_snapshot!(
         response.text(),
@@ -65,29 +65,11 @@ async fn index_include_yanked() -> anyhow::Result<()> {
 
     // Include fully yanked (all versions were yanked) crates
     let username = &user.gh_login;
-    let json = admin.admin_list(username).await.good();
+    let response = admin.admin_list::<()>(username).await;
 
-    assert_eq!(json.user_email.unwrap(), "foo@example.com");
-    assert!(json.user_email_verified);
-    assert_eq!(json.crates.len(), 2);
-
-    let json_crate_0 = &json.crates[0];
-    assert_eq!(json_crate_0.name, "all_yanked");
-    assert!(json_crate_0.description.is_none());
-    assert_eq!(json_crate_0.downloads, 0);
-    assert_eq!(json_crate_0.num_versions, 2);
-    assert!(json_crate_0.yanked);
-    assert_eq!(json_crate_0.default_version_num, "2.0.0");
-    assert_eq!(json_crate_0.num_rev_deps, 0);
-
-    let json_crate_1 = &json.crates[1];
-    assert_eq!(json_crate_1.name, "unyanked");
-    assert_eq!(json_crate_1.description.as_ref().unwrap(), "My Fun Crate");
-    assert_eq!(json_crate_1.downloads, 536);
-    assert_eq!(json_crate_1.num_versions, 3);
-    assert!(!json_crate_1.yanked);
-    assert_eq!(json_crate_1.default_version_num, "1.0.0");
-    assert_eq!(json_crate_1.num_rev_deps, 1);
+    assert_json_snapshot!(response.json(), {
+        ".crates[].updated_at" => "[datetime]",
+    });
 
     Ok(())
 }

src/tests/routes/crates/snapshots/crates_io__tests__routes__crates__admin__index_include_yanked.snap

@@ -0,0 +1,35 @@
+---
+source: src/tests/routes/crates/admin.rs
+expression: response.json()
+snapshot_kind: text
+---
+{
+  "crates": [
+    {
+      "bin_names": null,
+      "crate_size": 0,
+      "default_version_num": "2.0.0",
+      "description": null,
+      "downloads": 0,
+      "name": "all_yanked",
+      "num_rev_deps": 0,
+      "num_versions": 2,
+      "updated_at": "[datetime]",
+      "yanked": true
+    },
+    {
+      "bin_names": null,
+      "crate_size": 0,
+      "default_version_num": "1.0.0",
+      "description": "My Fun Crate",
+      "downloads": 536,
+      "name": "unyanked",
+      "num_rev_deps": 1,
+      "num_versions": 3,
+      "updated_at": "[datetime]",
+      "yanked": false
+    }
+  ],
+  "user_email": "foo@example.com",
+  "user_email_verified": true
+}

src/tests/util.rs

@@ -21,8 +21,8 @@
 
 use crate::models::{ApiToken, User};
 use crate::tests::{
-    AdminListResponse, CategoryListResponse, CategoryResponse, CrateList, CrateResponse, GoodCrate,
-    OwnerResp, OwnersResponse, VersionResponse,
+    CategoryListResponse, CategoryResponse, CrateList, CrateResponse, GoodCrate, OwnerResp,
+    OwnersResponse, VersionResponse,
 };
 use std::future::Future;
 
@@ -187,7 +187,7 @@ pub trait RequestHelper {
     }
 
     /// Request the JSON used for the admin list page
-    async fn admin_list(&self, owner: &str) -> Response<AdminListResponse> {
+    async fn admin_list<T>(&self, owner: &str) -> Response<T> {
         let url = format!("/api/private/admin_list/{owner}");
         self.get(&url).await
     }