Commit85a734f

authored and

committed

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

1 parent0eb4f7f commit85a734fCopy full SHA for 85a734f

File tree

+28

-2

lines changed

+28

-2

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,14 @@ List MR-level MR approval rules::`
`75`	`75`
`76`	`76`	`mr.approval_rules.list()`
`77`	`77`
	`78`	`+Delete MR-level MR approval rule::`
	`79`	`+`
	`80`	`+ rules = mr.approval_rules.list()`
	`81`	`+ rules[0].delete()`
	`82`	`+`
	`83`	`+ # or`
	`84`	`+ mr.approval_rules.delete(approval_id)`
	`85`	`+`
`78`	`86`	`Change MR-level MR approval rule::`
`79`	`87`
`80`	`88`	`mr_approvalrule.user_ids = [105]`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ def set_approvers(`
`163`	`163`	`returnapproval_rules.create(data=data)`
`164`	`164`
`165`	`165`
`166`		`-classProjectMergeRequestApprovalRule(SaveMixin,RESTObject):`
	`166`	`+classProjectMergeRequestApprovalRule(SaveMixin,ObjectDeleteMixin,RESTObject):`
`167`	`167`	`_id_attr="approval_rule_id"`
`168`	`168`	`_short_print_attr="approval_rule"`
`169`	`169`	`id:int`
`@@ -192,7 +192,7 @@ def save(self, **kwargs: Any) -> None:`
`192`	`192`
`193`	`193`
`194`	`194`	`classProjectMergeRequestApprovalRuleManager(`
`195`		`-ListMixin,UpdateMixin,CreateMixin,RESTManager`
	`195`	`+ListMixin,UpdateMixin,CreateMixin,DeleteMixin,RESTManager`
`196`	`196`	`):`
`197`	`197`	`_path="/projects/{project_id}/merge_requests/{mr_iid}/approval_rules"`
`198`	`198`	`_obj_cls=ProjectMergeRequestApprovalRule`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,19 @@ def resp_mr_approval_rules():`
`139`	`139`	`yieldrsps`
`140`	`140`
`141`	`141`
	`142`	`+@pytest.fixture`
	`143`	`+defresp_delete_mr_approval_rule(no_content):`
	`144`	`+withresponses.RequestsMock()asrsps:`
	`145`	`+rsps.add(`
	`146`	`+method=responses.DELETE,`
	`147`	`+url="http://localhost/api/v4/projects/1/merge_requests/1/approval_rules/1",`
	`148`	`+json=no_content,`
	`149`	`+content_type="application/json",`
	`150`	`+status=204,`
	`151`	`+ )`
	`152`	`+yieldrsps`
	`153`	`+`
	`154`	`+`
`142`	`155`	`deftest_project_approval_manager_update_uses_post(project):`
`143`	`156`	`"""Ensure the`
`144`	`157`	`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):`
`157`	`170`	`assertapproval_rules[0].id==approval_rule_id`
`158`	`171`
`159`	`172`
	`173`	`+deftest_delete_merge_request_approval_rule(project,resp_delete_mr_approval_rule):`
	`174`	`+merge_request=project.mergerequests.get(1,lazy=True)`
	`175`	`+merge_request.approval_rules.delete(approval_rule_id)`
	`176`	`+`
	`177`	`+`
`160`	`178`	`deftest_update_merge_request_approvals_set_approvers(project,resp_mr_approval_rules):`
`161`	`179`	`approvals=project.mergerequests.get(1,lazy=True).approvals`
`162`	`180`	`assertisinstance(`

Comments

(0)