Add a verified email address to all test users

Then manually remove or edit the email record if we're specifically
testing a user without a verified email address.

Author: carols10cents

src/tests/krate.rs

@@ -1079,6 +1079,10 @@ fn new_krate_with_readme() {
 fn new_krate_without_any_email_warns() {
     let (app, _, _, token) = TestApp::with_proxy().with_token();
 
+    app.db(|conn| {
+        delete(emails::table).execute(conn).unwrap();
+    });
+
     let crate_to_publish = PublishBuilder::new("foo_no_email");
 
     let json = token.publish(crate_to_publish).good();
@@ -1100,15 +1104,11 @@ fn new_krate_without_any_email_warns() {
 // See https://github.com/rust-lang/crates-io-cargo-teams/issues/8
 #[test]
 fn new_krate_with_unverified_email_warns() {
-    let (app, _, user, token) = TestApp::with_proxy().with_token();
-    let user = user.as_model();
+    let (app, _, _, token) = TestApp::with_proxy().with_token();
 
     app.db(|conn| {
-        insert_into(emails::table)
-            .values((
-                emails::user_id.eq(user.id),
-                emails::email.eq("[email protected]"),
-            ))
+        update(emails::table)
+            .set((emails::verified.eq(false),))
             .execute(conn)
             .unwrap();
     });
@@ -1132,22 +1132,7 @@ fn new_krate_with_unverified_email_warns() {
 
 #[test]
 fn new_krate_with_verified_email_doesnt_warn() {
-    let (app, _, user, token) = TestApp::with_proxy().with_token();
-    let user = user.as_model();
-
-    // TODO: Move this to TestApp setup for user so we don't have to do this for every test
-    // that publishes a crate; then edit the test for the user without a verified email to
-    // remove the verified email
-    app.db(|conn| {
-        insert_into(emails::table)
-            .values((
-                emails::user_id.eq(user.id),
-                emails::email.eq("[email protected]"),
-                emails::verified.eq(true),
-            ))
-            .execute(conn)
-            .unwrap();
-    });
+    let (app, _, _, token) = TestApp::with_proxy().with_token();
 
     let crate_to_publish = PublishBuilder::new("foo_verified_email");
 

src/tests/util.rs

@@ -79,11 +79,28 @@ impl TestApp {
         f(&conn)
     }
 
-    /// Create a new user in the database and return a mock user session
+    /// Create a new user with a verified email address in the database and return a mock user
+    /// session
     ///
     /// This method updates the database directly
-    pub fn db_new_user(&self, user: &str) -> MockCookieUser {
-        let user = self.db(|conn| crate::new_user(user).create_or_update(conn).unwrap());
+    pub fn db_new_user(&self, username: &str) -> MockCookieUser {
+        use cargo_registry::schema::emails;
+        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());
+            diesel::insert_into(emails::table)
+                .values((
+                    emails::user_id.eq(user.id),
+                    emails::email.eq(email),
+                    emails::verified.eq(true),
+                ))
+                .execute(conn)
+                .unwrap();
+            user
+        });
         MockCookieUser {
             app: TestApp(Rc::clone(&self.0)),
             user,