Move rfc3339 tests to the views module

jtgeibel · jtgeibel · commit 658b62f6ae14 · 2018-01-27T14:19:56.000-05:00
diff --git a/src/models/category.rs b/src/models/category.rs
@@ -158,14 +158,10 @@ impl<'a> NewCategory<'a> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use chrono::NaiveDate;
     use diesel::connection::SimpleConnection;
     use dotenv::dotenv;
-    use serde_json;
     use std::env;
 
-    use views::EncodableCategoryWithSubcategories;
-
     fn pg_connection() -> PgConnection {
         let _ = dotenv();
         let database_url =
@@ -294,42 +290,4 @@ mod tests {
         let expected = vec![("Cat 3".to_string(), 6), ("Cat 1".to_string(), 3)];
         assert_eq!(expected, categories);
     }
-
-    #[test]
-    fn category_dates_serializes_to_rfc3339() {
-        let cat = EncodableCategory {
-            id: "".to_string(),
-            category: "".to_string(),
-            slug: "".to_string(),
-            description: "".to_string(),
-            crates_cnt: 1,
-            created_at: NaiveDate::from_ymd(2017, 1, 6).and_hms(14, 23, 11),
-        };
-        let json = serde_json::to_string(&cat).unwrap();
-        assert!(
-            json.as_str()
-                .find(r#""created_at":"2017-01-06T14:23:11+00:00""#)
-                .is_some()
-        );
-    }
-
-    #[test]
-    fn category_with_sub_dates_serializes_to_rfc3339() {
-        let cat = EncodableCategoryWithSubcategories {
-            id: "".to_string(),
-            category: "".to_string(),
-            slug: "".to_string(),
-            description: "".to_string(),
-            crates_cnt: 1,
-            created_at: NaiveDate::from_ymd(2017, 1, 6).and_hms(14, 23, 11),
-            subcategories: vec![],
-        };
-        let json = serde_json::to_string(&cat).unwrap();
-        assert!(
-            json.as_str()
-                .find(r#""created_at":"2017-01-06T14:23:11+00:00""#)
-                .is_some()
-        );
-    }
-
 }
diff --git a/src/models/keyword.rs b/src/models/keyword.rs
@@ -97,11 +97,9 @@ impl Keyword {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use chrono::NaiveDate;
     use diesel;
     use diesel::connection::SimpleConnection;
     use dotenv::dotenv;
-    use serde_json;
     use std::env;
 
     fn pg_connection() -> PgConnection {
@@ -129,21 +127,4 @@ mod tests {
         assert_eq!(associated.len(), 1);
         assert_eq!(associated.first().unwrap().keyword, "no");
     }
-
-    #[test]
-    fn keyword_serializes_to_rfc3339() {
-        let key = EncodableKeyword {
-            id: "".to_string(),
-            keyword: "".to_string(),
-            created_at: NaiveDate::from_ymd(2017, 1, 6).and_hms(14, 23, 11),
-            crates_cnt: 0,
-        };
-        let json = serde_json::to_string(&key).unwrap();
-        assert!(
-            json.as_str()
-                .find(r#""created_at":"2017-01-06T14:23:11+00:00""#)
-                .is_some()
-        );
-    }
-
 }
diff --git a/src/version/mod.rs b/src/version/mod.rs
@@ -58,11 +58,11 @@ pub struct EncodableVersion {
     pub features: HashMap<String, Vec<String>>,
     pub yanked: bool,
     pub license: Option<String>,
-    pub links: VersionLinks,
+    pub links: EncodableVersionLinks,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
-pub struct VersionLinks {
+pub struct EncodableVersionLinks {
     pub dependencies: String,
     pub version_downloads: String,
     pub authors: String,
@@ -94,7 +94,7 @@ impl Version {
             features: features,
             yanked: yanked,
             license: license,
-            links: VersionLinks {
+            links: EncodableVersionLinks {
                 dependencies: format!("/api/v1/crates/{}/{}/dependencies", crate_name, num),
                 version_downloads: format!("/api/v1/crates/{}/{}/downloads", crate_name, num),
                 authors: format!("/api/v1/crates/{}/{}/authors", crate_name, num),
@@ -267,44 +267,3 @@ fn version_and_crate(req: &mut Request) -> CargoResult<(Version, Crate)> {
         })?;
     Ok((version, krate))
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use chrono::NaiveDate;
-    use serde_json;
-
-    #[test]
-    fn version_serializes_to_rfc3339() {
-        let ver = EncodableVersion {
-            id: 1,
-            krate: "".to_string(),
-            num: "".to_string(),
-            dl_path: "".to_string(),
-            readme_path: "".to_string(),
-            updated_at: NaiveDate::from_ymd(2017, 1, 6).and_hms(14, 23, 11),
-            created_at: NaiveDate::from_ymd(2017, 1, 6).and_hms(14, 23, 12),
-            downloads: 0,
-            features: HashMap::new(),
-            yanked: false,
-            license: None,
-            links: VersionLinks {
-                dependencies: "".to_string(),
-                version_downloads: "".to_string(),
-                authors: "".to_string(),
-            },
-        };
-        let json = serde_json::to_string(&ver).unwrap();
-        assert!(
-            json.as_str()
-                .find(r#""updated_at":"2017-01-06T14:23:11+00:00""#)
-                .is_some()
-        );
-        assert!(
-            json.as_str()
-                .find(r#""created_at":"2017-01-06T14:23:12+00:00""#)
-                .is_some()
-        );
-    }
-
-}
diff --git a/src/views/mod.rs b/src/views/mod.rs
@@ -42,9 +42,103 @@ pub use krate::EncodableCrate;
 pub use owner::{EncodableOwner, EncodableTeam};
 pub use token::EncodableApiTokenWithToken;
 pub use user::{EncodablePrivateUser, EncodablePublicUser};
-pub use version::EncodableVersion;
+pub use version::{EncodableVersion, EncodableVersionLinks};
 
 // TODO: Prefix many of these with `Encodable` then clean up the reexports
 pub mod krate_publish;
 pub use self::krate_publish::CrateDependency as EncodableCrateDependency;
 pub use self::krate_publish::NewCrate as EncodableCrateUpload;
+
+#[cfg(test)]
+mod tests {
+    use std::collections::HashMap;
+    use super::*;
+    use chrono::NaiveDate;
+    use serde_json;
+
+    #[test]
+    fn category_dates_serializes_to_rfc3339() {
+        let cat = EncodableCategory {
+            id: "".to_string(),
+            category: "".to_string(),
+            slug: "".to_string(),
+            description: "".to_string(),
+            crates_cnt: 1,
+            created_at: NaiveDate::from_ymd(2017, 1, 6).and_hms(14, 23, 11),
+        };
+        let json = serde_json::to_string(&cat).unwrap();
+        assert!(
+            json.as_str()
+                .find(r#""created_at":"2017-01-06T14:23:11+00:00""#)
+                .is_some()
+        );
+    }
+
+    #[test]
+    fn category_with_sub_dates_serializes_to_rfc3339() {
+        let cat = EncodableCategoryWithSubcategories {
+            id: "".to_string(),
+            category: "".to_string(),
+            slug: "".to_string(),
+            description: "".to_string(),
+            crates_cnt: 1,
+            created_at: NaiveDate::from_ymd(2017, 1, 6).and_hms(14, 23, 11),
+            subcategories: vec![],
+        };
+        let json = serde_json::to_string(&cat).unwrap();
+        assert!(
+            json.as_str()
+                .find(r#""created_at":"2017-01-06T14:23:11+00:00""#)
+                .is_some()
+        );
+    }
+
+    #[test]
+    fn keyword_serializes_to_rfc3339() {
+        let key = EncodableKeyword {
+            id: "".to_string(),
+            keyword: "".to_string(),
+            created_at: NaiveDate::from_ymd(2017, 1, 6).and_hms(14, 23, 11),
+            crates_cnt: 0,
+        };
+        let json = serde_json::to_string(&key).unwrap();
+        assert!(
+            json.as_str()
+                .find(r#""created_at":"2017-01-06T14:23:11+00:00""#)
+                .is_some()
+        );
+    }
+
+    #[test]
+    fn version_serializes_to_rfc3339() {
+        let ver = EncodableVersion {
+            id: 1,
+            krate: "".to_string(),
+            num: "".to_string(),
+            dl_path: "".to_string(),
+            readme_path: "".to_string(),
+            updated_at: NaiveDate::from_ymd(2017, 1, 6).and_hms(14, 23, 11),
+            created_at: NaiveDate::from_ymd(2017, 1, 6).and_hms(14, 23, 12),
+            downloads: 0,
+            features: HashMap::new(),
+            yanked: false,
+            license: None,
+            links: EncodableVersionLinks {
+                dependencies: "".to_string(),
+                version_downloads: "".to_string(),
+                authors: "".to_string(),
+            },
+        };
+        let json = serde_json::to_string(&ver).unwrap();
+        assert!(
+            json.as_str()
+                .find(r#""updated_at":"2017-01-06T14:23:11+00:00""#)
+                .is_some()
+        );
+        assert!(
+            json.as_str()
+                .find(r#""created_at":"2017-01-06T14:23:12+00:00""#)
+                .is_some()
+        );
+    }
+}
