Show More
test_merge_pull_request.py
137 lines
| 5.4 KiB
| text/x-python
|
PythonLexer
r1 | # -*- coding: utf-8 -*- | |||
r1271 | # Copyright (C) 2010-2017 RhodeCode GmbH | |||
r1 | # | |||
# This program is free software: you can redistribute it and/or modify | ||||
# it under the terms of the GNU Affero General Public License, version 3 | ||||
# (only), as published by the Free Software Foundation. | ||||
# | ||||
# This program is distributed in the hope that it will be useful, | ||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||||
# GNU General Public License for more details. | ||||
# | ||||
# You should have received a copy of the GNU Affero General Public License | ||||
# along with this program. If not, see <http://www.gnu.org/licenses/>. | ||||
# | ||||
# This program is dual-licensed. If you wish to learn more about the | ||||
# RhodeCode Enterprise Edition, including its added features, Support services, | ||||
# and proprietary license terms, please see https://rhodecode.com/licenses/ | ||||
import pytest | ||||
r1336 | from rhodecode.model.db import UserLog, PullRequest | |||
r1 | from rhodecode.model.meta import Session | |||
from rhodecode.tests import TEST_USER_ADMIN_LOGIN | ||||
from rhodecode.api.tests.utils import ( | ||||
r1336 | build_data, api_call, assert_error, assert_ok) | |||
r1 | ||||
@pytest.mark.usefixtures("testuser_api", "app") | ||||
class TestMergePullRequest(object): | ||||
@pytest.mark.backends("git", "hg") | ||||
r1336 | def test_api_merge_pull_request_merge_failed(self, pr_util, no_notifications): | |||
Martin Bornhold
|
r1057 | pull_request = pr_util.create_pull_request(mergeable=True) | ||
r1 | author = pull_request.user_id | |||
Martin Bornhold
|
r1057 | repo = pull_request.target_repo.repo_id | ||
pull_request_id = pull_request.pull_request_id | ||||
pull_request_repo = pull_request.target_repo.repo_name | ||||
r1 | ||||
id_, params = build_data( | ||||
self.apikey, 'merge_pull_request', | ||||
Martin Bornhold
|
r1057 | repoid=pull_request_repo, | ||
pullrequestid=pull_request_id) | ||||
r1 | response = api_call(self.app, params) | |||
Martin Bornhold
|
r1057 | # The above api call detaches the pull request DB object from the | ||
# session because of an unconditional transaction rollback in our | ||||
# middleware. Therefore we need to add it back here if we want to use | ||||
# it. | ||||
Session().add(pull_request) | ||||
r1336 | expected = 'merge not possible for following reasons: ' \ | |||
'Pull request reviewer approval is pending.' | ||||
assert_error(id_, expected, given=response.body) | ||||
@pytest.mark.backends("git", "hg") | ||||
def test_api_merge_pull_request(self, pr_util, no_notifications): | ||||
pull_request = pr_util.create_pull_request(mergeable=True, approved=True) | ||||
author = pull_request.user_id | ||||
repo = pull_request.target_repo.repo_id | ||||
pull_request_id = pull_request.pull_request_id | ||||
pull_request_repo = pull_request.target_repo.repo_name | ||||
id_, params = build_data( | ||||
self.apikey, 'comment_pull_request', | ||||
repoid=pull_request_repo, | ||||
pullrequestid=pull_request_id, | ||||
status='approved') | ||||
response = api_call(self.app, params) | ||||
expected = { | ||||
'comment_id': response.json.get('result', {}).get('comment_id'), | ||||
'pull_request_id': pull_request_id, | ||||
'status': {'given': 'approved', 'was_changed': True} | ||||
} | ||||
assert_ok(id_, expected, given=response.body) | ||||
id_, params = build_data( | ||||
self.apikey, 'merge_pull_request', | ||||
repoid=pull_request_repo, | ||||
pullrequestid=pull_request_id) | ||||
response = api_call(self.app, params) | ||||
pull_request = PullRequest.get(pull_request_id) | ||||
r1 | expected = { | |||
'executed': True, | ||||
'failure_reason': 0, | ||||
Martin Bornhold
|
r1057 | 'possible': True, | ||
'merge_commit_id': pull_request.shadow_merge_ref.commit_id, | ||||
'merge_ref': pull_request.shadow_merge_ref._asdict() | ||||
r1 | } | |||
r1336 | assert_ok(id_, expected, response.body) | |||
r1 | ||||
journal = UserLog.query()\ | ||||
.filter(UserLog.user_id == author)\ | ||||
r1807 | .filter(UserLog.repository_id == repo) \ | |||
.order_by('user_log_id') \ | ||||
r1 | .all() | |||
r1807 | assert journal[-2].action == 'repo.pull_request.merge' | |||
assert journal[-1].action == 'repo.pull_request.close' | ||||
r1 | ||||
id_, params = build_data( | ||||
self.apikey, 'merge_pull_request', | ||||
Martin Bornhold
|
r1057 | repoid=pull_request_repo, pullrequestid=pull_request_id) | ||
r1 | response = api_call(self.app, params) | |||
r1336 | expected = 'merge not possible for following reasons: This pull request is closed.' | |||
r1 | assert_error(id_, expected, given=response.body) | |||
@pytest.mark.backends("git", "hg") | ||||
r2395 | def test_api_merge_pull_request_repo_error(self, pr_util): | |||
pull_request = pr_util.create_pull_request() | ||||
r1 | id_, params = build_data( | |||
self.apikey, 'merge_pull_request', | ||||
r2395 | repoid=666, pullrequestid=pull_request.pull_request_id) | |||
r1 | response = api_call(self.app, params) | |||
expected = 'repository `666` does not exist' | ||||
assert_error(id_, expected, given=response.body) | ||||
@pytest.mark.backends("git", "hg") | ||||
def test_api_merge_pull_request_non_admin_with_userid_error(self, | ||||
pr_util): | ||||
pull_request = pr_util.create_pull_request(mergeable=True) | ||||
id_, params = build_data( | ||||
self.apikey_regular, 'merge_pull_request', | ||||
repoid=pull_request.target_repo.repo_name, | ||||
pullrequestid=pull_request.pull_request_id, | ||||
userid=TEST_USER_ADMIN_LOGIN) | ||||
response = api_call(self.app, params) | ||||
expected = 'userid is not the same as your user' | ||||
assert_error(id_, expected, given=response.body) | ||||