From 2dbb085008f68ed56675cf23ea6e1c89af632ea9 Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Sat, 18 Dec 2021 15:39:05 +0100
Subject: use async closures for tests

---
 backend/tests/util/mod.rs | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 backend/tests/util/mod.rs

(limited to 'backend/tests/util')

diff --git a/backend/tests/util/mod.rs b/backend/tests/util/mod.rs
new file mode 100644
index 0000000..3502ddb
--- /dev/null
+++ b/backend/tests/util/mod.rs
@@ -0,0 +1,39 @@
+use std::future::Future;
+
+use diesel::RunQueryDsl;
+use mozaic4_backend::DbConn;
+use rocket::local::asynchronous::Client;
+
+// We use a lock to synchronize between tests so DB operations don't collide.
+// For now. In the future, we'll have a nice way to run each test in a DB
+// transaction so we can regain concurrency.
+static DB_LOCK: parking_lot::Mutex<()> = parking_lot::const_mutex(());
+
+async fn reset_db(db: &DbConn) {
+    db.run(|conn| {
+        diesel::sql_query("TRUNCATE TABLE users, sessions")
+            .execute(conn)
+            .expect("drop all tables");
+    })
+    .await
+}
+
+pub async fn run_test<F, R>(test_closure: F)
+where
+    F: FnOnce(Client, DbConn) -> R,
+    R: Future<Output = ()>,
+{
+    let _lock = DB_LOCK.lock();
+
+    let client = Client::untracked(mozaic4_backend::rocket())
+        .await
+        .expect("failed to create test client");
+    let db = mozaic4_backend::DbConn::get_one(client.rocket())
+        .await
+        .expect("failed to get db connection");
+
+    // make sure we start with a clean DB
+    reset_db(&db).await;
+
+    test_closure(client, db).await;
+}
-- 
cgit v1.2.3


From 52242b03f1af7f73e73592c2e5ee2bc54813a64d Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Sun, 19 Dec 2021 00:16:46 +0100
Subject: simple bot uploads

---
 backend/tests/util/mod.rs | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'backend/tests/util')

diff --git a/backend/tests/util/mod.rs b/backend/tests/util/mod.rs
index 3502ddb..f34e9f3 100644
--- a/backend/tests/util/mod.rs
+++ b/backend/tests/util/mod.rs
@@ -2,7 +2,7 @@ use std::future::Future;
 
 use diesel::RunQueryDsl;
 use mozaic4_backend::DbConn;
-use rocket::local::asynchronous::Client;
+use rocket::{http::Header, local::asynchronous::Client};
 
 // We use a lock to synchronize between tests so DB operations don't collide.
 // For now. In the future, we'll have a nice way to run each test in a DB
@@ -11,9 +11,13 @@ static DB_LOCK: parking_lot::Mutex<()> = parking_lot::const_mutex(());
 
 async fn reset_db(db: &DbConn) {
     db.run(|conn| {
-        diesel::sql_query("TRUNCATE TABLE users, sessions")
-            .execute(conn)
-            .expect("drop all tables");
+        diesel::sql_query(
+            r#"
+            TRUNCATE TABLE users, sessions,
+            bots, code_bundles"#,
+        )
+        .execute(conn)
+        .expect("drop all tables");
     })
     .await
 }
@@ -37,3 +41,19 @@ where
 
     test_closure(client, db).await;
 }
+
+pub struct BearerAuth {
+    token: String,
+}
+
+impl BearerAuth {
+    pub fn new(token: String) -> Self {
+        Self { token }
+    }
+}
+
+impl<'a> Into<Header<'a>> for BearerAuth {
+    fn into(self) -> Header<'a> {
+        Header::new("Authorization", format!("Bearer {}", self.token))
+    }
+}
-- 
cgit v1.2.3