Extract a function for requesting the category list

Author: carols10cents

src/tests/all.rs

@@ -21,7 +21,10 @@ use cargo_registry::{
     models::{Crate, CrateOwner, Dependency, NewCategory, NewTeam, NewUser, Team, User, Version},
     schema::crate_owners,
     util::CargoResult,
-    views::{EncodableCrate, EncodableKeyword, EncodableOwner, EncodableVersion, GoodCrate},
+    views::{
+        EncodableCategory, EncodableCrate, EncodableKeyword, EncodableOwner, EncodableVersion,
+        GoodCrate,
+    },
     App, Config, Env, Replica, Uploader,
 };
 use std::{
@@ -114,6 +117,15 @@ pub struct OwnersResponse {
     users: Vec<EncodableOwner>,
 }
 #[derive(Deserialize)]
+pub struct CategoryListResponse {
+    categories: Vec<EncodableCategory>,
+    meta: CategoryMeta,
+}
+#[derive(Deserialize)]
+pub struct CategoryMeta {
+    total: i32,
+}
+#[derive(Deserialize)]
 pub struct OkBool {
     ok: bool,
 }

src/tests/category.rs

@@ -27,10 +27,9 @@ struct CategoryWithSubcategories {
 #[test]
 fn index() {
     let (app, anon) = TestApp::init().empty();
-    let url = "/api/v1/categories";
 
     // List 0 categories if none exist
-    let json: CategoryList = anon.get(url).good();
+    let json = anon.show_category_list();
     assert_eq!(json.categories.len(), 0);
     assert_eq!(json.meta.total, 0);
 
@@ -45,7 +44,7 @@ fn index() {
     });
 
     // Only the top-level categories should be on the page
-    let json: CategoryList = anon.get(url).good();
+    let json = anon.show_category_list();
     assert_eq!(json.categories.len(), 1);
     assert_eq!(json.meta.total, 1);
     assert_eq!(json.categories[0].category, "foo");

src/tests/util.rs

@@ -20,7 +20,7 @@
 //! to the underlying database model value (`User` and `ApiToken` respectively).
 
 use crate::{
-    builders::PublishBuilder, record, CrateList, CrateResponse, GoodCrate,
+    builders::PublishBuilder, record, CategoryListResponse, CrateList, CrateResponse, GoodCrate,
     OkBool, OwnersResponse, VersionResponse,
 };
 use cargo_registry::{
@@ -394,6 +394,11 @@ pub trait RequestHelper {
         let url = format!("/api/v1/crates/{}/{}", krate_name, version);
         self.get(&url).good()
     }
+
+    fn show_category_list(&self) -> CategoryListResponse {
+        let url = "/api/v1/categories";
+        self.get(url).good()
+    }
 }
 
 /// A type that can generate unauthenticated requests