tests/util/test_app: Convert db_new_user() fn to async

Author: Turbo87

src/controllers/user/resend.rs

@@ -77,7 +77,7 @@ mod tests {
     #[tokio::test(flavor = "multi_thread")]
     async fn test_wrong_user() {
         let (app, _anon, user) = TestApp::init().with_user().await;
-        let user2 = app.db_new_user("bar");
+        let user2 = app.db_new_user("bar").await;
 
         let url = format!("/api/v1/users/{}/resend", user2.as_model().id);
         let response = user.put::<()>(&url, "").await;

src/tests/issues/issue2736.rs

@@ -13,10 +13,10 @@ async fn test_issue_2736() -> anyhow::Result<()> {
     let mut conn = app.db_conn();
 
     // - A user had a GitHub account named, let's say, `foo`
-    let foo1 = app.db_new_user("foo");
+    let foo1 = app.db_new_user("foo").await;
 
     // - Another user `someone_else` added them as an owner of a crate
-    let someone_else = app.db_new_user("someone_else");
+    let someone_else = app.db_new_user("someone_else").await;
 
     let krate = CrateBuilder::new("crate1", someone_else.as_model().id).expect_build(&mut conn);
 
@@ -33,7 +33,7 @@ async fn test_issue_2736() -> anyhow::Result<()> {
     // - `foo` deleted their GitHub account (but crates.io has no real knowledge of this)
     // - `foo` recreated their GitHub account with the same username (because it was still available), but in this situation GitHub assigns them a new ID
     // - When `foo` now logs in to crates.io, it's a different account than their old `foo` crates.io account because of the new GitHub ID (and if it wasn't, this would be a security problem)
-    let foo2 = app.db_new_user("foo");
+    let foo2 = app.db_new_user("foo").await;
 
     let github_ids = users::table
         .filter(users::gh_login.eq("foo"))

src/tests/krate/publish/auth.rs

@@ -42,7 +42,8 @@ async fn new_krate_wrong_user() {
     CrateBuilder::new("foo_wrong", user.as_model().id).expect_build(&mut conn);
 
     // Then try to publish with a different user
-    let another_user = app.db_new_user("another").db_new_token("bar");
+    let another_user = app.db_new_user("another").await;
+    let another_user = another_user.db_new_token("bar");
     let crate_to_publish = PublishBuilder::new("foo_wrong", "2.0.0");
 
     let response = another_user.publish_crate(crate_to_publish).await;

src/tests/owners.rs

@@ -135,7 +135,7 @@ async fn new_crate_owner() {
     token.publish_crate(crate_to_publish).await.good();
 
     // Add the second user as an owner (with a different case to make sure that works)
-    let user2 = app.db_new_user("Bar");
+    let user2 = app.db_new_user("Bar").await;
     token.add_named_owner("foo_owner", "BAR").await.good();
 
     assert_snapshot!(app.emails_snapshot().await);
@@ -169,7 +169,7 @@ async fn create_and_add_owner(
     username: &str,
     krate: &Crate,
 ) -> MockCookieUser {
-    let user = app.db_new_user(username);
+    let user = app.db_new_user(username).await;
     token.add_named_owner(&krate.name, username).await.good();
     user.accept_ownership_invitation(&krate.name, krate.id)
         .await;
@@ -283,7 +283,7 @@ async fn check_ownership_two_crates() {
     let krate_owned_by_team = CrateBuilder::new("foo", user.id).expect_build(&mut conn);
     add_team_to_crate(&team, &krate_owned_by_team, user, &mut conn).unwrap();
 
-    let user2 = app.db_new_user("user_bar");
+    let user2 = app.db_new_user("user_bar").await;
     let user2 = user2.as_model();
     let krate_not_owned_by_team = CrateBuilder::new("bar", user2.id).expect_build(&mut conn);
 
@@ -374,7 +374,7 @@ async fn deleted_ownership_isnt_in_owner_user() {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_unknown_crate() {
     let (app, _, user) = TestApp::full().with_user().await;
-    app.db_new_user("bar");
+    app.db_new_user("bar").await;
 
     let response = user.get::<()>("/api/v1/crates/unknown/owners").await;
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
@@ -415,7 +415,7 @@ async fn invitations_list_v1() {
 
     let krate = CrateBuilder::new("invited_crate", owner.id).expect_build(&mut conn);
 
-    let user = app.db_new_user("invited_user");
+    let user = app.db_new_user("invited_user").await;
     token
         .add_named_owner("invited_crate", "invited_user")
         .await
@@ -450,7 +450,7 @@ async fn invitations_list_does_not_include_expired_invites_v1() {
     let mut conn = app.db_conn();
     let owner = owner.as_model();
 
-    let user = app.db_new_user("invited_user");
+    let user = app.db_new_user("invited_user").await;
 
     let krate1 = CrateBuilder::new("invited_crate_1", owner.id).expect_build(&mut conn);
     let krate2 = CrateBuilder::new("invited_crate_2", owner.id).expect_build(&mut conn);
@@ -496,7 +496,7 @@ async fn test_accept_invitation() {
     let (app, anon, owner, owner_token) = TestApp::init().with_token().await;
     let mut conn = app.db_conn();
     let owner = owner.as_model();
-    let invited_user = app.db_new_user("user_bar");
+    let invited_user = app.db_new_user("user_bar").await;
 
     let krate = CrateBuilder::new("accept_invitation", owner.id).expect_build(&mut conn);
 
@@ -529,7 +529,7 @@ async fn test_decline_invitation() {
     let (app, anon, owner, owner_token) = TestApp::init().with_token().await;
     let mut conn = app.db_conn();
     let owner = owner.as_model();
-    let invited_user = app.db_new_user("user_bar");
+    let invited_user = app.db_new_user("user_bar").await;
 
     let krate = CrateBuilder::new("decline_invitation", owner.id).expect_build(&mut conn);
 
@@ -559,7 +559,7 @@ async fn test_accept_invitation_by_mail() {
     let mut conn = app.db_conn();
 
     let owner = owner.as_model();
-    let invited_user = app.db_new_user("user_bar");
+    let invited_user = app.db_new_user("user_bar").await;
 
     CrateBuilder::new("accept_invitation", owner.id).expect_build(&mut conn);
 
@@ -607,7 +607,7 @@ async fn test_accept_expired_invitation() {
     let (app, anon, owner, owner_token) = TestApp::init().with_token().await;
     let mut conn = app.db_conn();
     let owner = owner.as_model();
-    let invited_user = app.db_new_user("demo_user");
+    let invited_user = app.db_new_user("demo_user").await;
 
     let krate = CrateBuilder::new("demo_crate", owner.id).expect_build(&mut conn);
 
@@ -647,7 +647,7 @@ async fn test_decline_expired_invitation() {
     let (app, anon, owner, owner_token) = TestApp::init().with_token().await;
     let mut conn = app.db_conn();
     let owner = owner.as_model();
-    let invited_user = app.db_new_user("demo_user");
+    let invited_user = app.db_new_user("demo_user").await;
 
     let krate = CrateBuilder::new("demo_crate", owner.id).expect_build(&mut conn);
 
@@ -676,7 +676,7 @@ async fn test_accept_expired_invitation_by_mail() {
     let mut conn = app.db_conn();
 
     let owner = owner.as_model();
-    let _invited_user = app.db_new_user("demo_user");
+    let _invited_user = app.db_new_user("demo_user").await;
     let krate = CrateBuilder::new("demo_crate", owner.id).expect_build(&mut conn);
 
     // Invite a new owner
@@ -740,7 +740,7 @@ async fn inactive_users_dont_get_invitations() {
 
     CrateBuilder::new(krate_name, owner.id).expect_build(&mut conn);
 
-    let invited_user = app.db_new_user(invited_gh_login);
+    let invited_user = app.db_new_user(invited_gh_login).await;
 
     owner_token
         .add_named_owner(krate_name, "user_bar")
@@ -762,9 +762,9 @@ async fn highest_gh_id_is_most_recent_account_we_know_of() {
     let krate_name = "newer_user_test";
 
     // This user will get a lower gh_id, given how crate::tests::new_user works
-    app.db_new_user(invited_gh_login);
+    app.db_new_user(invited_gh_login).await;
 
-    let invited_user = app.db_new_user(invited_gh_login);
+    let invited_user = app.db_new_user(invited_gh_login).await;
 
     CrateBuilder::new(krate_name, owner.id).expect_build(&mut conn);
 

src/tests/routes/crates/owners/add.rs

@@ -13,7 +13,7 @@ async fn test_cargo_invite_owners() {
     let (app, _, owner) = TestApp::init().with_user().await;
     let mut conn = app.db_conn();
 
-    let new_user = app.db_new_user("cilantro");
+    let new_user = app.db_new_user("cilantro").await;
     CrateBuilder::new("guacamole", owner.as_model().id).expect_build(&mut conn);
 
     let json = owner
@@ -38,7 +38,7 @@ async fn owner_change_via_cookie() {
     let (app, _, cookie) = TestApp::full().with_user().await;
     let mut conn = app.db_conn();
 
-    let user2 = app.db_new_user("user-2");
+    let user2 = app.db_new_user("user-2").await;
     let user2 = user2.as_model();
 
     let krate = CrateBuilder::new("foo_crate", cookie.as_model().id).expect_build(&mut conn);
@@ -53,7 +53,7 @@ async fn owner_change_via_token() {
     let (app, _, _, token) = TestApp::full().with_token().await;
     let mut conn = app.db_conn();
 
-    let user2 = app.db_new_user("user-2");
+    let user2 = app.db_new_user("user-2").await;
     let user2 = user2.as_model();
 
     let krate = CrateBuilder::new("foo_crate", token.as_model().user_id).expect_build(&mut conn);
@@ -71,7 +71,7 @@ async fn owner_change_via_change_owner_token() {
 
     let mut conn = app.db_conn();
 
-    let user2 = app.db_new_user("user-2");
+    let user2 = app.db_new_user("user-2").await;
     let user2 = user2.as_model();
 
     let krate = CrateBuilder::new("foo_crate", token.as_model().user_id).expect_build(&mut conn);
@@ -90,7 +90,7 @@ async fn owner_change_via_change_owner_token_with_matching_crate_scope() {
         .await;
     let mut conn = app.db_conn();
 
-    let user2 = app.db_new_user("user-2");
+    let user2 = app.db_new_user("user-2").await;
     let user2 = user2.as_model();
 
     let krate = CrateBuilder::new("foo_crate", token.as_model().user_id).expect_build(&mut conn);
@@ -109,7 +109,7 @@ async fn owner_change_via_change_owner_token_with_wrong_crate_scope() {
         .await;
     let mut conn = app.db_conn();
 
-    let user2 = app.db_new_user("user-2");
+    let user2 = app.db_new_user("user-2").await;
     let user2 = user2.as_model();
 
     let krate = CrateBuilder::new("foo_crate", token.as_model().user_id).expect_build(&mut conn);
@@ -127,7 +127,7 @@ async fn owner_change_via_publish_token() {
 
     let mut conn = app.db_conn();
 
-    let user2 = app.db_new_user("user-2");
+    let user2 = app.db_new_user("user-2").await;
     let user2 = user2.as_model();
 
     let krate = CrateBuilder::new("foo_crate", token.as_model().user_id).expect_build(&mut conn);
@@ -142,7 +142,7 @@ async fn owner_change_without_auth() {
     let (app, anon, cookie) = TestApp::full().with_user().await;
     let mut conn = app.db_conn();
 
-    let user2 = app.db_new_user("user-2");
+    let user2 = app.db_new_user("user-2").await;
     let user2 = user2.as_model();
 
     let krate = CrateBuilder::new("foo_crate", cookie.as_model().id).expect_build(&mut conn);
@@ -158,7 +158,7 @@ async fn test_owner_change_with_legacy_field() {
     let mut conn = app.db_conn();
 
     CrateBuilder::new("foo", user1.as_model().id).expect_build(&mut conn);
-    app.db_new_user("user2");
+    app.db_new_user("user2").await;
 
     let input = r#"{"users": ["user2"]}"#;
     let response = user1
@@ -173,7 +173,7 @@ async fn test_owner_change_with_invalid_json() {
     let (app, _, user) = TestApp::full().with_user().await;
     let mut conn = app.db_conn();
 
-    app.db_new_user("bar");
+    app.db_new_user("bar").await;
     CrateBuilder::new("foo", user.as_model().id).expect_build(&mut conn);
 
     // incomplete input
@@ -206,7 +206,7 @@ async fn invite_already_invited_user() {
     let (app, _, _, owner) = TestApp::init().with_token().await;
     let mut conn = app.db_conn();
 
-    app.db_new_user("invited_user");
+    app.db_new_user("invited_user").await;
     CrateBuilder::new("crate_name", owner.as_model().user_id).expect_build(&mut conn);
 
     // Ensure no emails were sent up to this point
@@ -234,7 +234,7 @@ async fn invite_with_existing_expired_invite() {
     let (app, _, _, owner) = TestApp::init().with_token().await;
     let mut conn = app.db_conn();
 
-    app.db_new_user("invited_user");
+    app.db_new_user("invited_user").await;
     let krate = CrateBuilder::new("crate_name", owner.as_model().user_id).expect_build(&mut conn);
 
     // Ensure no emails were sent up to this point
@@ -263,7 +263,7 @@ async fn invite_with_existing_expired_invite() {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_unknown_crate() {
     let (app, _, user) = TestApp::full().with_user().await;
-    app.db_new_user("bar");
+    app.db_new_user("bar").await;
 
     let response = user.add_named_owner("unknown", "bar").await;
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
@@ -309,7 +309,7 @@ async fn max_invites_per_request() {
 
     // Populate enough users in the database to submit 11 invites at once.
     for user in &usernames {
-        app.db_new_user(user);
+        app.db_new_user(user).await;
     }
 
     let response = owner.add_named_owners("crate_name", &usernames).await;
@@ -329,7 +329,7 @@ async fn no_invite_emails_for_txn_rollback() {
 
     // Populate enough users in the database to submit 9 good invites.
     for user in &usernames {
-        app.db_new_user(user);
+        app.db_new_user(user).await;
     }
 
     // Add an invalid username to the end of the invite list to cause the

src/tests/routes/crates/owners/remove.rs

@@ -11,7 +11,7 @@ async fn test_owner_change_with_invalid_json() {
     let (app, _, user) = TestApp::full().with_user().await;
     let mut conn = app.db_conn();
 
-    app.db_new_user("bar");
+    app.db_new_user("bar").await;
     CrateBuilder::new("foo", user.as_model().id).expect_build(&mut conn);
 
     // incomplete input
@@ -42,7 +42,7 @@ async fn test_owner_change_with_invalid_json() {
 #[tokio::test(flavor = "multi_thread")]
 async fn test_unknown_crate() {
     let (app, _, user) = TestApp::full().with_user().await;
-    app.db_new_user("bar");
+    app.db_new_user("bar").await;
 
     let response = user.remove_named_owner("unknown", "bar").await;
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
@@ -80,7 +80,7 @@ async fn test_remove_uppercase_user() {
     use diesel::RunQueryDsl;
 
     let (app, _, cookie) = TestApp::full().with_user().await;
-    let user2 = app.db_new_user("user2");
+    let user2 = app.db_new_user("user2").await;
     let mut conn = app.db_conn();
 
     let krate = CrateBuilder::new("foo", cookie.as_model().id).expect_build(&mut conn);

src/tests/routes/crates/versions/yank_unyank.rs

@@ -65,7 +65,7 @@ async fn yank_by_a_non_owner_fails() {
     let (app, _, _, token) = TestApp::full().with_token().await;
     let mut conn = app.db_conn();
 
-    let another_user = app.db_new_user("bar");
+    let another_user = app.db_new_user("bar").await;
     let another_user = another_user.as_model();
 
     CrateBuilder::new("foo_not", another_user.id)
@@ -369,7 +369,7 @@ mod auth {
         let (app, _, _) = prepare().await;
         let mut conn = app.async_db_conn().await;
 
-        let admin = app.db_new_user("admin");
+        let admin = app.db_new_user("admin").await;
 
         diesel::update(admin.as_model())
             .set(users::is_admin.eq(true))

src/tests/routes/me/tokens/create.rs

@@ -101,7 +101,7 @@ async fn create_token_multiple_users_have_different_values() {
     let (app, _, user1) = TestApp::init().with_user().await;
     let first: Value = user1.put("/api/v1/me/tokens", NEW_BAR).await.good();
 
-    let user2 = app.db_new_user("bar");
+    let user2 = app.db_new_user("bar").await;
     let second: Value = user2.put("/api/v1/me/tokens", NEW_BAR).await.good();
 
     assert_ne!(first["api_token"]["token"], second["api_token"]["token"]);

src/tests/routes/me/tokens/delete.rs

@@ -19,7 +19,7 @@ async fn revoke_token_doesnt_revoke_other_users_token() {
     let mut conn = app.async_db_conn().await;
     let user1 = user1.as_model();
     let token = token.as_model();
-    let user2 = app.db_new_user("baz");
+    let user2 = app.db_new_user("baz").await;
 
     // List tokens for first user contains the token
     let tokens: Vec<ApiToken> = assert_ok!(

src/tests/routes/me/tokens/get.rs

@@ -64,7 +64,7 @@ async fn show_with_anonymous_user() {
 async fn show_other_user_token() {
     let (app, _, user1) = TestApp::init().with_user().await;
     let mut conn = app.db_conn();
-    let user2 = app.db_new_user("baz");
+    let user2 = app.db_new_user("baz").await;
     let user2 = user2.as_model();
 
     let token = assert_ok!(ApiToken::insert(&mut conn, user2.id, "bar"));