engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: Add missing argument to assert_called_with statements.

Browse source 
Added the `'use_rebase' argument to assert statements which was recently
added to the merge method.
This commit is contained in:
Martin Bornhold 2016-07-08 09:15:03 +02:00
parent d7bec50fc7
commit a26deb916c
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rhodecode/tests/models/test_pullrequest.py
View file

@ -157,7 +157,8 @@ class TestPullRequestModel:
self.merge_mock.assert_called_once_with(
pull_request.target_ref_parts,
pull_request.source_repo.scm_instance(),
pull_request.source_ref_parts, self.workspace_id, dry_run=True)
pull_request.source_ref_parts, self.workspace_id, dry_run=True,
use_rebase=False)
assert pull_request._last_merge_source_rev == self.source_commit
assert pull_request._last_merge_target_rev == self.target_commit
@ -185,7 +186,8 @@ class TestPullRequestModel:
self.merge_mock.assert_called_once_with(
pull_request.target_ref_parts,
pull_request.source_repo.scm_instance(),
pull_request.source_ref_parts, self.workspace_id, dry_run=True)
pull_request.source_ref_parts, self.workspace_id, dry_run=True,
use_rebase=False)
assert pull_request._last_merge_source_rev == self.source_commit
assert pull_request._last_merge_target_rev == self.target_commit
@ -216,7 +218,8 @@ class TestPullRequestModel:
self.merge_mock.assert_called_once_with(
pull_request.target_ref_parts,
pull_request.source_repo.scm_instance(),
pull_request.source_ref_parts, self.workspace_id, dry_run=True)
pull_request.source_ref_parts, self.workspace_id, dry_run=True,
use_rebase=False)
assert pull_request._last_merge_source_rev is None
assert pull_request._last_merge_target_rev is None
@ -289,7 +292,8 @@ class TestPullRequestModel:
pull_request.target_ref_parts,
pull_request.source_repo.scm_instance(),
pull_request.source_ref_parts, self.workspace_id,
user_name=user.username, user_email=user.email, message=message
user_name=user.username, user_email=user.email, message=message,
use_rebase=False
)
self.invalidation_mock.assert_called_once_with(
pull_request.target_repo.repo_name)
@ -327,7 +331,8 @@ class TestPullRequestModel:
pull_request.target_ref_parts,
pull_request.source_repo.scm_instance(),
pull_request.source_ref_parts, self.workspace_id,
user_name=user.username, user_email=user.email, message=message
user_name=user.username, user_email=user.email, message=message,
use_rebase=False
)
pull_request = PullRequest.get(pull_request.pull_request_id)