Fix tests

Author: alexcrichton

src/bin/update-downloads.rs

@@ -158,7 +158,7 @@ mod test {
         let tx = conn.transaction().unwrap();
         let user = user(&tx);
         let krate = Crate::find_or_insert(&tx, "foo", user.id,
-                                          &None, &None, &None).unwrap();
+                                          &None, &None, &None, &None).unwrap();
         let version = Version::insert(&tx, krate.id,
                                       &semver::Version::parse("1.0.0").unwrap(),
                                       &HashMap::new(), []).unwrap();
@@ -184,7 +184,7 @@ mod test {
         let tx = conn.transaction().unwrap();
         let user = user(&tx);
         let krate = Crate::find_or_insert(&tx, "foo", user.id, &None,
-                                          &None, &None).unwrap();
+                                          &None, &None, &None).unwrap();
         let version = Version::insert(&tx, krate.id,
                                       &semver::Version::parse("1.0.0").unwrap(),
                                       &HashMap::new(), []).unwrap();

src/krate.rs

@@ -94,13 +94,13 @@ impl Crate {
         let stmt = try!(conn.prepare("UPDATE crates
                                          SET documentation = $1,
                                              homepage = $2,
-                                             description = $3
+                                             description = $3,
                                              readme = $4
                                        WHERE name = $5
                                    RETURNING *"));
         let mut rows = try!(stmt.query(&[&documentation, &homepage,
-                                         &description, &name as &ToSql,
-                                         &readme]));
+                                         &description, &readme,
+                                         &name as &ToSql]));
         match rows.next() {
             Some(row) => return Ok(Model::from_row(&row)),
             None => {}
@@ -111,7 +111,7 @@ impl Crate {
                                        description, homepage, documentation,
                                        readme)
                                       VALUES ($1, $2, $3, $3, 0, '0.0.0',
-                                              $4, $5, $6, &7)
+                                              $4, $5, $6, $7)
                                       RETURNING *"));
         let now = ::now();
         let mut rows = try!(stmt.query(&[&name as &ToSql, &user_id, &now,

src/tests/all.rs

@@ -177,6 +177,7 @@ fn krate(name: &str) -> Crate {
         documentation: None,
         homepage: None,
         description: None,
+        readme: None,
     }
 }
 
@@ -197,7 +198,8 @@ fn mock_crate(req: &mut Request, krate: Crate) -> Crate {
     let krate = Crate::find_or_insert(req.tx().unwrap(), krate.name.as_slice(),
                                       user.id, &krate.description,
                                       &krate.homepage,
-                                      &krate.documentation).unwrap();
+                                      &krate.documentation,
+                                      &krate.readme).unwrap();
     Version::insert(req.tx().unwrap(), krate.id,
                     &semver::Version::parse("1.0.0").unwrap(),
                     &HashMap::new(), []).unwrap();

src/tests/krate.rs

@@ -159,6 +159,7 @@ fn new_req_full(api_token: &str, krate: Crate, version: &str,
         description: krate.description,
         homepage: krate.homepage,
         documentation: krate.documentation,
+        readme: krate.readme,
     };
     let json = json::encode(&json);
     let mut body = MemWriter::new();

src/tests/middleware.rs

@@ -35,11 +35,11 @@ impl Middleware for MockDependency {
         let MockDependency(ref a, ref b) = *self;
         let user = req.extensions().find::<User>().unwrap();
         let crate_a = Crate::find_or_insert(req.tx().unwrap(),
-                                            a.name.as_slice(),
-                                            user.id, &None, &None, &None).unwrap();
+                                            a.name.as_slice(), user.id, &None,
+                                            &None, &None, &None).unwrap();
         let crate_b = Crate::find_or_insert(req.tx().unwrap(),
-                                            b.name.as_slice(),
-                                            user.id, &None, &None, &None).unwrap();
+                                            b.name.as_slice(), user.id, &None,
+                                            &None, &None, &None).unwrap();
         let va = Version::insert(req.tx().unwrap(), crate_a.id,
                                  &semver::Version::parse("1.0.0").unwrap(),
                                  &HashMap::new(), []).unwrap();