Show More
@@ -157,7 +157,8 b' class TestPullRequestModel:' | |||||
157 | self.merge_mock.assert_called_once_with( |
|
157 | self.merge_mock.assert_called_once_with( | |
158 | pull_request.target_ref_parts, |
|
158 | pull_request.target_ref_parts, | |
159 | pull_request.source_repo.scm_instance(), |
|
159 | pull_request.source_repo.scm_instance(), | |
160 |
pull_request.source_ref_parts, self.workspace_id, dry_run=True |
|
160 | pull_request.source_ref_parts, self.workspace_id, dry_run=True, | |
|
161 | use_rebase=False) | |||
161 |
|
162 | |||
162 | assert pull_request._last_merge_source_rev == self.source_commit |
|
163 | assert pull_request._last_merge_source_rev == self.source_commit | |
163 | assert pull_request._last_merge_target_rev == self.target_commit |
|
164 | assert pull_request._last_merge_target_rev == self.target_commit | |
@@ -185,7 +186,8 b' class TestPullRequestModel:' | |||||
185 | self.merge_mock.assert_called_once_with( |
|
186 | self.merge_mock.assert_called_once_with( | |
186 | pull_request.target_ref_parts, |
|
187 | pull_request.target_ref_parts, | |
187 | pull_request.source_repo.scm_instance(), |
|
188 | pull_request.source_repo.scm_instance(), | |
188 |
pull_request.source_ref_parts, self.workspace_id, dry_run=True |
|
189 | pull_request.source_ref_parts, self.workspace_id, dry_run=True, | |
|
190 | use_rebase=False) | |||
189 |
|
191 | |||
190 | assert pull_request._last_merge_source_rev == self.source_commit |
|
192 | assert pull_request._last_merge_source_rev == self.source_commit | |
191 | assert pull_request._last_merge_target_rev == self.target_commit |
|
193 | assert pull_request._last_merge_target_rev == self.target_commit | |
@@ -216,7 +218,8 b' class TestPullRequestModel:' | |||||
216 | self.merge_mock.assert_called_once_with( |
|
218 | self.merge_mock.assert_called_once_with( | |
217 | pull_request.target_ref_parts, |
|
219 | pull_request.target_ref_parts, | |
218 | pull_request.source_repo.scm_instance(), |
|
220 | pull_request.source_repo.scm_instance(), | |
219 |
pull_request.source_ref_parts, self.workspace_id, dry_run=True |
|
221 | pull_request.source_ref_parts, self.workspace_id, dry_run=True, | |
|
222 | use_rebase=False) | |||
220 |
|
223 | |||
221 | assert pull_request._last_merge_source_rev is None |
|
224 | assert pull_request._last_merge_source_rev is None | |
222 | assert pull_request._last_merge_target_rev is None |
|
225 | assert pull_request._last_merge_target_rev is None | |
@@ -289,7 +292,8 b' class TestPullRequestModel:' | |||||
289 | pull_request.target_ref_parts, |
|
292 | pull_request.target_ref_parts, | |
290 | pull_request.source_repo.scm_instance(), |
|
293 | pull_request.source_repo.scm_instance(), | |
291 | pull_request.source_ref_parts, self.workspace_id, |
|
294 | pull_request.source_ref_parts, self.workspace_id, | |
292 | user_name=user.username, user_email=user.email, message=message |
|
295 | user_name=user.username, user_email=user.email, message=message, | |
|
296 | use_rebase=False | |||
293 | ) |
|
297 | ) | |
294 | self.invalidation_mock.assert_called_once_with( |
|
298 | self.invalidation_mock.assert_called_once_with( | |
295 | pull_request.target_repo.repo_name) |
|
299 | pull_request.target_repo.repo_name) | |
@@ -327,7 +331,8 b' class TestPullRequestModel:' | |||||
327 | pull_request.target_ref_parts, |
|
331 | pull_request.target_ref_parts, | |
328 | pull_request.source_repo.scm_instance(), |
|
332 | pull_request.source_repo.scm_instance(), | |
329 | pull_request.source_ref_parts, self.workspace_id, |
|
333 | pull_request.source_ref_parts, self.workspace_id, | |
330 | user_name=user.username, user_email=user.email, message=message |
|
334 | user_name=user.username, user_email=user.email, message=message, | |
|
335 | use_rebase=False | |||
331 | ) |
|
336 | ) | |
332 |
|
337 | |||
333 | pull_request = PullRequest.get(pull_request.pull_request_id) |
|
338 | pull_request = PullRequest.get(pull_request.pull_request_id) |
General Comments 0
You need to be logged in to leave comments.
Login now