3 files changed, 128 insertions, 24 deletions

diff --git a/backend/tests/bots.rs b/backend/tests/bots.rs
new file mode 100644
index 0000000..fe81712
--- /dev/null
+++ b/backend/tests/bots.rs
@@ -0,0 +1,98 @@
+#![feature(async_closure)]
+extern crate mozaic4_backend;
+extern crate zip;
+
+use rocket::http::{ContentType, Status};
+
+mod util;
+use mozaic4_backend::db::{bots, sessions, users};
+use mozaic4_backend::DbConn;
+use sessions::Session;
+use users::{Credentials, User};
+use util::{run_test, BearerAuth};
+
+async fn user_with_session(conn: &DbConn) -> (User, Session) {
+    conn.run(|conn| {
+        let credentials = Credentials {
+            username: "piepkonijn",
+            password: "geheim123",
+        };
+        let user = users::create_user(&credentials, conn).unwrap();
+        let session = sessions::create_session(&user, conn);
+        (user, session)
+    })
+    .await
+}
+
+#[rocket::async_test]
+async fn test_bot_create() {
+    run_test(async move |client, conn| {
+        let (user, session) = user_with_session(&conn).await;
+
+        let response = client
+            .post("/bots")
+            .header(BearerAuth::new(session.token.clone()))
+            .header(ContentType::JSON)
+            .body(
+                r#"{
+                "name": "testbot"
+            }"#,
+            )
+            .dispatch()
+            .await;
+
+        assert_eq!(response.status(), Status::Created);
+        assert_eq!(response.content_type(), Some(ContentType::JSON));
+
+        let resp_text = response.into_string().await.unwrap();
+        let json: serde_json::Value = serde_json::from_str(&resp_text).unwrap();
+        assert_eq!(json["name"], "testbot");
+        assert_eq!(json["owner_id"], user.id);
+    })
+    .await
+}
+
+// create an example zipfile for bot upload
+fn create_zip() -> std::io::Result<Vec<u8>> {
+    use std::io::Write;
+    use zip::write::FileOptions;
+
+    let cursor = std::io::Cursor::new(Vec::new());
+    let mut zip = zip::ZipWriter::new(cursor);
+
+    zip.start_file("test.txt", FileOptions::default())?;
+    zip.write_all(b"sup brudi")?;
+    let buf = zip.finish()?;
+    Ok(buf.into_inner())
+}
+
+#[rocket::async_test]
+async fn test_bot_upload() {
+    run_test(async move |client, conn| {
+        let (user, session) = user_with_session(&conn).await;
+
+        let owner_id = user.id;
+        let bot = conn
+            .run(move |conn| {
+                let new_bot = bots::NewBot {
+                    name: "testbot",
+                    owner_id: owner_id,
+                };
+                bots::create_bot(&new_bot, conn).unwrap()
+            })
+            .await;
+
+        let zip_file = create_zip().unwrap();
+
+        let response = client
+            .post(format!("/bots/{}/upload", bot.id))
+            .header(BearerAuth::new(session.token.clone()))
+            .header(ContentType::JSON)
+            .body(zip_file)
+            .dispatch()
+            .await;
+
+        assert_eq!(response.status(), Status::Created);
+    })
+    .await
+}
diff --git a/backend/tests/login.rs b/backend/tests/login.rs
index b4e07e3..60c5d6f 100644
--- a/backend/tests/login.rs
+++ b/backend/tests/login.rs
@@ -1,27 +1,11 @@
 #![feature(async_closure)]
 extern crate mozaic4_backend;
 
-use rocket::http::{ContentType, Header, Status};
+use rocket::http::{ContentType, Status};
 
 mod util;
 use util::run_test;
 
-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))
-    }
-}
-
 #[rocket::async_test]
 async fn test_registration() {
     run_test(async move |client, _conn| {
@@ -47,7 +31,7 @@ async fn test_registration() {
 
         let response = client
             .get("/users/me")
-            .header(BearerAuth::new(token))
+            .header(util::BearerAuth::new(token))
             .dispatch()
             .await;
 
@@ -56,7 +40,8 @@ async fn test_registration() {
         let resp = response.into_string().await.unwrap();
         let json: serde_json::Value = serde_json::from_str(&resp).unwrap();
         assert_eq!(json["username"], "piepkonijn");
-    }).await
+    })
+    .await
 }
 
 #[rocket::async_test]
@@ -71,5 +56,6 @@ async fn test_reject_invalid_credentials() {
 
         assert_eq!(response.status(), Status::Forbidden);
         // assert_eq!(response.content_type(), Some(ContentType::JSON));
-    }).await
+    })
+    .await
 }
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))
+    }
+}