Repository navigation
Commit a656629
committed
fix(cli): project-merge-request-approval-rule
Using the CLI the command:
gitlab project-merge-request-approval-rule list --mr-iid 1 --project-id foo/bar
Would raise an exception. This was due to the fact that `_id_attr` and
`_repr_attr` were set for keys which are not returned in the response.
Closes: #20651 parent ae7d3b0 commit a656629
2 files changed
Lines changed: 15 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -165,8 +165,6 @@ def set_approvers( | |||
| 165 | 165 | ||
| 166 | 166 | ||
| 167 | 167 | class ProjectMergeRequestApprovalRule(SaveMixin, ObjectDeleteMixin, RESTObject): | |
| 168 | - _id_attr = "approval_rule_id" | ||
| 169 | - _repr_attr = "approval_rule" | ||
| 170 | 168 | id: int | |
| 171 | 169 | approval_rule_id: int | |
| 172 | 170 | merge_request_iid: int | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -224,6 +224,21 @@ def test_create_merge_request(gitlab_cli, project): | |||
| 224 | 224 | assert ret.success | |
| 225 | 225 | ||
| 226 | 226 | ||
| 227 | + def test_project_merge_request_approval_rule(gitlab_cli, project): | ||
| 228 | + mr = project.mergerequests.list()[0] | ||
| 229 | + cmd = [ | ||
| 230 | + "project-merge-request-approval-rule", | ||
| 231 | + "list", | ||
| 232 | + "--project-id", | ||
| 233 | + project.id, | ||
| 234 | + "--iid", | ||
| 235 | + mr.iid, | ||
| 236 | + ] | ||
| 237 | + ret = gitlab_cli(cmd) | ||
| 238 | + | ||
| 239 | + assert ret.success | ||
| 240 | + | ||
| 241 | + | ||
| 227 | 242 | def test_accept_request_merge(gitlab_cli, project): | |
| 228 | 243 | # MR needs at least 1 commit before we can merge | |
| 229 | 244 | mr = project.mergerequests.list()[0] | |
0 commit comments