Skip to content

Commit 8346231

Browse files
tdrueztdruez
committed
Fix unit tests #350
Signed-off-by: tdruez <tdruez@nexb.com>
1 parent 7d1f1b6 commit 8346231

1 file changed

Lines changed: 50 additions & 34 deletions

File tree

‎workflow/tests/test_integrations.py‎

Lines changed: 50 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ def test_github_make_issue_body_contains_question(self):
125125
self.assertIn("### Example Question", body)
126126
self.assertIn("Some value", body)
127127

128-
@mock.patch("requests.Session.post")
129-
def test_github_create_issue_calls_post(self, mock_session_post):
130-
mock_session_post.return_value.json.return_value = {"number": 10}
131-
mock_session_post.return_value.raise_for_status.return_value = None
128+
@mock.patch("requests.Session.request")
129+
def test_github_create_issue_calls_post(self, mock_request):
130+
mock_request.return_value.json.return_value = {"number": 10}
131+
mock_request.return_value.raise_for_status.return_value = None
132132

133133
issue = self.github.create_issue(
134134
repo_id="user/repo",
@@ -138,12 +138,12 @@ def test_github_create_issue_calls_post(self, mock_session_post):
138138
)
139139

140140
self.assertEqual(issue["number"], 10)
141-
mock_session_post.assert_called_once()
141+
mock_request.assert_called_once()
142142

143-
@mock.patch("requests.Session.patch")
144-
def test_github_update_issue_calls_patch(self, mock_session_patch):
145-
mock_session_patch.return_value.json.return_value = {"state": "closed"}
146-
mock_session_patch.return_value.raise_for_status.return_value = None
143+
@mock.patch("requests.Session.request")
144+
def test_github_update_issue_calls_patch(self, mock_request):
145+
mock_request.return_value.json.return_value = {"state": "closed"}
146+
mock_request.return_value.raise_for_status.return_value = None
147147

148148
response = self.github.update_issue(
149149
repo_id="user/repo",
@@ -154,12 +154,12 @@ def test_github_update_issue_calls_patch(self, mock_session_patch):
154154
)
155155

156156
self.assertEqual(response["state"], "closed")
157-
mock_session_patch.assert_called_once()
157+
mock_request.assert_called_once()
158158

159-
@mock.patch("requests.Session.post")
160-
def test_github_post_comment_calls_post(self, mock_session_post):
161-
mock_session_post.return_value.json.return_value = {"id": 77, "body": "Test comment"}
162-
mock_session_post.return_value.raise_for_status.return_value = None
159+
@mock.patch("requests.Session.request")
160+
def test_github_post_comment_calls_post(self, mock_request):
161+
mock_request.return_value.json.return_value = {"id": 77, "body": "Test comment"}
162+
mock_request.return_value.raise_for_status.return_value = None
163163

164164
response = self.github.post_comment(
165165
repo_id="user/repo",
@@ -168,9 +168,12 @@ def test_github_post_comment_calls_post(self, mock_session_post):
168168
)
169169

170170
self.assertEqual(response["body"], "Test comment")
171-
mock_session_post.assert_called_once_with(
172-
"https://api.github.com/repos/user/repo/issues/10/comments",
171+
mock_request.assert_called_once_with(
172+
method="POST",
173+
url="https://api.github.com/repos/user/repo/issues/10/comments",
173174
json={"body": "Test comment"},
175+
params=None,
176+
data=None,
174177
timeout=self.github.default_timeout,
175178
)
176179

@@ -230,10 +233,10 @@ def test_gitlab_make_issue_body_contains_question(self):
230233
self.assertIn("### Example Question", body)
231234
self.assertIn("Some value", body)
232235

233-
@mock.patch("requests.Session.post")
234-
def test_gitlab_create_issue_calls_post(self, mock_session_post):
235-
mock_session_post.return_value.json.return_value = {"iid": 10}
236-
mock_session_post.return_value.raise_for_status.return_value = None
236+
@mock.patch("requests.Session.request")
237+
def test_gitlab_create_issue_calls_post(self, mock_request):
238+
mock_request.return_value.json.return_value = {"iid": 10}
239+
mock_request.return_value.raise_for_status.return_value = None
237240

238241
issue = self.gitlab.create_issue(
239242
repo_id="user/project",
@@ -243,8 +246,11 @@ def test_gitlab_create_issue_calls_post(self, mock_session_post):
243246
)
244247

245248
self.assertEqual(issue["iid"], 10)
246-
mock_session_post.assert_called_once_with(
247-
f"https://gitlab.com/api/v4/projects/{quote('user/project', safe='')}/issues",
249+
mock_request.assert_called_once_with(
250+
method="POST",
251+
url=f"https://gitlab.com/api/v4/projects/{quote('user/project', safe='')}/issues",
252+
params=None,
253+
data=None,
248254
json={
249255
"title": "Issue Title",
250256
"description": "Issue Body",
@@ -253,10 +259,10 @@ def test_gitlab_create_issue_calls_post(self, mock_session_post):
253259
timeout=self.gitlab.default_timeout,
254260
)
255261

256-
@mock.patch("requests.Session.put")
257-
def test_gitlab_update_issue_calls_put(self, mock_session_put):
258-
mock_session_put.return_value.json.return_value = {"state": "closed"}
259-
mock_session_put.return_value.raise_for_status.return_value = None
262+
@mock.patch("requests.Session.request")
263+
def test_gitlab_update_issue_calls_put(self, mock_request):
264+
mock_request.return_value.json.return_value = {"state": "closed"}
265+
mock_request.return_value.raise_for_status.return_value = None
260266

261267
response = self.gitlab.update_issue(
262268
repo_id="user/project",
@@ -268,8 +274,13 @@ def test_gitlab_update_issue_calls_put(self, mock_session_put):
268274
)
269275

270276
self.assertEqual(response["state"], "closed")
271-
mock_session_put.assert_called_once_with(
272-
f"https://gitlab.com/api/v4/projects/{quote('user/project', safe='')}/issues/123",
277+
278+
project_path = quote("user/project", safe="")
279+
mock_request.assert_called_once_with(
280+
method="PUT",
281+
url=f"https://gitlab.com/api/v4/projects/{project_path}/issues/123",
282+
params=None,
283+
data=None,
273284
json={
274285
"title": "Updated title",
275286
"description": "Updated body",
@@ -279,10 +290,10 @@ def test_gitlab_update_issue_calls_put(self, mock_session_put):
279290
timeout=self.gitlab.default_timeout,
280291
)
281292

282-
@mock.patch("requests.Session.post")
283-
def test_gitlab_post_comment_calls_post(self, mock_session_post):
284-
mock_session_post.return_value.json.return_value = {"id": 77, "body": "Test comment"}
285-
mock_session_post.return_value.raise_for_status.return_value = None
293+
@mock.patch("requests.Session.request")
294+
def test_gitlab_post_comment_calls_post(self, mock_request):
295+
mock_request.return_value.json.return_value = {"id": 77, "body": "Test comment"}
296+
mock_request.return_value.raise_for_status.return_value = None
286297

287298
response = self.gitlab.post_comment(
288299
repo_id="user/project",
@@ -291,8 +302,13 @@ def test_gitlab_post_comment_calls_post(self, mock_session_post):
291302
)
292303

293304
self.assertEqual(response["body"], "Test comment")
294-
mock_session_post.assert_called_once_with(
295-
f"https://gitlab.com/api/v4/projects/{quote('user/project', safe='')}/issues/10/notes",
305+
306+
project_path = quote("user/project", safe="")
307+
mock_request.assert_called_once_with(
308+
method="POST",
309+
url=f"https://gitlab.com/api/v4/projects/{project_path}/issues/10/notes",
310+
params=None,
311+
data=None,
296312
json={"body": "Test comment"},
297313
timeout=self.gitlab.default_timeout,
298314
)

0 commit comments

Comments
 (0)