fix: approve mr before merging when testing cli

TimKnight-DWP · TimKnight-DWP · commit e892070206cb · 2024-02-09T15:08:01.000Z
Signed-off-by: Tim Knight &lt;tim.knight1@engineering.digital.dwp.gov.uk&gt;
diff --git a/tests/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py
@@ -234,7 +234,6 @@ def test_create_merge_request(gitlab_cli, project):
 
 def test_accept_request_merge(gitlab_cli, project, wait_for_sidekiq):
     # MR needs at least 1 commit before we can merge
-    # TODO: use the conftest parts to make the MR and then merge via CLI
     mr = project.mergerequests.list()[0]
     file_data = {
         "branch": mr.source_branch,
@@ -246,11 +245,21 @@ def test_accept_request_merge(gitlab_cli, project, wait_for_sidekiq):
     time.sleep(2)
     wait_for_sidekiq(timeout=60)
 
-    approval_rules = project.approvalrules.list()
-    logging.info(f"Project MR Approval Rules {approval_rules}")
-
     logging.info(f"MR status: {mr.state}")
-    logging.info(f"MR merge status: {mr.detailed_merge_status}")
+    mr_merge_status = mr.detailed_merge_status
+    logging.info(f"MR merge status: {mr_merge_status}")
+
+    # Approval is required before merge
+    if mr_merge_status == "not_approved":
+        logging.info("Approving MR")
+        cmd = [
+            "project-merge-request",
+            "approve",
+            "--project-id",
+            project.id,
+            "--iid",
+            mr.iid,
+        ]
 
     time.sleep(0.5)
     cmd = [
