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

Author: Turbo87

src/tests/dump_db.rs

@@ -15,7 +15,7 @@ static PATH_DATE_RE: LazyLock<Regex> =
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_dump_db_job() {
-    let (app, _, _, token) = TestApp::full().with_token();
+    let (app, _, _, token) = TestApp::full().with_token().await;
     let mut conn = app.db_conn();
 
     CrateBuilder::new("test-crate", token.as_model().user_id).expect_build(&mut conn);

src/tests/github_secret_scanning.rs

@@ -41,7 +41,10 @@ fn github_mock() -> MockGitHubClient {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn github_secret_alert_revokes_token() {
-    let (app, anon, user, token) = TestApp::init().with_github(github_mock()).with_token();
+    let (app, anon, user, token) = TestApp::init()
+        .with_github(github_mock())
+        .with_token()
+        .await;
     let mut conn = app.async_db_conn().await;
 
     // Ensure no emails were sent up to this point
@@ -99,7 +102,10 @@ async fn github_secret_alert_revokes_token() {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn github_secret_alert_for_revoked_token() {
-    let (app, anon, user, token) = TestApp::init().with_github(github_mock()).with_token();
+    let (app, anon, user, token) = TestApp::init()
+        .with_github(github_mock())
+        .with_token()
+        .await;
     let mut conn = app.async_db_conn().await;
 
     // Ensure no emails were sent up to this point
@@ -160,7 +166,10 @@ async fn github_secret_alert_for_revoked_token() {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn github_secret_alert_for_unknown_token() {
-    let (app, anon, user, token) = TestApp::init().with_github(github_mock()).with_token();
+    let (app, anon, user, token) = TestApp::init()
+        .with_github(github_mock())
+        .with_token()
+        .await;
     let mut conn = app.async_db_conn().await;
 
     // Ensure no emails were sent up to this point

src/tests/issues/issue1205.rs

@@ -9,7 +9,10 @@ use insta::assert_snapshot;
 async fn test_issue_1205() -> anyhow::Result<()> {
     const CRATE_NAME: &str = "deepspeech-sys";
 
-    let (app, _, _, user) = TestApp::full().with_github(github_mock()).with_token();
+    let (app, _, _, user) = TestApp::full()
+        .with_github(github_mock())
+        .with_token()
+        .await;
 
     let mut conn = app.db_conn();
 

src/tests/krate/following.rs

@@ -117,7 +117,7 @@ async fn test_api_token_auth() {
     const CRATE_TO_FOLLOW: &str = "some_crate_to_follow";
     const CRATE_NOT_TO_FOLLOW: &str = "another_crate";
 
-    let (app, _, user, token) = TestApp::init().with_token();
+    let (app, _, user, token) = TestApp::init().with_token().await;
     let mut conn = app.db_conn();
     let api_token = token.as_model();
 

src/tests/krate/publish/audit_action.rs

@@ -6,7 +6,7 @@ async fn publish_records_an_audit_action() {
     use crate::tests::builders::PublishBuilder;
     use crate::tests::util::{RequestHelper, TestApp};
 
-    let (app, anon, _, token) = TestApp::full().with_token();
+    let (app, anon, _, token) = TestApp::full().with_token().await;
 
     let mut conn = app.db_conn();
     assert!(VersionOwnerAction::all(&mut conn).unwrap().is_empty());

src/tests/krate/publish/auth.rs

@@ -9,7 +9,7 @@ use insta::assert_snapshot;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn new_wrong_token() {
-    let (app, anon, _, token) = TestApp::full().with_token();
+    let (app, anon, _, token) = TestApp::full().with_token().await;
     let mut conn = app.async_db_conn().await;
 
     // Try to publish without a token

src/tests/krate/publish/basics.rs

@@ -43,7 +43,7 @@ async fn new_krate() {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn new_krate_with_token() {
-    let (app, _, _, token) = TestApp::full().with_token();
+    let (app, _, _, token) = TestApp::full().with_token().await;
 
     let crate_to_publish = PublishBuilder::new("foo_new", "1.0.0");
     let response = token.publish_crate(crate_to_publish).await;
@@ -64,7 +64,7 @@ async fn new_krate_with_token() {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn new_krate_weird_version() {
-    let (app, _, _, token) = TestApp::full().with_token();
+    let (app, _, _, token) = TestApp::full().with_token().await;
 
     let crate_to_publish = PublishBuilder::new("foo_weird", "0.0.0-pre");
     let response = token.publish_crate(crate_to_publish).await;
@@ -85,7 +85,7 @@ async fn new_krate_weird_version() {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn new_krate_twice() {
-    let (app, _, _, token) = TestApp::full().with_token();
+    let (app, _, _, token) = TestApp::full().with_token().await;
 
     let crate_to_publish = PublishBuilder::new("foo_twice", "0.99.0");
     token.publish_crate(crate_to_publish).await.good();
@@ -116,7 +116,7 @@ async fn new_krate_twice() {
 // The primary purpose is to verify that the `default_version` we provide is as expected.
 #[tokio::test(flavor = "multi_thread")]
 async fn new_krate_twice_alt() {
-    let (app, _, _, token) = TestApp::full().with_token();
+    let (app, _, _, token) = TestApp::full().with_token().await;
 
     let crate_to_publish =
         PublishBuilder::new("foo_twice", "2.0.0").description("2.0.0 description");
@@ -145,7 +145,7 @@ async fn new_krate_twice_alt() {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn new_krate_duplicate_version() {
-    let (app, _, user, token) = TestApp::full().with_token();
+    let (app, _, user, token) = TestApp::full().with_token().await;
     let mut conn = app.db_conn();
 
     // Insert a crate directly into the database and then we'll try to publish the same version

src/tests/krate/publish/build_metadata.rs

@@ -5,7 +5,7 @@ use insta::assert_json_snapshot;
 use serde_json::json;
 
 async fn version_with_build_metadata(v1: &str, v2: &str, expected_error: &str) {
-    let (_app, _anon, _cookie, token) = TestApp::full().with_token();
+    let (_app, _anon, _cookie, token) = TestApp::full().with_token().await;
 
     let response = token.publish_crate(PublishBuilder::new("foo", v1)).await;
     assert_eq!(response.status(), StatusCode::OK);

src/tests/krate/publish/categories.rs

@@ -10,7 +10,7 @@ use insta::{assert_json_snapshot, assert_snapshot};
 
 #[tokio::test(flavor = "multi_thread")]
 async fn good_categories() {
-    let (app, _, _, token) = TestApp::full().with_token();
+    let (app, _, _, token) = TestApp::full().with_token().await;
     let mut conn = app.async_db_conn().await;
 
     insert_into(categories::table)
@@ -30,7 +30,7 @@ async fn good_categories() {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn ignored_categories() {
-    let (_, _, _, token) = TestApp::full().with_token();
+    let (_, _, _, token) = TestApp::full().with_token().await;
 
     let crate_to_publish = PublishBuilder::new("foo_ignored_cat", "1.0.0").category("bar");
     let response = token.publish_crate(crate_to_publish).await;
@@ -40,7 +40,7 @@ async fn ignored_categories() {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn too_many_categories() {
-    let (app, _, _, token) = TestApp::full().with_token();
+    let (app, _, _, token) = TestApp::full().with_token().await;
 
     let response = token
         .publish_crate(

src/tests/krate/publish/deleted_crates.rs

@@ -10,7 +10,7 @@ use insta::assert_snapshot;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_recently_deleted_crate_with_same_name() -> anyhow::Result<()> {
-    let (app, _, _, token) = TestApp::full().with_token();
+    let (app, _, _, token) = TestApp::full().with_token().await;
     let mut conn = app.async_db_conn().await;
 
     let now = Utc::now();