feat(merge_request_approvals): add support for deleting MR approval rules

nejch · JohnVillalovos · commit 85a734fec311 · 2022-02-13T10:45:22.000-08:00
diff --git a/docs/gl_objects/merge_request_approvals.rst b/docs/gl_objects/merge_request_approvals.rst
@@ -75,6 +75,14 @@ List MR-level MR approval rules::
 
 	mr.approval_rules.list()
 
+Delete MR-level MR approval rule::
+
+    rules = mr.approval_rules.list()
+    rules[0].delete()
+
+    # or
+    mr.approval_rules.delete(approval_id)
+
 Change MR-level MR approval rule::
 
 	mr_approvalrule.user_ids = [105]
diff --git a/gitlab/v4/objects/merge_request_approvals.py b/gitlab/v4/objects/merge_request_approvals.py
@@ -163,7 +163,7 @@ def set_approvers(
         return approval_rules.create(data=data)
 
 
-class ProjectMergeRequestApprovalRule(SaveMixin, RESTObject):
+class ProjectMergeRequestApprovalRule(SaveMixin, ObjectDeleteMixin, RESTObject):
     _id_attr = "approval_rule_id"
     _short_print_attr = "approval_rule"
     id: int
@@ -192,7 +192,7 @@ def save(self, **kwargs: Any) -> None:
 
 
 class ProjectMergeRequestApprovalRuleManager(
-    ListMixin, UpdateMixin, CreateMixin, RESTManager
+    ListMixin, UpdateMixin, CreateMixin, DeleteMixin, RESTManager
 ):
     _path = "/projects/{project_id}/merge_requests/{mr_iid}/approval_rules"
     _obj_cls = ProjectMergeRequestApprovalRule
diff --git a/tests/unit/objects/test_project_merge_request_approvals.py b/tests/unit/objects/test_project_merge_request_approvals.py
@@ -139,6 +139,19 @@ def resp_mr_approval_rules():
         yield rsps
 
 
+@pytest.fixture
+def resp_delete_mr_approval_rule(no_content):
+    with responses.RequestsMock() as rsps:
+        rsps.add(
+            method=responses.DELETE,
+            url="http://localhost/api/v4/projects/1/merge_requests/1/approval_rules/1",
+            json=no_content,
+            content_type="application/json",
+            status=204,
+        )
+        yield rsps
+
+
 def test_project_approval_manager_update_uses_post(project):
     """Ensure the
     gitlab.v4.objects.merge_request_approvals.ProjectApprovalManager object has
@@ -157,6 +170,11 @@ def test_list_merge_request_approval_rules(project, resp_mr_approval_rules):
     assert approval_rules[0].id == approval_rule_id
 
 
+def test_delete_merge_request_approval_rule(project, resp_delete_mr_approval_rule):
+    merge_request = project.mergerequests.get(1, lazy=True)
+    merge_request.approval_rules.delete(approval_rule_id)
+
+
 def test_update_merge_request_approvals_set_approvers(project, resp_mr_approval_rules):
     approvals = project.mergerequests.get(1, lazy=True).approvals
     assert isinstance(
