update tests to match altered fields

Author: mugoh

src/tests/all.rs

@@ -220,7 +220,6 @@ fn new_user(login: &str) -> NewUser<'_> {
     NewUser {
         gh_id: NEXT_GH_ID.fetch_add(1, Ordering::SeqCst) as i32,
         gh_login: login,
-        email: None,
         name: None,
         gh_avatar: None,
         gh_access_token: Cow::Borrowed("some random token"),

src/tests/krate.rs

@@ -86,7 +86,7 @@ fn index() {
     assert_eq!(json.meta.total, 0);
 
     let krate = app.db(|conn| {
-        let u = new_user("foo").create_or_update(conn).unwrap();
+        let u = new_user("foo").create_or_update(None, conn).unwrap();
         CrateBuilder::new("fooindex", u.id).expect_build(conn)
     });
 

src/tests/token.rs

@@ -267,7 +267,7 @@ fn token_gives_access_to_me() {
     anon.get(url).assert_forbidden();
 
     let json: UserShowPrivateResponse = token.get(url).good();
-    assert_eq!(json.user.email, user.as_model().email);
+    assert_eq!(json.user.name, user.as_model().name);
 }
 
 #[test]

src/tests/user.rs

@@ -110,7 +110,7 @@ fn me() {
     let user = app.db_new_user("foo");
     let json = user.show_me();
 
-    assert_eq!(json.user.email, user.as_model().email);
+    assert_eq!(json.user.name, user.as_model().name);
 }
 
 #[test]
@@ -141,21 +141,19 @@ fn show_latest_user_case_insensitively() {
         t!(NewUser::new(
             1,
             "foobar",
-            Some("[email protected]"),
             Some("I was first then deleted my github account"),
             None,
             "bar"
         )
-        .create_or_update(conn));
+        .create_or_update(None, conn));
         t!(NewUser::new(
             2,
             "FOOBAR",
-            Some("[email protected]"),
             Some("I was second, I took the foobar username on github"),
             None,
             "bar"
         )
-        .create_or_update(conn));
+        .create_or_update(None, conn));
     });
 
     let json: UserShowPublicResponse = anon.get("api/v1/users/fOObAr").good();
@@ -324,7 +322,7 @@ fn updating_existing_user_doesnt_change_api_token() {
 
     let user = app.db(|conn| {
         // Reuse gh_id but use new gh_login and gh_access_token
-        t!(NewUser::new(gh_id, "bar", None, None, None, "bar_token").create_or_update(conn));
+        t!(NewUser::new(gh_id, "bar", None, None, "bar_token").create_or_update(None, conn));
 
         // Use the original API token to find the now updated user
         t!(User::find_by_api_token(conn, token))
@@ -353,7 +351,7 @@ fn github_without_email_does_not_overwrite_email() {
     // Don't use app.db_new_user because it adds a verified email.
     let user_without_github_email = app.db(|conn| {
         let u = new_user("arbitrary_username");
-        let u = u.create_or_update(conn).unwrap();
+        let u = u.create_or_update(None, conn).unwrap();
         MockCookieUser::new(&app, u)
     });
     let user_without_github_email_model = user_without_github_email.as_model();
@@ -373,7 +371,7 @@ fn github_without_email_does_not_overwrite_email() {
             // new_user uses a None email; the rest of the fields are arbitrary
             ..new_user("arbitrary_username")
         };
-        let u = u.create_or_update(conn).unwrap();
+        let u = u.create_or_update(None, conn).unwrap();
         MockCookieUser::new(&app, u)
     });
 
@@ -386,9 +384,16 @@ fn github_without_email_does_not_overwrite_email() {
 */
 #[test]
 fn github_with_email_does_not_overwrite_email() {
+    use cargo_registry::schema::emails;
+
     let (app, _, user) = TestApp::init().with_user();
     let model = user.as_model();
-    let original_email = &model.email;
+    let original_email = app.db(|conn| {
+        Email::belonging_to(model)
+            .select(emails::email)
+            .first::<String>(&*conn)
+            .unwrap()
+    });
 
     let new_github_email = "[email protected]";
 
@@ -397,16 +402,15 @@ fn github_with_email_does_not_overwrite_email() {
         let u = NewUser {
             // Use the same github ID to link to the existing account
             gh_id: model.gh_id,
-            email: Some(new_github_email),
             // the rest of the fields are arbitrary
             ..new_user("arbitrary_username")
         };
-        let u = u.create_or_update(conn).unwrap();
+        let u = u.create_or_update(Some(new_github_email), conn).unwrap();
         MockCookieUser::new(&app, u)
     });
 
     let json = user_with_different_email_in_github.show_me();
-    assert_eq!(json.user.email, *original_email);
+    assert_eq!(json.user.email, Some(original_email));
 }
 
 /*  Given a crates.io user, check that the user's email can be
@@ -512,10 +516,9 @@ fn test_confirm_user_email() {
     // email directly into the database and we want to test the verification flow here.
     let user = app.db(|conn| {
         let u = NewUser {
-            email: Some("[email protected]"),
             ..new_user("arbitrary_username")
         };
-        let u = u.create_or_update(conn).unwrap();
+        let u = u.create_or_update(None, conn).unwrap();
         MockCookieUser::new(&app, u)
     });
     let user_model = user.as_model();
@@ -551,10 +554,9 @@ fn test_existing_user_email() {
     // email directly into the database and we want to test the verification flow here.
     let user = app.db(|conn| {
         let u = NewUser {
-            email: Some("[email protected]"),
             ..new_user("arbitrary_username")
         };
-        let u = u.create_or_update(conn).unwrap();
+        let u = u.create_or_update(None, conn).unwrap();
         update(Email::belonging_to(&u))
             // Users created before we added verification will have
             // `NULL` in the `token_generated_at` column.

src/tests/util.rs

@@ -135,9 +135,10 @@ impl TestApp {
         use diesel::prelude::*;
 
         let user = self.db(|conn| {
-            let mut user = crate::new_user(username).create_or_update(conn).unwrap();
-            let email = "[email protected]";
-            user.email = Some(email.to_string());
+            let email = "[email protected]";
+            let user = crate::new_user(username)
+                .create_or_update(Some(email), conn)
+                .unwrap();
             diesel::insert_into(emails::table)
                 .values((
                     emails::user_id.eq(user.id),