Added VersionBuilder and converted tests to use it.

Author: baileyn

src/tests/all.rs

@@ -214,12 +214,50 @@ fn user(login: &str) -> User {
 
 use cargo_registry::util::CargoResult;
 
+struct VersionBuilder<'a> {
+    version: semver::Version,
+    license: Option<&'a str>,
+    license_file: Option<&'a str>,
+    features: HashMap<String, Vec<String>>,
+}
+
+impl<'a> VersionBuilder<'a> {
+    fn new(version: &str) -> VersionBuilder {
+        let version = semver::Version::parse(version).unwrap_or_else(
+            |e| {
+                panic!("The version {} is not valid: {}", version, e);
+            },
+        );
+
+        VersionBuilder {
+            version: version,
+            license: None,
+            license_file: None,
+            features: HashMap::new(),
+        }
+    }
+
+    fn build(self, connection: &PgConnection, crate_id: i32) -> CargoResult<Version> {
+        let license = match self.license {
+            Some(license) => Some(license.to_owned()),
+            None => None,
+        };
+
+        NewVersion::new(
+            crate_id,
+            &self.version,
+            &self.features,
+            license,
+            self.license_file,
+        )?.save(connection, &[])
+    }
+}
+
 struct CrateBuilder<'a> {
     owner_id: i32,
     krate: NewCrate<'a>,
-    license_file: Option<&'a str>,
     downloads: Option<i32>,
-    versions: Vec<semver::Version>,
+    versions: Vec<VersionBuilder<'a>>,
     keywords: Vec<&'a str>,
 }
 
@@ -231,7 +269,6 @@ impl<'a> CrateBuilder<'a> {
                 name: name,
                 ..NewCrate::default()
             },
-            license_file: None,
             downloads: None,
             versions: Vec::new(),
             keywords: Vec::new(),
@@ -268,10 +305,7 @@ impl<'a> CrateBuilder<'a> {
         self
     }
 
-    fn version(mut self, version: &str) -> Self {
-        let version = semver::Version::parse(version).unwrap_or_else(|e| {
-            panic!("The version {} is not valid: {}", version, e);
-        });
+    fn version(mut self, version: VersionBuilder<'a>) -> Self {
         self.versions.push(version);
         self
     }
@@ -298,14 +332,11 @@ impl<'a> CrateBuilder<'a> {
         }
 
         if self.versions.is_empty() {
-            self.versions.push("0.99.0".parse().expect(
-                "invalid version number",
-            ));
+            self.versions.push(VersionBuilder::new("0.99.0"));
         }
 
-        for version_num in &self.versions {
-            NewVersion::new(krate.id, version_num, &HashMap::new(), None, self.license_file)?
-              .save(connection, &[])?;
+        for version in self.versions {
+            version.build(&connection, krate.id)?;
         }
 
         if !self.keywords.is_empty() {

src/tests/krate.rs

@@ -357,9 +357,9 @@ fn show() {
             .description("description")
             .documentation("https://example.com")
             .homepage("http://example.com")
-            .version("1.0.0")
-            .version("0.5.0")
-            .version("0.5.1")
+            .version(::VersionBuilder::new("1.0.0"))
+            .version(::VersionBuilder::new("0.5.0"))
+            .version(::VersionBuilder::new("0.5.1"))
             .keyword("kw1")
             .expect_build(&conn);
     }
@@ -763,7 +763,7 @@ fn new_krate_duplicate_version() {
         ::sign_in_as(&mut req, &user);
 
         ::CrateBuilder::new("foo_dupe", user.id)
-            .version("1.0.0")
+            .version(::VersionBuilder::new("1.0.0"))
             .expect_build(&conn);
     }
     let json = bad_resp!(middle.call(&mut req));
@@ -949,7 +949,7 @@ fn download() {
         let conn = app.diesel_database.get().unwrap();
         let user = ::new_user("foo").create_or_update(&conn).unwrap();
         ::CrateBuilder::new("foo_download", user.id)
-            .version("1.0.0")
+            .version(::VersionBuilder::new("1.0.0"))
             .expect_build(&conn);
     }
     let resp = t_resp!(middle.call(&mut req));

src/tests/user.rs

@@ -155,11 +155,11 @@ fn following() {
         ::sign_in_as(&mut req, &user);
 
         ::CrateBuilder::new("foo_fighters", user.id)
-            .version("1.0.0")
+            .version(::VersionBuilder::new("1.0.0"))
             .expect_build(&conn);
 
         ::CrateBuilder::new("bar_fighters", user.id)
-            .version("1.0.0")
+            .version(::VersionBuilder::new("1.0.0"))
             .expect_build(&conn);
     }
 

src/tests/version.rs

@@ -29,8 +29,8 @@ fn index() {
         let conn = app.diesel_database.get().unwrap();
         let u = ::new_user("foo").create_or_update(&conn).unwrap();
         ::CrateBuilder::new("foo_vers_index", u.id)
-            .version("2.0.0")
-            .version("2.0.1")
+            .version(::VersionBuilder::new("2.0.0"))
+            .version(::VersionBuilder::new("2.0.1"))
             .expect_build(&conn);
         let ids = versions::table
             .select(versions::id)