8000 fix(test): use different ids for merge request, approval rule, project · python-gitlab/python-gitlab@c23e6bd · GitHub
[go: up one dir, main page]
Skip to content

Commit c23e6bd

Browse files
SjordJohnVillalovos
Sjord
authored and
JohnVillalovos
committed
fix(test): use different ids for merge request, approval rule, project
The original bug was that the merge request identifier was used instead of the approval rule identifier. The test didn't notice that because it used `1` for all identifiers. Make these identifiers different so that a mixup will become apparent.
1 parent b8b3849 commit c23e6bd

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

‎tests/unit/objects/test_project_merge_request_approvals.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import gitlab
1111
from gitlab.mixins import UpdateMethod
1212

13-
approval_rule_id = 1
13+
approval_rule_id = 7
1414
approval_rule_name = "security"
1515
approvals_required = 3
1616
user_ids = [5, 50]
@@ -96,21 +96,21 @@ def resp_mr_approval_rules():
9696
with responses.RequestsMock(assert_all_requests_are_fired=False) as rsps:
9797
rsps.add(
9898
method=responses.GET,
99-
url="http://localhost/api/v4/projects/1/merge_requests/1/approval_rules",
99+
url="http://localhost/api/v4/projects/1/merge_requests/3/approval_rules",
100100
json=mr_ars_content,
101101
content_type="application/json",
102102
status=200,
103103
)
104104
rsps.add(
105105
method=responses.GET,
106-
url="http://localhost/api/v4/projects/1/merge_requests/1/approval_rules/1",
106+
url="http://localhost/api/v4/projects/1/merge_requests/3/approval_rules/7",
107107
json=mr_ars_content[0],
108108
content_type="application/json",
109109
status=200,
110110
)
111111
rsps.add(
112112
method=responses.GET,
113-
url="http://localhost/api/v4/projects/1/merge_requests/1/approval_state",
113+
url="http://localhost/api/v4/projects/1/merge_requests/3/approval_state",
114114
json=mr_approval_state_content,
115115
content_type="application/json",
116116
status=200,
@@ -122,7 +122,7 @@ def resp_mr_approval_rules():
122122

123123
rsps.add(
124124
method=responses.POST,
125-
url="http://localhost/api/v4/projects/1/merge_requests/1/approval_rules",
125+
url="http://localhost/api/v4/projects/1/merge_requests/3/approval_rules",
126126
json=new_mr_ars_content,
127127
content_type="application/json",
128128
status=200,
@@ -139,7 +139,7 @@ def resp_mr_approval_rules():
139139

140140
rsps.add(
141141
method=responses.PUT,
142-
url="http://localhost/api/v4/projects/1/merge_requests/1/approval_rules/1",
142+
url="http://localhost/api/v4/projects/1/merge_requests/3/approval_rules/7",
143143
json=updated_mr_ars_content,
144144
content_type="application/json",
145145
status=200,
@@ -152,7 +152,7 @@ def resp_delete_mr_approval_rule():
152152
with responses.RequestsMock() as rsps:
153153
rsps.add(
154154
method=responses.DELETE,
155-
url="http://localhost/api/v4/projects/1/merge_requests/1/approval_rules/1",
155+
url="http://localhost/api/v4/projects/1/merge_requests/3/approval_rules/7",
156156
status=204,
157157
)
158158
yield rsps
@@ -170,20 +170,20 @@ def test_project_approval_manager_update_method_post(project):
170170

171171

172172
def test_list_merge_request_approval_rules(project, resp_mr_approval_rules):
173-
approval_rules = project.mergerequests.get(1, lazy=True).approval_rules.list()
173+
approval_rules = project.mergerequests.get(3, lazy=True).approval_rules.list()
174174
assert len(approval_rules) == 1
175175
assert approval_rules[0].name == approval_rule_name
176176
assert approval_rules[0].id == approval_rule_id
177177
repr(approval_rules) # ensure that `repr()` doesn't raise an exception
178178

179179

180180
def test_delete_merge_request_approval_rule(project, resp_delete_mr_approval_rule):
181-
merge_request = project.mergerequests.get(1, lazy=True)
181+
merge_request = project.mergerequests.get(3, lazy=True)
182182
merge_request.approval_rules.delete(approval_rule_id)
183183

184184

185185
def test_update_merge_request_approvals_set_approvers(project, resp_mr_approval_rules):
186-
approvals = project.mergerequests.get(1, lazy=True).approvals
186+
approvals = project.mergerequests.get(3, lazy=True).approvals
187187
assert isinstance(
188188
approvals,
189189
gitlab.v4.objects.merge_request_approvals.ProjectMergeRequestApprovalManager,
@@ -203,7 +203,7 @@ def test_update_merge_request_approvals_set_approvers(project, resp_mr_approval_
203203

204204

205205
def test_create_merge_request_approvals_set_approvers(project, resp_mr_approval_rules):
206-
approvals = project.mergerequests.get(1, lazy=True).approvals
206+
approvals = project.mergerequests.get(3, lazy=True).approvals
207207
assert isinstance(
208208
approvals,
209209
gitlab.v4.objects.merge_request_approvals.ProjectMergeRequestApprovalManager,
@@ -222,7 +222,7 @@ def test_create_merge_request_approvals_set_approvers(project, resp_mr_approval_
222222

223223

224224
def test_create_merge_request_approval_rule(project, resp_mr_approval_rules):
225-
approval_rules = project.mergerequests.get(1, lazy=True).approval_rules
225+
approval_rules = project.mergerequests.get(3, lazy=True).approval_rules
226226
data = {
227227
"name": new_approval_rule_name,
228228
"approvals_required": new_approval_rule_approvals_required,
@@ -238,7 +238,7 @@ def test_create_merge_request_approval_rule(project, resp_mr_approval_rules):
238238

239239

240240
def test_update_merge_request_approval_rule(project, resp_mr_approval_rules):
241-
approval_rules = project.mergerequests.get(1, lazy=True).approval_rules
241+
approval_rules = project.mergerequests.get(3, lazy=True).approval_rules
242242
ar_1 = approval_rules.list()[0]
243243
ar_1.user_ids = updated_approval_rule_user_ids
244244
ar_1.approvals_required = updated_approval_rule_approvals_required
@@ -250,7 +250,7 @@ def test_update_merge_request_approval_rule(project, resp_mr_approval_rules):
250250

251251

252252
def test_get_merge_request_approval_rule(project, resp_mr_approval_rules):
253-
merge_request = project.mergerequests.get(1, lazy=True)
253+
merge_request = project.mergerequests.get(3, lazy=True)
254254
approval_rule = merge_request.approval_rules.get(approval_rule_id)
255255
assert isinstance(
256256
approval_rule,
@@ -261,7 +261,7 @@ def test_get_merge_request_approval_rule(project, resp_mr_approval_rules):
261261

262262

263263
def test_get_merge_request_approval_state(project, resp_mr_approval_rules):
264-
merge_request = project.mergerequests.get(1, lazy=True)
264+
merge_request = project.mergerequests.get(3, lazy=True)
265265
approval_state = merge_request.approval_state.get()
266266
assert isinstance(
267267
approval_state,

0 commit comments

Comments
 (0)
0