tests/util: Adjust add/remove_owner() fns return type

Author: Turbo87

src/tests/mod.rs

@@ -86,6 +86,13 @@ pub struct OkBool {
     ok: bool,
 }
 
+#[derive(Deserialize, Debug)]
+pub struct OwnerResp {
+    // server must include `ok: true` to support old cargo clients
+    ok: bool,
+    msg: String,
+}
+
 fn new_user(login: &str) -> NewUser<'_> {
     NewUser {
         gh_id: next_gh_id(),

src/tests/routes/crates/owners/add.rs

@@ -2,6 +2,7 @@ use crate::models::token::{CrateScope, EndpointScope};
 use crate::tests::builders::CrateBuilder;
 use crate::tests::owners::expire_invitation;
 use crate::tests::util::{RequestHelper, TestApp};
+use crate::tests::OwnerResp;
 use http::StatusCode;
 use insta::assert_snapshot;
 
@@ -20,12 +21,6 @@ async fn test_cargo_invite_owners() {
     struct OwnerReq {
         owners: Option<Vec<String>>,
     }
-    #[derive(Deserialize, Debug)]
-    struct OwnerResp {
-        // server must include `ok: true` to support old cargo clients
-        ok: bool,
-        msg: String,
-    }
 
     let body = serde_json::to_string(&OwnerReq {
         owners: Some(vec![new_user.as_model().gh_login.clone()]),

src/tests/util.rs

@@ -22,7 +22,7 @@
 use crate::middleware::session;
 use crate::models::{ApiToken, CreatedApiToken, User};
 use crate::tests::{
-    CategoryListResponse, CategoryResponse, CrateList, CrateResponse, GoodCrate, OkBool,
+    CategoryListResponse, CategoryResponse, CrateList, CrateResponse, GoodCrate, OwnerResp,
     OwnersResponse, VersionResponse,
 };
 
@@ -223,7 +223,7 @@ pub trait RequestHelper {
     }
 
     /// Add to the specified crate the specified owners.
-    async fn add_named_owners<T>(&self, krate_name: &str, owners: &[T]) -> Response<OkBool>
+    async fn add_named_owners<T>(&self, krate_name: &str, owners: &[T]) -> Response<OwnerResp>
     where
         T: serde::Serialize,
     {
@@ -233,19 +233,19 @@ pub trait RequestHelper {
     }
 
     /// Add a single owner to the specified crate.
-    async fn add_named_owner(&self, krate_name: &str, owner: &str) -> Response<OkBool> {
+    async fn add_named_owner(&self, krate_name: &str, owner: &str) -> Response<OwnerResp> {
         self.add_named_owners(krate_name, &[owner]).await
     }
 
     /// Remove from the specified crate the specified owners.
-    async fn remove_named_owners(&self, krate_name: &str, owners: &[&str]) -> Response<OkBool> {
+    async fn remove_named_owners(&self, krate_name: &str, owners: &[&str]) -> Response<OwnerResp> {
         let url = format!("/api/v1/crates/{krate_name}/owners");
         let body = json!({ "owners": owners }).to_string();
         self.delete_with_body(&url, body).await
     }
 
     /// Remove a single owner to the specified crate.
-    async fn remove_named_owner(&self, krate_name: &str, owner: &str) -> Response<OkBool> {
+    async fn remove_named_owner(&self, krate_name: &str, owner: &str) -> Response<OwnerResp> {
         self.remove_named_owners(krate_name, &[owner]).await
     }
 }