typosquat/test_util: Simplify user() fn

If `create_or_update()` is called with a `None` argument then no emails will be saved and sent, which means that the `Emails` instance isn't actually being used and created for nothing. Additionally, we don't need the "upsert" behavior since our test database shouldn't start with any content anyway.

In other words: we can just `INSERT` the `NewUser` instance directly and remove the `email` field from the `Faker` struct.

Author: Turbo87

src/typosquat/test_util.rs

@@ -5,19 +5,14 @@ use crate::{
     models::{
         Crate, CrateOwner, NewCrate, NewTeam, NewUser, NewVersion, Owner, OwnerKind, User, Version,
     },
-    schema::{crate_downloads, crate_owners},
-    Emails,
+    schema::{crate_downloads, crate_owners, users},
 };
 
-pub struct Faker {
-    emails: Emails,
-}
+pub struct Faker {}
 
 impl Faker {
     pub fn new() -> Self {
-        Self {
-            emails: Emails::new_in_memory(),
-        }
+        Self {}
     }
 
     pub fn add_crate_to_team(
@@ -91,13 +86,11 @@ impl Faker {
         ))
     }
 
-    pub fn user(&mut self, conn: &mut PgConnection, login: &str) -> anyhow::Result<User> {
-        Ok(
-            NewUser::new(next_gh_id(), login, None, None, "token").create_or_update(
-                None,
-                &self.emails,
-                conn,
-            )?,
-        )
+    pub fn user(&mut self, conn: &mut PgConnection, login: &str) -> QueryResult<User> {
+        let user = NewUser::new(next_gh_id(), login, None, None, "token");
+
+        diesel::insert_into(users::table)
+            .values(user)
+            .get_result(conn)
     }
 }