##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2774:a8ecef4e default
r2784:e8c62649 default
Show More
test_get_goto_switched_data.py
180 lines | 5.8 KiB | text/x-python | PythonLexer
/ rhodecode / apps / home / tests / test_get_goto_switched_data.py
# -*- coding: utf-8 -*-
# Copyright (C) 2016-2018 RhodeCode GmbH
#
# 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 json
import pytest
from . import assert_and_get_main_filter_content
from rhodecode.tests import TestController, TEST_USER_ADMIN_LOGIN
from rhodecode.tests.fixture import Fixture
from rhodecode.lib.utils import map_groups
from rhodecode.model.repo import RepoModel
from rhodecode.model.repo_group import RepoGroupModel
from rhodecode.model.db import Session, Repository, RepoGroup
fixture = Fixture()
def route_path(name, params=None, **kwargs):
import urllib
base_url = {
'goto_switcher_data': '/_goto_data',
}[name].format(**kwargs)
if params:
base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
return base_url
class TestGotoSwitcherData(TestController):
required_repos_with_groups = [
'abc',
'abc-fork',
'forks/abcd',
'abcd',
'abcde',
'a/abc',
'aa/abc',
'aaa/abc',
'aaaa/abc',
'repos_abc/aaa/abc',
'abc_repos/abc',
'abc_repos/abcd',
'xxx/xyz',
'forked-abc/a/abc'
]
@pytest.fixture(autouse=True, scope='class')
def prepare(self, request, baseapp):
for repo_and_group in self.required_repos_with_groups:
# create structure of groups and return the last group
repo_group = map_groups(repo_and_group)
RepoModel()._create_repo(
repo_and_group, 'hg', 'test-ac', TEST_USER_ADMIN_LOGIN,
repo_group=getattr(repo_group, 'group_id', None))
Session().commit()
request.addfinalizer(self.cleanup)
def cleanup(self):
# first delete all repos
for repo_and_groups in self.required_repos_with_groups:
repo = Repository.get_by_repo_name(repo_and_groups)
if repo:
RepoModel().delete(repo)
Session().commit()
# then delete all empty groups
for repo_and_groups in self.required_repos_with_groups:
if '/' in repo_and_groups:
r_group = repo_and_groups.rsplit('/', 1)[0]
repo_group = RepoGroup.get_by_group_name(r_group)
if not repo_group:
continue
parents = repo_group.parents
RepoGroupModel().delete(repo_group, force_delete=True)
Session().commit()
for el in reversed(parents):
RepoGroupModel().delete(el, force_delete=True)
Session().commit()
def test_empty_query(self, xhr_header):
self.log_user()
response = self.app.get(
route_path('goto_switcher_data'),
extra_environ=xhr_header, status=200)
result = json.loads(response.body)['suggestions']
assert result == []
def test_returns_list_of_repos_and_groups_filtered(self, xhr_header):
self.log_user()
response = self.app.get(
route_path('goto_switcher_data'),
params={'query': 'abc'},
extra_environ=xhr_header, status=200)
result = json.loads(response.body)['suggestions']
repos, groups, users, commits = assert_and_get_main_filter_content(result)
assert len(repos) == 13
assert len(groups) == 5
assert len(users) == 0
assert len(commits) == 0
def test_returns_list_of_users_filtered(self, xhr_header):
self.log_user()
response = self.app.get(
route_path('goto_switcher_data'),
params={'query': 'user:admin'},
extra_environ=xhr_header, status=200)
result = json.loads(response.body)['suggestions']
repos, groups, users, commits = assert_and_get_main_filter_content(result)
assert len(repos) == 0
assert len(groups) == 0
assert len(users) == 1
assert len(commits) == 0
def test_returns_list_of_commits_filtered(self, xhr_header):
self.log_user()
response = self.app.get(
route_path('goto_switcher_data'),
params={'query': 'commit:e8'},
extra_environ=xhr_header, status=200)
result = json.loads(response.body)['suggestions']
repos, groups, users, commits = assert_and_get_main_filter_content(result)
assert len(repos) == 0
assert len(groups) == 0
assert len(users) == 0
assert len(commits) == 5
def test_returns_list_of_properly_sorted_and_filtered(self, xhr_header):
self.log_user()
response = self.app.get(
route_path('goto_switcher_data'),
params={'query': 'abc'},
extra_environ=xhr_header, status=200)
result = json.loads(response.body)['suggestions']
repos, groups, users, commits = assert_and_get_main_filter_content(result)
test_repos = [x['value_display'] for x in repos[:4]]
assert ['abc', 'abcd', 'a/abc', 'abcde'] == test_repos
test_groups = [x['value_display'] for x in groups[:4]]
assert ['abc_repos', 'repos_abc',
'forked-abc', 'forked-abc/a'] == test_groups