Files
@ 9855b31d033b
Branch filter:
Location: kallithea/rhodecode/tests/models/test_repos_groups.py
9855b31d033b
7.5 KiB
text/x-python
pullrequests: fix changesets ordering being reversed when creating new pull requests
41b4edf77b5b tried to make the displayed order of changeset consistent: The
topmost is always the latest.
That did however also reverse the ordering of the changesets sent back in the
post when used in the pull request creation form. Displaying the pull request
later on would reverse it again and thus show it in the 'wrong' order.
We now undo that reversing when creating the pull requests, and the stored data
will thus be the same as before.
41b4edf77b5b tried to make the displayed order of changeset consistent: The
topmost is always the latest.
That did however also reverse the ordering of the changesets sent back in the
post when used in the pull request creation form. Displaying the pull request
later on would reverse it again and thus show it in the 'wrong' order.
We now undo that reversing when creating the pull requests, and the stored data
will thus be the same as before.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | import os
import unittest
from sqlalchemy.exc import IntegrityError
from rhodecode.tests import *
from rhodecode.tests.fixture import Fixture
from rhodecode.model.repos_group import ReposGroupModel
from rhodecode.model.repo import RepoModel
from rhodecode.model.db import RepoGroup
from rhodecode.model.meta import Session
fixture = Fixture()
def _update_group(id_, group_name, desc='desc', parent_id=None):
form_data = fixture._get_group_create_params(group_name=group_name,
group_desc=desc,
group_parent_id=parent_id)
gr = ReposGroupModel().update(id_, form_data)
return gr
def _update_repo(name, **kwargs):
form_data = fixture._get_repo_create_params(**kwargs)
if not 'repo_name' in kwargs:
form_data['repo_name'] = name
if not 'perms_new' in kwargs:
form_data['perms_new'] = []
if not 'perms_updates' in kwargs:
form_data['perms_updates'] = []
r = RepoModel().update(name, **form_data)
return r
class TestReposGroups(unittest.TestCase):
def setUp(self):
self.g1 = fixture.create_group('test1', skip_if_exists=True)
self.g2 = fixture.create_group('test2', skip_if_exists=True)
self.g3 = fixture.create_group('test3', skip_if_exists=True)
def tearDown(self):
Session.remove()
def __check_path(self, *path):
"""
Checks the path for existance !
"""
path = [TESTS_TMP_PATH] + list(path)
path = os.path.join(*path)
return os.path.isdir(path)
def _check_folders(self):
print os.listdir(TESTS_TMP_PATH)
def __delete_group(self, id_):
ReposGroupModel().delete(id_)
def test_create_group(self):
g = fixture.create_group('newGroup')
Session().commit()
self.assertEqual(g.full_path, 'newGroup')
self.assertTrue(self.__check_path('newGroup'))
def test_create_same_name_group(self):
self.assertRaises(IntegrityError, lambda: fixture.create_group('newGroup'))
Session().rollback()
def test_same_subgroup(self):
sg1 = fixture.create_group('sub1', group_parent_id=self.g1.group_id)
self.assertEqual(sg1.parent_group, self.g1)
self.assertEqual(sg1.full_path, 'test1/sub1')
self.assertTrue(self.__check_path('test1', 'sub1'))
ssg1 = fixture.create_group('subsub1', group_parent_id=sg1.group_id)
self.assertEqual(ssg1.parent_group, sg1)
self.assertEqual(ssg1.full_path, 'test1/sub1/subsub1')
self.assertTrue(self.__check_path('test1', 'sub1', 'subsub1'))
def test_remove_group(self):
sg1 = fixture.create_group('deleteme')
self.__delete_group(sg1.group_id)
self.assertEqual(RepoGroup.get(sg1.group_id), None)
self.assertFalse(self.__check_path('deteteme'))
sg1 = fixture.create_group('deleteme', group_parent_id=self.g1.group_id)
self.__delete_group(sg1.group_id)
self.assertEqual(RepoGroup.get(sg1.group_id), None)
self.assertFalse(self.__check_path('test1', 'deteteme'))
def test_rename_single_group(self):
sg1 = fixture.create_group('initial')
new_sg1 = _update_group(sg1.group_id, 'after')
self.assertTrue(self.__check_path('after'))
self.assertEqual(RepoGroup.get_by_group_name('initial'), None)
def test_update_group_parent(self):
sg1 = fixture.create_group('initial', group_parent_id=self.g1.group_id)
new_sg1 = _update_group(sg1.group_id, 'after', parent_id=self.g1.group_id)
self.assertTrue(self.__check_path('test1', 'after'))
self.assertEqual(RepoGroup.get_by_group_name('test1/initial'), None)
new_sg1 = _update_group(sg1.group_id, 'after', parent_id=self.g3.group_id)
self.assertTrue(self.__check_path('test3', 'after'))
self.assertEqual(RepoGroup.get_by_group_name('test3/initial'), None)
new_sg1 = _update_group(sg1.group_id, 'hello')
self.assertTrue(self.__check_path('hello'))
self.assertEqual(RepoGroup.get_by_group_name('hello'), new_sg1)
def test_subgrouping_with_repo(self):
g1 = fixture.create_group('g1')
g2 = fixture.create_group('g2')
# create new repo
r = fixture.create_repo('john')
self.assertEqual(r.repo_name, 'john')
# put repo into group
r = _update_repo('john', repo_group=g1.group_id)
Session().commit()
self.assertEqual(r.repo_name, 'g1/john')
_update_group(g1.group_id, 'g1', parent_id=g2.group_id)
self.assertTrue(self.__check_path('g2', 'g1'))
# test repo
self.assertEqual(r.repo_name, RepoGroup.url_sep().join(['g2', 'g1',
r.just_name]))
def test_move_to_root(self):
g1 = fixture.create_group('t11')
g2 = fixture.create_group('t22', group_parent_id=g1.group_id)
self.assertEqual(g2.full_path, 't11/t22')
self.assertTrue(self.__check_path('t11', 't22'))
g2 = _update_group(g2.group_id, 'g22', parent_id=None)
Session().commit()
self.assertEqual(g2.group_name, 'g22')
# we moved out group from t1 to '' so it's full path should be 'g2'
self.assertEqual(g2.full_path, 'g22')
self.assertFalse(self.__check_path('t11', 't22'))
self.assertTrue(self.__check_path('g22'))
def test_rename_top_level_group_in_nested_setup(self):
g1 = fixture.create_group('L1')
g2 = fixture.create_group('L2', group_parent_id=g1.group_id)
g3 = fixture.create_group('L3', group_parent_id=g2.group_id)
r = fixture.create_repo('L1/L2/L3/L3_REPO', repo_group=g3.group_id)
##rename L1 all groups should be now changed
_update_group(g1.group_id, 'L1_NEW')
Session().commit()
self.assertEqual(g1.full_path, 'L1_NEW')
self.assertEqual(g2.full_path, 'L1_NEW/L2')
self.assertEqual(g3.full_path, 'L1_NEW/L2/L3')
self.assertEqual(r.repo_name, 'L1_NEW/L2/L3/L3_REPO')
def test_change_parent_of_top_level_group_in_nested_setup(self):
g1 = fixture.create_group('R1')
g2 = fixture.create_group('R2', group_parent_id=g1.group_id)
g3 = fixture.create_group('R3', group_parent_id=g2.group_id)
g4 = fixture.create_group('R1_NEW')
r = fixture.create_repo('R1/R2/R3/R3_REPO', repo_group=g3.group_id)
##rename L1 all groups should be now changed
_update_group(g1.group_id, 'R1', parent_id=g4.group_id)
Session().commit()
self.assertEqual(g1.full_path, 'R1_NEW/R1')
self.assertEqual(g2.full_path, 'R1_NEW/R1/R2')
self.assertEqual(g3.full_path, 'R1_NEW/R1/R2/R3')
self.assertEqual(r.repo_name, 'R1_NEW/R1/R2/R3/R3_REPO')
def test_change_parent_of_top_level_group_in_nested_setup_with_rename(self):
g1 = fixture.create_group('X1')
g2 = fixture.create_group('X2', group_parent_id=g1.group_id)
g3 = fixture.create_group('X3', group_parent_id=g2.group_id)
g4 = fixture.create_group('X1_NEW')
r = fixture.create_repo('X1/X2/X3/X3_REPO', repo_group=g3.group_id)
##rename L1 all groups should be now changed
_update_group(g1.group_id, 'X1_PRIM', parent_id=g4.group_id)
Session().commit()
self.assertEqual(g1.full_path, 'X1_NEW/X1_PRIM')
self.assertEqual(g2.full_path, 'X1_NEW/X1_PRIM/X2')
self.assertEqual(g3.full_path, 'X1_NEW/X1_PRIM/X2/X3')
self.assertEqual(r.repo_name, 'X1_NEW/X1_PRIM/X2/X3/X3_REPO')
|