Merge pull request python-gitlab#1039 from python-gitlab/fix/set-approvers

max-wittig · web-flow · commit 481bd4f70e89 · 2020-03-08T12:17:07.000+01:00
Fix/set approvers
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
@@ -2762,12 +2762,13 @@ def set_approvers(
             self._parent.get_id(),
         )
         data = {
+            "name": "name",
             "approvals_required": approvals_required,
             "rule_type": "regular",
             "user_ids": approver_ids,
             "group_ids": approver_group_ids,
         }
-        self.gitlab.http_put(path, post_data=data, **kwargs)
+        self.gitlab.http_post(path, post_data=data, **kwargs)
 
 
 class ProjectMergeRequestAwardEmoji(ObjectDeleteMixin, RESTObject):
diff --git a/tools/ee-test.py b/tools/ee-test.py
@@ -56,12 +56,12 @@ def end_log():
 
 ars = project1.approvalrules.list(all=True)
 assert len(ars) == 0
-project.approvalrules.create(
+project1.approvalrules.create(
     {"name": "approval-rule", "approvals_required": 1, "group_ids": [group1.id]}
 )
 ars = project1.approvalrules.list(all=True)
 assert len(ars) == 1
-ars[0].approvals_required == 2
+assert ars[0].approvals_required == 2
 ars[0].save()
 ars = project1.approvalrules.list(all=True)
 assert len(ars) == 1

Original file line number	Diff line number	Diff line change
`@@ -2762,12 +2762,13 @@ def set_approvers(`
`2762`	`2762`	`self._parent.get_id(),`
`2763`	`2763`	`)`
`2764`	`2764`	`data = {`
	`2765`	`+ "name": "name",`
`2765`	`2766`	`"approvals_required": approvals_required,`
`2766`	`2767`	`"rule_type": "regular",`
`2767`	`2768`	`"user_ids": approver_ids,`
`2768`	`2769`	`"group_ids": approver_group_ids,`
`2769`	`2770`	`}`
`2770`		`- self.gitlab.http_put(path, post_data=data, **kwargs)`
	`2771`	`+ self.gitlab.http_post(path, post_data=data, **kwargs)`
`2771`	`2772`
`2772`	`2773`
`2773`	`2774`	`class ProjectMergeRequestAwardEmoji(ObjectDeleteMixin, RESTObject):`