test: add approve_wait_for_ci

Author: Sakib25800

src/bors/handlers/review.rs

@@ -37,6 +37,7 @@ pub(super) async fn command_approve(
     };
 
     if repo_state.config.load().wait_on_ci_approval {
+        tracing::debug!("Checking CI status for PR {}", pr.number);
         // Get all the check suites for the PR.
         let checks = repo_state
             .client
@@ -273,18 +274,20 @@ async fn notify_of_pending_approval(
 
 #[cfg(test)]
 mod tests {
+    use tracing_test::traced_test;
+
     use crate::{
         github::PullRequestNumber,
         tests::mocks::{
-            default_pr_number, default_repo_name, run_test, BorsBuilder, BorsTester, Permissions,
-            PullRequestChangeEvent, User, World,
+            default_pr_number, default_repo_name, run_test, BorsBuilder, BorsTester, Branch,
+            Permissions, PullRequestChangeEvent, User, World,
         },
     };
 
     #[sqlx::test]
     async fn default_approve(pool: sqlx::PgPool) {
         BorsBuilder::new(pool)
-            .world(create_world_with_approve_config())
+            .world(create_world_with_immediate_approve_config())
             .run_test(|mut tester| async {
                 tester.post_comment("@bors r+").await?;
                 assert_eq!(
@@ -310,7 +313,7 @@ mod tests {
     #[sqlx::test]
     async fn approve_on_behalf(pool: sqlx::PgPool) {
         BorsBuilder::new(pool)
-            .world(create_world_with_approve_config())
+            .world(create_world_with_immediate_approve_config())
             .run_test(|mut tester| async {
                 let approve_user = "user1";
                 tester
@@ -351,7 +354,7 @@ mod tests {
     #[sqlx::test]
     async fn unapprove(pool: sqlx::PgPool) {
         BorsBuilder::new(pool)
-            .world(create_world_with_approve_config())
+            .world(create_world_with_immediate_approve_config())
             .run_test(|mut tester| async {
                 tester.post_comment("@bors r+").await?;
                 assert_eq!(
@@ -382,7 +385,7 @@ mod tests {
     #[sqlx::test]
     async fn unapprove_on_base_edited(pool: sqlx::PgPool) {
         BorsBuilder::new(pool)
-            .world(create_world_with_approve_config())
+            .world(create_world_with_immediate_approve_config())
             .run_test(|mut tester| async {
                 tester.post_comment("@bors r+").await?;
                 assert_eq!(
@@ -416,7 +419,7 @@ PR will need to be re-approved."#,
     #[sqlx::test]
     async fn edit_pr_do_nothing_when_base_not_edited(pool: sqlx::PgPool) {
         BorsBuilder::new(pool)
-            .world(create_world_with_approve_config())
+            .world(create_world_with_immediate_approve_config())
             .run_test(|mut tester| async {
                 tester.post_comment("@bors r+").await?;
                 assert_eq!(
@@ -468,7 +471,7 @@ PR will need to be re-approved."#,
     #[sqlx::test]
     async fn unapprove_on_push(pool: sqlx::PgPool) {
         BorsBuilder::new(pool)
-            .world(create_world_with_approve_config())
+            .world(create_world_with_immediate_approve_config())
             .run_test(|mut tester| async {
                 tester.post_comment("@bors r+").await?;
                 assert_eq!(
@@ -506,14 +509,47 @@ PR will need to be re-approved."#,
         .await;
     }
 
-    fn create_world_with_approve_config() -> World {
+    #[traced_test]
+    #[sqlx::test]
+    async fn approve_wait_for_ci(pool: sqlx::PgPool) {
+        BorsBuilder::new(pool)
+            .world(create_world_with_ci_approved_config())
+            .run_test(|mut tester| async {
+                tester.post_comment("@bors r+").await?;
+                assert_eq!(
+                    tester.get_comment().await?,
+                    ":hourglass_flowing_sand: Waiting for CI checks to complete before approving..."
+                );
+                Ok(tester)
+            })
+            .await;
+    }
+
+    fn create_world_with_immediate_approve_config() -> World {
+        let world = World::default();
+        world.default_repo().lock().set_config(
+            r#"
+wait_on_ci_approval = false
+[labels]
+approve = ["+approved"]
+"#,
+        );
+        world
+    }
+
+    fn create_world_with_ci_approved_config() -> World {
         let world = World::default();
         world.default_repo().lock().set_config(
             r#"
+wait_on_ci_approval = true
 [labels]
 approve = ["+approved"]
 "#,
         );
+        world.default_repo().lock().branches.push(Branch::new(
+            &format!("pr-{}", default_pr_number()),
+            &format!("pr-{}-sha", default_pr_number()),
+        ));
         world
     }