##// END OF EJS Templates
security: fixed issues with exposing repository names using global PR redirection link...
security: fixed issues with exposing repository names using global PR redirection link logic. - Since redirect was created to repository which linked to the PR, users who didn't have permissions to those repos could still see the name in the url generated.

File last commit:

r3885:a66c5e67 default
r4044:573a1043 default
Show More
test_repo_compare_on_single_file.py
265 lines | 9.5 KiB | text/x-python | PythonLexer
/ rhodecode / apps / repository / tests / test_repo_compare_on_single_file.py
compare: migrated code from pylons to pyramid views.
r1957 # -*- coding: utf-8 -*-
docs: updated copyrights to 2019
r3363 # Copyright (C) 2010-2019 RhodeCode GmbH
compare: migrated code from pylons to pyramid views.
r1957 #
# 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
tests: fixes for commit pages changes.
r3885 from rhodecode.apps.repository.tests.test_repo_compare import ComparePage
compare: migrated code from pylons to pyramid views.
r1957 from rhodecode.lib.vcs import nodes
tests: fixed compare page and related tests....
r3773 from rhodecode.lib.vcs.backends.base import EmptyCommit
compare: migrated code from pylons to pyramid views.
r1957 from rhodecode.tests.fixture import Fixture
from rhodecode.tests.utils import commit_change
fixture = Fixture()
def route_path(name, params=None, **kwargs):
import urllib
base_url = {
'repo_compare_select': '/{repo_name}/compare',
'repo_compare': '/{repo_name}/compare/{source_ref_type}@{source_ref}...{target_ref_type}@{target_ref}',
}[name].format(**kwargs)
if params:
base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
return base_url
@pytest.mark.usefixtures("autologin_user", "app")
class TestSideBySideDiff(object):
tests: fixed compare page and related tests....
r3773 def test_diff_sidebyside_single_commit(self, app, backend):
compare: migrated code from pylons to pyramid views.
r1957 commit_id_range = {
'hg': {
'commits': ['25d7e49c18b159446cadfa506a5cf8ad1cb04067',
'603d6c72c46d953420c89d36372f08d9f305f5dd'],
tests: fixes for commit pages changes.
r3885 'changes': (21, 943, 288),
compare: migrated code from pylons to pyramid views.
r1957 },
'git': {
'commits': ['6fc9270775aaf5544c1deb014f4ddd60c952fcbb',
'03fa803d7e9fb14daa9a3089e0d1494eda75d986'],
tests: fixes for commit pages changes.
r3885 'changes': (20, 941, 286),
compare: migrated code from pylons to pyramid views.
r1957 },
'svn': {
'commits': ['336',
'337'],
tests: fixes for commit pages changes.
r3885 'changes': (21, 943, 288),
compare: migrated code from pylons to pyramid views.
r1957 },
}
commit_info = commit_id_range[backend.alias]
commit2, commit1 = commit_info['commits']
file_changes = commit_info['changes']
response = self.app.get(route_path(
'repo_compare',
repo_name=backend.repo_name,
source_ref_type='rev',
source_ref=commit2,
target_repo=backend.repo_name,
target_ref_type='rev',
target_ref=commit1,
params=dict(target_repo=backend.repo_name, diffmode='sidebyside')
))
tests: fixes for commit pages changes.
r3885 compare_page = ComparePage(response)
compare_page.contains_change_summary(*file_changes)
compare: migrated code from pylons to pyramid views.
r1957 response.mustcontain('Expand 1 commit')
tests: fixed compare page and related tests....
r3773 def test_diff_sidebyside_two_commits(self, app, backend):
compare: migrated code from pylons to pyramid views.
r1957 commit_id_range = {
'hg': {
tests: fixed compare page and related tests....
r3773 'commits': ['4fdd71e9427417b2e904e0464c634fdee85ec5a7',
compare: migrated code from pylons to pyramid views.
r1957 '603d6c72c46d953420c89d36372f08d9f305f5dd'],
tests: fixes for commit pages changes.
r3885 'changes': (32, 1165, 308),
compare: migrated code from pylons to pyramid views.
r1957 },
'git': {
tests: fixed compare page and related tests....
r3773 'commits': ['f5fbf9cfd5f1f1be146f6d3b38bcd791a7480c13',
compare: migrated code from pylons to pyramid views.
r1957 '03fa803d7e9fb14daa9a3089e0d1494eda75d986'],
tests: fixes for commit pages changes.
r3885 'changes': (31, 1163, 306),
compare: migrated code from pylons to pyramid views.
r1957 },
'svn': {
tests: fixed compare page and related tests....
r3773 'commits': ['335',
compare: migrated code from pylons to pyramid views.
r1957 '337'],
tests: fixes for commit pages changes.
r3885 'changes': (32, 1179, 310),
tests: fixed compare page and related tests....
r3773 },
}
commit_info = commit_id_range[backend.alias]
commit2, commit1 = commit_info['commits']
file_changes = commit_info['changes']
response = self.app.get(route_path(
'repo_compare',
repo_name=backend.repo_name,
source_ref_type='rev',
source_ref=commit2,
target_repo=backend.repo_name,
target_ref_type='rev',
target_ref=commit1,
params=dict(target_repo=backend.repo_name, diffmode='sidebyside')
))
tests: fixes for commit pages changes.
r3885 compare_page = ComparePage(response)
compare_page.contains_change_summary(*file_changes)
tests: fixed compare page and related tests....
r3773 response.mustcontain('Expand 2 commits')
@pytest.mark.xfail(reason='GIT does not handle empty commit compare correct (missing 1 commit)')
def test_diff_side_by_side_from_0_commit(self, app, backend, backend_stub):
f_path = 'test_sidebyside_file.py'
commit1_content = 'content-25d7e49c18b159446c\n'
commit2_content = 'content-603d6c72c46d953420\n'
repo = backend.create_repo()
commit1 = commit_change(
repo.repo_name, filename=f_path, content=commit1_content,
message='A', vcs_type=backend.alias, parent=None, newfile=True)
commit2 = commit_change(
repo.repo_name, filename=f_path, content=commit2_content,
message='B, child of A', vcs_type=backend.alias, parent=commit1)
response = self.app.get(route_path(
'repo_compare',
repo_name=repo.repo_name,
source_ref_type='rev',
source_ref=EmptyCommit().raw_id,
target_ref_type='rev',
target_ref=commit2.raw_id,
params=dict(diffmode='sidebyside')
))
response.mustcontain('Expand 2 commits')
response.mustcontain('123 file changed')
response.mustcontain(
'r%s:%s...r%s:%s' % (
commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
tests: fixes for commit pages changes.
r3885 response.mustcontain(f_path)
tests: fixed compare page and related tests....
r3773
@pytest.mark.xfail(reason='GIT does not handle empty commit compare correct (missing 1 commit)')
def test_diff_side_by_side_from_0_commit_with_file_filter(self, app, backend, backend_stub):
f_path = 'test_sidebyside_file.py'
commit1_content = 'content-25d7e49c18b159446c\n'
commit2_content = 'content-603d6c72c46d953420\n'
repo = backend.create_repo()
commit1 = commit_change(
repo.repo_name, filename=f_path, content=commit1_content,
message='A', vcs_type=backend.alias, parent=None, newfile=True)
commit2 = commit_change(
repo.repo_name, filename=f_path, content=commit2_content,
message='B, child of A', vcs_type=backend.alias, parent=commit1)
response = self.app.get(route_path(
'repo_compare',
repo_name=repo.repo_name,
source_ref_type='rev',
source_ref=EmptyCommit().raw_id,
target_ref_type='rev',
target_ref=commit2.raw_id,
params=dict(f_path=f_path, target_repo=repo.repo_name, diffmode='sidebyside')
))
response.mustcontain('Expand 2 commits')
response.mustcontain('1 file changed')
response.mustcontain(
'r%s:%s...r%s:%s' % (
commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
tests: fixes for commit pages changes.
r3885 response.mustcontain(f_path)
tests: fixed compare page and related tests....
r3773
def test_diff_side_by_side_with_empty_file(self, app, backend, backend_stub):
commits = [
{'message': 'First commit'},
{'message': 'Second commit'},
{'message': 'Commit with binary',
'added': [nodes.FileNode('file.empty', content='')]},
]
f_path = 'file.empty'
repo = backend.create_repo(commits=commits)
commit1 = repo.get_commit(commit_idx=0)
commit2 = repo.get_commit(commit_idx=1)
commit3 = repo.get_commit(commit_idx=2)
response = self.app.get(route_path(
'repo_compare',
repo_name=repo.repo_name,
source_ref_type='rev',
source_ref=commit1.raw_id,
target_ref_type='rev',
target_ref=commit3.raw_id,
params=dict(f_path=f_path, target_repo=repo.repo_name, diffmode='sidebyside')
))
response.mustcontain('Expand 2 commits')
response.mustcontain('1 file changed')
response.mustcontain(
'r%s:%s...r%s:%s' % (
commit2.idx, commit2.short_id, commit3.idx, commit3.short_id))
tests: fixes for commit pages changes.
r3885 response.mustcontain(f_path)
tests: fixed compare page and related tests....
r3773
def test_diff_sidebyside_two_commits_with_file_filter(self, app, backend):
commit_id_range = {
'hg': {
'commits': ['4fdd71e9427417b2e904e0464c634fdee85ec5a7',
'603d6c72c46d953420c89d36372f08d9f305f5dd'],
tests: fixes for commit pages changes.
r3885 'changes': (1, 3, 3)
tests: fixed compare page and related tests....
r3773 },
'git': {
'commits': ['f5fbf9cfd5f1f1be146f6d3b38bcd791a7480c13',
'03fa803d7e9fb14daa9a3089e0d1494eda75d986'],
tests: fixes for commit pages changes.
r3885 'changes': (1, 3, 3)
tests: fixed compare page and related tests....
r3773 },
'svn': {
'commits': ['335',
'337'],
tests: fixes for commit pages changes.
r3885 'changes': (1, 3, 3)
compare: migrated code from pylons to pyramid views.
r1957 },
}
f_path = 'docs/conf.py'
commit_info = commit_id_range[backend.alias]
commit2, commit1 = commit_info['commits']
file_changes = commit_info['changes']
response = self.app.get(route_path(
'repo_compare',
repo_name=backend.repo_name,
source_ref_type='rev',
source_ref=commit2,
target_ref_type='rev',
target_ref=commit1,
params=dict(f_path=f_path, target_repo=backend.repo_name, diffmode='sidebyside')
))
tests: fixed compare page and related tests....
r3773 response.mustcontain('Expand 2 commits')
tests: fixes for commit pages changes.
r3885
compare_page = ComparePage(response)
compare_page.contains_change_summary(*file_changes)