Merge pull request #217 from Sakib25800/refactor/prebuilt-test-users

Improve tests regarding permissions

Author: Kobzol

src/bors/handlers/review.rs

@@ -297,38 +297,33 @@ mod tests {
 
     #[sqlx::test]
     async fn insufficient_permission_approve(pool: sqlx::PgPool) {
-        let world = World::default();
-        world.default_repo().lock().permissions = Permissions::default();
-
-        BorsBuilder::new(pool)
-            .world(world)
-            .run_test(|mut tester| async {
-                tester.post_comment("@bors try").await?;
-                assert_eq!(
-                    tester.get_comment().await?,
-                    "@default-user: :key: Insufficient privileges: not in try users"
-                );
-                Ok(tester)
-            })
-            .await;
+        run_test(pool, |mut tester| async {
+            tester
+                .post_comment(Comment::from("@bors try").with_author(User::unprivileged()))
+                .await?;
+            assert_eq!(
+                tester.get_comment().await?,
+                "@unprivileged-user: :key: Insufficient privileges: not in try users"
+            );
+            Ok(tester)
+        })
+        .await;
     }
 
     #[sqlx::test]
     async fn insufficient_permission_set_priority(pool: sqlx::PgPool) {
-        let world = World::default();
-        world.default_repo().lock().permissions = Permissions::default();
-
-        BorsBuilder::new(pool)
-            .world(world)
-            .run_test(|mut tester| async {
-                tester.post_comment("@bors p=2").await?;
-                assert_eq!(
-                    tester.get_comment().await?,
-                    "@default-user: :key: Insufficient privileges: not in review users"
-                );
-                Ok(tester)
-            })
-            .await;
+        run_test(pool, |mut tester| async {
+            tester
+                .post_comment(Comment::from("@bors p=2").with_author(User::unprivileged()))
+                .await?;
+            tester.post_comment("@bors p=2").await?;
+            assert_eq!(
+                tester.get_comment().await?,
+                "@unprivileged-user: :key: Insufficient privileges: not in review users"
+            );
+            Ok(tester)
+        })
+        .await;
     }
 
     #[sqlx::test]

src/bors/handlers/trybuild.rs

@@ -334,7 +334,7 @@ mod tests {
     use crate::database::BuildStatus;
     use crate::github::CommitSha;
     use crate::tests::mocks::{
-        default_pr_number, default_repo_name, run_test, BorsBuilder, Permissions, Workflow,
+        default_pr_number, default_repo_name, run_test, BorsBuilder, Comment, User, Workflow,
         WorkflowEvent, World,
     };
 
@@ -380,20 +380,32 @@ mod tests {
 
     #[sqlx::test]
     async fn try_no_permissions(pool: sqlx::PgPool) {
-        let world = World::default();
-        world.get_repo(default_repo_name()).lock().permissions = Permissions::default();
+        run_test(pool, |mut tester| async {
+            tester
+                .post_comment(Comment::from("@bors try").with_author(User::unprivileged()))
+                .await?;
+            assert_eq!(
+                tester.get_comment().await?,
+                "@unprivileged-user: :key: Insufficient privileges: not in try users"
+            );
+            Ok(tester)
+        })
+        .await;
+    }
 
-        BorsBuilder::new(pool)
-            .world(world)
-            .run_test(|mut tester| async {
-                tester.post_comment("@bors try").await?;
-                assert_eq!(
-                    tester.get_comment().await?,
-                    "@default-user: :key: Insufficient privileges: not in try users"
-                );
-                Ok(tester)
-            })
-            .await;
+    #[sqlx::test]
+    async fn try_only_requires_try_permission(pool: sqlx::PgPool) {
+        run_test(pool, |mut tester| async {
+            tester
+                .post_comment(Comment::from("@bors try").with_author(User::try_user()))
+                .await?;
+            assert_eq!(
+                tester.get_comment().await?,
+                ":hourglass: Trying commit pr-1-sha with merge merge-main-sha1-pr-1-sha-0…"
+            );
+            Ok(tester)
+        })
+        .await;
     }
 
     #[sqlx::test]

src/tests/mocks/repository.rs

@@ -116,6 +116,11 @@ timeout = 3600
             User::default(),
             vec![PermissionType::Try, PermissionType::Review],
         );
+        users.insert(User::try_user(), vec![PermissionType::Try]);
+        users.insert(
+            User::reviewer(),
+            vec![PermissionType::Try, PermissionType::Review],
+        );
 
         Self::new(
             default_repo_name().owner(),

src/tests/mocks/user.rs

@@ -16,6 +16,18 @@ impl User {
         Self::new(102, "bors-bot")
     }
 
+    pub fn unprivileged() -> Self {
+        Self::new(103, "unprivileged-user")
+    }
+
+    pub fn try_user() -> Self {
+        Self::new(104, "try-user")
+    }
+
+    pub fn reviewer() -> Self {
+        Self::new(105, "reviewer")
+    }
+
     pub fn new(id: u64, name: &str) -> Self {
         Self {
             github_id: id,