home: moved home and repo group views into pyramid.

- fixed lots of tests related to those changes
- now main and subrepo group views are handled by pyramid.

rhodecode/apps/repo_group/__init__.py

@@ -0,0 +1,33 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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/
+from rhodecode.apps._base import add_route_with_slash
+
+
+def includeme(config):
+
+    # Summary
+    add_route_with_slash(
+        config,
+        name='repo_group_home',
+        pattern='/{repo_group_name:.*?[^/]}', repo_group_route=True)
+
+    # Scan module for configuration decorators.
+    config.scan()
+

rhodecode/api/tests/test_get_gist.py

@@ -28,7 +28,7 b' from rhodecode.api.tests.utils import ('
 
 @pytest.mark.usefixtures("testuser_api", "app")
 class TestApiGetGist(object):
-    def test_api_get_gist(self, gist_util):
+    def test_api_get_gist(self, gist_util, http_host_stub):
         gist = gist_util.create_gist()
         gist_id = gist.gist_access_id
         gist_created_on = gist.created_on
@@ -45,14 +45,14 b' class TestApiGetGist(object):'
             'expires': -1.0,
             'gist_id': int(gist_id),
             'type': 'public',
-            'url': 'http://test.example.com:80/_admin/gists/%s' % (gist_id,),
+            'url': 'http://%s/_admin/gists/%s' % (http_host_stub, gist_id,),
             'acl_level': Gist.ACL_LEVEL_PUBLIC,
             'content': None,
         }
 
         assert_ok(id_, expected, given=response.body)
 
-    def test_api_get_gist_with_content(self, gist_util):
+    def test_api_get_gist_with_content(self, gist_util, http_host_stub):
         mapping = {
             u'filename1.txt': {'content': u'hello world'},
             u'filename1ą.txt': {'content': u'hello worldę'}
@@ -73,7 +73,7 b' class TestApiGetGist(object):'
             'expires': -1.0,
             'gist_id': int(gist_id),
             'type': 'public',
-            'url': 'http://test.example.com:80/_admin/gists/%s' % (gist_id,),
+            'url': 'http://%s/_admin/gists/%s' % (http_host_stub, gist_id,),
             'acl_level': Gist.ACL_LEVEL_PUBLIC,
             'content': {
                 u'filename1.txt': u'hello world',

rhodecode/api/tests/test_get_pull_request.py

@@ -19,13 +19,13 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
-import mock
 import pytest
 import urlobject
 from pylons import url
 
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_error, assert_ok)
+from rhodecode.lib.utils2 import safe_unicode
 
 pytestmark = pytest.mark.backends("git", "hg")
 
@@ -33,7 +33,7 b' pytestmark = pytest.mark.backends("git",'
 @pytest.mark.usefixtures("testuser_api", "app")
 class TestGetPullRequest(object):
 
-    def test_api_get_pull_request(self, pr_util):
+    def test_api_get_pull_request(self, pr_util, http_host_stub, http_host_only_stub):
         from rhodecode.model.pull_request import PullRequestModel
         pull_request = pr_util.create_pull_request(mergeable=True)
         id_, params = build_data(
@@ -50,16 +50,16 b' class TestGetPullRequest(object):'
                 'pullrequest_show',
                 repo_name=pull_request.target_repo.repo_name,
                 pull_request_id=pull_request.pull_request_id, qualified=True))
-        pr_url = unicode(
-            url_obj.with_netloc('test.example.com:80'))
-        source_url = unicode(
-            pull_request.source_repo.clone_url()
-                .with_netloc('test.example.com:80'))
-        target_url = unicode(
-            pull_request.target_repo.clone_url()
-                .with_netloc('test.example.com:80'))
-        shadow_url = unicode(
+
+        pr_url = safe_unicode(
+            url_obj.with_netloc(http_host_stub))
+        source_url = safe_unicode(
+            pull_request.source_repo.clone_url().with_netloc(http_host_only_stub))
+        target_url = safe_unicode(
+            pull_request.target_repo.clone_url().with_netloc(http_host_only_stub))
+        shadow_url = safe_unicode(
             PullRequestModel().get_shadow_clone_url(pull_request))
+
         expected = {
             'pull_request_id': pull_request.pull_request_id,
             'url': pr_url,

rhodecode/api/tests/test_update_repo.py

@@ -26,7 +26,7 b' from rhodecode.tests import TEST_USER_AD'
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_error, assert_ok, crash, jsonify)
 from rhodecode.tests.fixture import Fixture
-
+from rhodecode.tests.plugin import http_host_stub, http_host_only_stub
 
 fixture = Fixture()
 
@@ -71,14 +71,15 b' class TestApiUpdateRepo(object):'
         ({'repo_name': 'new_repo_name'},
          {
             'repo_name': 'new_repo_name',
-            'url': 'http://test.example.com:80/new_repo_name'
+            'url': 'http://{}/new_repo_name'.format(http_host_only_stub())
          }),
 
         ({'repo_name': 'test_group_for_update/{}'.format(UPDATE_REPO_NAME),
           '_group': 'test_group_for_update'},
          {
             'repo_name': 'test_group_for_update/{}'.format(UPDATE_REPO_NAME),
-            'url': 'http://test.example.com:80/test_group_for_update/{}'.format(UPDATE_REPO_NAME)
+            'url': 'http://{}/test_group_for_update/{}'.format(
+                http_host_only_stub(), UPDATE_REPO_NAME)
          }),
     ])
     def test_api_update_repo(self, updates, expected, backend):

rhodecode/apps/__init__.py

@@ -0,0 +1,19 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2016-2017 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/

rhodecode/apps/_base/__init__.py

@@ -29,6 +29,7 b' from rhodecode.lib.utils2 import StrictA'
 from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
 from rhodecode.lib.ext_json import json
 from rhodecode.model import repo
+from rhodecode.model import repo_group
 from rhodecode.model.db import User
 from rhodecode.model.scm import ScmModel
 
@@ -39,6 +40,12 b" ADMIN_PREFIX = '/_admin'"
 STATIC_FILE_PREFIX = '/_static'
 
 
+def add_route_with_slash(config,name, pattern, **kw):
+    config.add_route(name, pattern, **kw)
+    if not pattern.endswith('/'):
+        config.add_route(name + '_slash', pattern + '/', **kw)
+
+
 def get_format_ref_id(repo):
     """Returns a `repo` specific reference formatter function"""
     if h.is_svn(repo):
@@ -253,8 +260,7 b' class RepoRoutePredicate(object):'
         repo_name = info['match']['repo_name']
         repo_model = repo.RepoModel()
         by_name_match = repo_model.get_by_repo_name(repo_name, cache=True)
-        # if we match quickly from database, short circuit the operation,
-        # and validate repo based on the type.
+
         if by_name_match:
             # register this as request object we can re-use later
             request.db_repo = by_name_match
@@ -300,9 +306,33 b' class RepoTypeRoutePredicate(object):'
             return False
 
 
+class RepoGroupRoutePredicate(object):
+    def __init__(self, val, config):
+        self.val = val
+
+    def text(self):
+        return 'repo_group_route = %s' % self.val
+
+    phash = text
+
+    def __call__(self, info, request):
+        repo_group_name = info['match']['repo_group_name']
+        repo_group_model = repo_group.RepoGroupModel()
+        by_name_match = repo_group_model.get_by_group_name(
+            repo_group_name, cache=True)
+
+        if by_name_match:
+            # register this as request object we can re-use later
+            request.db_repo_group = by_name_match
+            return True
+
+        return False
+
 
 def includeme(config):
     config.add_route_predicate(
         'repo_route', RepoRoutePredicate)
     config.add_route_predicate(
-        'repo_accepted_types', RepoTypeRoutePredicate)
  No newline at end of file
+        'repo_accepted_types', RepoTypeRoutePredicate)
+    config.add_route_predicate(
+        'repo_group_route', RepoGroupRoutePredicate)

rhodecode/apps/home/tests/test_home.py

@@ -28,18 +28,25 b' from rhodecode.model.meta import Session'
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.settings import SettingsModel
-from rhodecode.tests import TestController, url
+from rhodecode.tests import TestController
 from rhodecode.tests.fixture import Fixture
 
 
 fixture = Fixture()
 
 
+def route_path(name, **kwargs):
+    return {
+        'home': '/',
+        'repo_group_home': '/{repo_group_name}'
+    }[name].format(**kwargs)
+
+
 class TestHomeController(TestController):
 
     def test_index(self):
         self.log_user()
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
         # if global permission is set
         response.mustcontain('Add Repository')
 
@@ -49,7 +56,7 b' class TestHomeController(TestController)'
 
     def test_index_contains_statics_with_ver(self):
         self.log_user()
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
 
         rhodecode_version_hash = c.rhodecode_version_hash
         response.mustcontain('style.css?ver={0}'.format(rhodecode_version_hash))
@@ -57,7 +64,7 b' class TestHomeController(TestController)'
 
     def test_index_contains_backend_specific_details(self, backend):
         self.log_user()
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
         tip = backend.repo.get_commit().raw_id
 
         # html in javascript variable:
@@ -69,17 +76,16 b' class TestHomeController(TestController)'
 
     def test_index_with_anonymous_access_disabled(self):
         with fixture.anon_access(False):
-            response = self.app.get(url(controller='home', action='index'),
-                                    status=302)
+            response = self.app.get(route_path('home'), status=302)
             assert 'login' in response.location
 
     def test_index_page_on_groups(self, autologin_user, repo_group):
-        response = self.app.get(url('repo_group_home', group_name='gr1'))
+        response = self.app.get(route_path('repo_group_home', repo_group_name='gr1'))
         response.mustcontain("gr1/repo_in_group")
 
     def test_index_page_on_group_with_trailing_slash(
             self, autologin_user, repo_group):
-        response = self.app.get(url('repo_group_home', group_name='gr1') + '/')
+        response = self.app.get(route_path('repo_group_home', repo_group_name='gr1') + '/')
         response.mustcontain("gr1/repo_in_group")
 
     @pytest.fixture(scope='class')
@@ -93,15 +99,17 b' class TestHomeController(TestController)'
             RepoGroupModel().delete(repo_group='gr1', force_delete=True)
             Session().commit()
 
-    def test_index_with_name_with_tags(self, autologin_user):
-        user = User.get_by_username('test_admin')
+    def test_index_with_name_with_tags(self, user_util, autologin_user):
+        user = user_util.create_user()
+        username = user.username
         user.name = '<img src="/image1" onload="alert(\'Hello, World!\');">'
         user.lastname = (
             '<img src="/image2" onload="alert(\'Hello, World!\');">')
         Session().add(user)
         Session().commit()
+        user_util.create_repo(owner=username)
 
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
         response.mustcontain(
             '&lt;img src=&#34;/image1&#34; onload=&#34;'
             'alert(&#39;Hello, World!&#39;);&#34;&gt;')
@@ -122,7 +130,7 b' class TestHomeController(TestController)'
         Session().commit()
         SettingsModel().invalidate_settings_cache()
 
-        response = self.app.get(url(controller='home', action='index'))
+        response = self.app.get(route_path('home'))
         if state is True:
             response.mustcontain(version_string)
         if state is False:

rhodecode/apps/home/views.py

@@ -25,12 +25,15 b' from pyramid.view import view_config'
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib import helpers as h
-from rhodecode.lib.auth import LoginRequired, NotAnonymous
+from rhodecode.lib.auth import LoginRequired, NotAnonymous, \
+    HasRepoGroupPermissionAnyDecorator
 from rhodecode.lib.index import searcher_from_config
 from rhodecode.lib.utils2 import safe_unicode, str2bool
+from rhodecode.lib.ext_json import json
 from rhodecode.model.db import func, Repository, RepoGroup
 from rhodecode.model.repo import RepoModel
-from rhodecode.model.scm import ScmModel
+from rhodecode.model.repo_group import RepoGroupModel
+from rhodecode.model.scm import ScmModel, RepoGroupList, RepoList
 from rhodecode.model.user import UserModel
 from rhodecode.model.user_group import UserGroupModel
 
@@ -143,7 +146,7 b' class HomeView(BaseAppView):'
                 'text': obj.group_name,
                 'type': 'group',
                 'obj': {},
-                'url': h.url('repo_group_home', group_name=obj.group_name)
+                'url': h.route_path('repo_group_home', repo_group_name=obj.group_name)
             }
             for obj in repo_groups_iter]
 
@@ -246,3 +249,56 b' class HomeView(BaseAppView):'
             'results': res
         }
         return data
+
+    def _get_groups_and_repos(self, repo_group_id=None):
+        # repo groups groups
+        repo_group_list = RepoGroup.get_all_repo_groups(group_id=repo_group_id)
+        _perms = ['group.read', 'group.write', 'group.admin']
+        repo_group_list_acl = RepoGroupList(repo_group_list, perm_set=_perms)
+        repo_group_data = RepoGroupModel().get_repo_groups_as_dict(
+            repo_group_list=repo_group_list_acl, admin=False)
+
+        # repositories
+        repo_list = Repository.get_all_repos(group_id=repo_group_id)
+        _perms = ['repository.read', 'repository.write', 'repository.admin']
+        repo_list_acl = RepoList(repo_list, perm_set=_perms)
+        repo_data = RepoModel().get_repos_as_dict(
+            repo_list=repo_list_acl, admin=False)
+
+        return repo_data, repo_group_data
+
+    @LoginRequired()
+    @view_config(
+        route_name='home', request_method='GET',
+        renderer='rhodecode:templates/index.mako')
+    def main_page(self):
+        c = self.load_default_context()
+        c.repo_group = None
+
+        repo_data, repo_group_data = self._get_groups_and_repos()
+        # json used to render the grids
+        c.repos_data = json.dumps(repo_data)
+        c.repo_groups_data = json.dumps(repo_group_data)
+
+        return self._get_template_context(c)
+
+    @LoginRequired()
+    @HasRepoGroupPermissionAnyDecorator(
+        'group.read', 'group.write', 'group.admin')
+    @view_config(
+        route_name='repo_group_home', request_method='GET',
+        renderer='rhodecode:templates/index_repo_group.mako')
+    @view_config(
+        route_name='repo_group_home_slash', request_method='GET',
+        renderer='rhodecode:templates/index_repo_group.mako')
+    def repo_group_main_page(self):
+        c = self.load_default_context()
+        c.repo_group = self.request.db_repo_group
+        repo_data, repo_group_data = self._get_groups_and_repos(
+            c.repo_group.group_id)
+
+        # json used to render the grids
+        c.repos_data = json.dumps(repo_data)
+        c.repo_groups_data = json.dumps(repo_group_data)
+
+        return self._get_template_context(c)

rhodecode/apps/login/views.py

@@ -25,7 +25,6 b' import formencode'
 import logging
 import urlparse
 
-from pylons import url
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 from recaptcha.client.captcha import submit
@@ -91,20 +90,21 b' def get_came_from(request):'
     came_from = safe_str(request.GET.get('came_from', ''))
     parsed = urlparse.urlparse(came_from)
     allowed_schemes = ['http', 'https']
+    default_came_from = h.route_path('home')
     if parsed.scheme and parsed.scheme not in allowed_schemes:
         log.error('Suspicious URL scheme detected %s for url %s' %
                   (parsed.scheme, parsed))
-        came_from = url('home')
+        came_from = default_came_from
     elif parsed.netloc and request.host != parsed.netloc:
         log.error('Suspicious NETLOC detected %s for url %s server url '
                   'is: %s' % (parsed.netloc, parsed, request.host))
-        came_from = url('home')
+        came_from = default_came_from
     elif any(bad_str in parsed.path for bad_str in ('\r', '\n')):
         log.error('Header injection detected `%s` for url %s server url ' %
                   (parsed.path, parsed))
-        came_from = url('home')
+        came_from = default_came_from
 
-    return came_from or url('home')
+    return came_from or default_came_from
 
 
 class LoginView(BaseAppView):
@@ -215,7 +215,7 b' class LoginView(BaseAppView):'
             action='user.logout', action_data=action_data,
             user=auth_user, commit=True)
         self.session.delete()
-        return HTTPFound(url('home'))
+        return HTTPFound(h.route_path('home'))
 
     @HasPermissionAnyDecorator(
         'hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')

rhodecode/apps/my_account/tests/test_my_account_password.py

@@ -132,6 +132,7 b' class TestMyAccountPassword(TestControll'
         self.app.post(route_path('my_account_password'), form_data)
 
         response = self.app.get(route_path('home'))
-        new_password_hash = response.session['rhodecode_user']['password']
+        session = response.get_session_from_response()
+        new_password_hash = session['rhodecode_user']['password']
 
         assert old_password_hash != new_password_hash
  No newline at end of file

rhodecode/apps/repository/__init__.py

@@ -23,6 +23,10 b' def includeme(config):'
 
     # Summary
     config.add_route(
+        name='repo_summary',
+        pattern='/{repo_name:.*?[^/]}', repo_route=True)
+
+    config.add_route(
         name='repo_summary_explicit',
         pattern='/{repo_name:.*?[^/]}/summary', repo_route=True)
 

rhodecode/config/middleware.py

@@ -292,6 +292,7 b' def includeme(config):'
     config.include('rhodecode.apps.login')
     config.include('rhodecode.apps.home')
     config.include('rhodecode.apps.repository')
+    config.include('rhodecode.apps.repo_group')
     config.include('rhodecode.apps.search')
     config.include('rhodecode.apps.user_profile')
     config.include('rhodecode.apps.my_account')

rhodecode/config/routing.py

@@ -184,9 +184,6 b' def make_map(config):'
     # CUSTOM ROUTES HERE
     #==========================================================================
 
-    # MAIN PAGE
-    rmap.connect('home', '/', controller='home', action='index')
-
     # ping and pylons error test
     rmap.connect('ping', '%s/ping' % (ADMIN_PREFIX,), controller='home', action='ping')
     rmap.connect('error_test', '%s/error_test' % (ADMIN_PREFIX,), controller='home', action='error_test')
@@ -1002,13 +999,6 b' def make_map(config):'
                  conditions={'function': check_repo},
                  requirements=URL_NAME_REQUIREMENTS)
 
-    # must be here for proper group/repo catching pattern
-    _connect_with_slash(
-        rmap, 'repo_group_home', '/{group_name}',
-        controller='home', action='index_repo_group',
-        conditions={'function': check_group},
-        requirements=URL_NAME_REQUIREMENTS)
-
     # catch all, at the end
     _connect_with_slash(
         rmap, 'summary_home', '/{repo_name}', jsroute=True,

rhodecode/controllers/admin/repo_groups.py

@@ -193,7 +193,7 b' class RepoGroupsController(BaseControlle'
             _new_group_name = form_result['group_name_full']
             repo_group_url = h.link_to(
                 _new_group_name,
-                h.url('repo_group_home', group_name=_new_group_name))
+                h.route_path('repo_group_home', repo_group_name=_new_group_name))
             h.flash(h.literal(_('Created repository group %s')
                     % repo_group_url), category='success')
             # TODO: in futureaction_logger(, '', '', '', self.sa)
@@ -234,7 +234,6 b' class RepoGroupsController(BaseControlle'
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
         #    h.form(url('repos_group', group_name=GROUP_NAME), method='put')
-        # url('repo_group_home', group_name=GROUP_NAME)
 
         c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         can_create_in_root = self._can_create_repo_group()
@@ -284,7 +283,6 b' class RepoGroupsController(BaseControlle'
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
         #    h.form(url('repos_group', group_name=GROUP_NAME), method='delete')
-        # url('repo_group_home', group_name=GROUP_NAME)
 
         gr = c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         repos = gr.repositories.all()

rhodecode/controllers/admin/repos.py

@@ -185,7 +185,7 b' class ReposController(BaseRepoController'
         except Exception as e:
             msg = self._log_creation_exception(e, form_result.get('repo_name'))
             h.flash(msg, category='error')
-            return redirect(url('home'))
+            return redirect(h.route_path('home'))
 
         return redirect(h.url('repo_creating_home',
                               repo_name=form_result['repo_name_full'],
@@ -265,7 +265,7 b' class ReposController(BaseRepoController'
                 if task.failed():
                     msg = self._log_creation_exception(task.result, c.repo)
                     h.flash(msg, category='error')
-                    return redirect(url('home'), code=501)
+                    return redirect(h.route_path('home'), code=501)
 
         repo = Repository.get_by_repo_name(repo_name)
         if repo and repo.repo_state == Repository.STATE_CREATED:

rhodecode/controllers/forks.py

@@ -139,7 +139,7 b' class ForksController(BaseRepoController'
         c.repo_info = Repository.get_by_repo_name(repo_name)
         if not c.repo_info:
             h.not_mapped_error(repo_name)
-            return redirect(url('home'))
+            return redirect(h.route_path('home'))
 
         defaults = self.__load_data(repo_name)
 

rhodecode/controllers/home.py

@@ -65,46 +65,3 b' class HomeController(BaseController):'
         msg = ('RhodeCode Enterprise %s test exception. Generation time: %s'
                % (c.rhodecode_name, time.time()))
         raise TestException(msg)
-
-    def _get_groups_and_repos(self, repo_group_id=None):
-        # repo groups groups
-        repo_group_list = RepoGroup.get_all_repo_groups(group_id=repo_group_id)
-        _perms = ['group.read', 'group.write', 'group.admin']
-        repo_group_list_acl = RepoGroupList(repo_group_list, perm_set=_perms)
-        repo_group_data = RepoGroupModel().get_repo_groups_as_dict(
-            repo_group_list=repo_group_list_acl, admin=False)
-
-        # repositories
-        repo_list = Repository.get_all_repos(group_id=repo_group_id)
-        _perms = ['repository.read', 'repository.write', 'repository.admin']
-        repo_list_acl = RepoList(repo_list, perm_set=_perms)
-        repo_data = RepoModel().get_repos_as_dict(
-            repo_list=repo_list_acl, admin=False)
-
-        return repo_data, repo_group_data
-
-    @LoginRequired()
-    def index(self):
-        c.repo_group = None
-
-        repo_data, repo_group_data = self._get_groups_and_repos()
-        # json used to render the grids
-        c.repos_data = json.dumps(repo_data)
-        c.repo_groups_data = json.dumps(repo_group_data)
-
-        return render('/index.mako')
-
-    @LoginRequired()
-    @HasRepoGroupPermissionAnyDecorator('group.read', 'group.write',
-                                        'group.admin')
-    def index_repo_group(self, group_name):
-        """GET /repo_group_name: Show a specific item"""
-        c.repo_group = RepoGroupModel()._get_repo_group(group_name)
-        repo_data, repo_group_data = self._get_groups_and_repos(
-            c.repo_group.group_id)
-
-        # json used to render the grids
-        c.repos_data = json.dumps(repo_data)
-        c.repo_groups_data = json.dumps(repo_group_data)
-
-        return render('index_repo_group.mako')

rhodecode/events/base.py

@@ -82,7 +82,7 b' class RhodecodeEvent(object):'
         if self.request:
             from rhodecode.lib import helpers as h
             try:
-                return h.url('home', qualified=True)
+                return h.route_url('home')
             except Exception:
                 log.exception('Failed to fetch URL for server')
                 return default

rhodecode/lib/auth.py

@@ -1429,10 +1429,16 b' class HasRepoPermissionAllDecorator(Perm'
     def check_permissions(self, user):
         perms = user.permissions
         repo_name = self._get_repo_name()
+
         try:
             user_perms = set([perms['repositories'][repo_name]])
         except KeyError:
+            log.debug('cannot locate repo with name: `%s` in permissions defs',
+                      repo_name)
             return False
+
+        log.debug('checking `%s` permissions for repo `%s`',
+                  user_perms, repo_name)
         if self.required_perms.issubset(user_perms):
             return True
         return False
@@ -1450,11 +1456,16 b' class HasRepoPermissionAnyDecorator(Perm'
     def check_permissions(self, user):
         perms = user.permissions
         repo_name = self._get_repo_name()
+
         try:
             user_perms = set([perms['repositories'][repo_name]])
         except KeyError:
+            log.debug('cannot locate repo with name: `%s` in permissions defs',
+                      repo_name)
             return False
 
+        log.debug('checking `%s` permissions for repo `%s`',
+                  user_perms, repo_name)
         if self.required_perms.intersection(user_perms):
             return True
         return False
@@ -1476,8 +1487,12 b' class HasRepoGroupPermissionAllDecorator'
         try:
             user_perms = set([perms['repositories_groups'][group_name]])
         except KeyError:
+            log.debug('cannot locate repo group with name: `%s` in permissions defs',
+                      group_name)
             return False
 
+        log.debug('checking `%s` permissions for repo group `%s`',
+                  user_perms, group_name)
         if self.required_perms.issubset(user_perms):
             return True
         return False
@@ -1496,11 +1511,16 b' class HasRepoGroupPermissionAnyDecorator'
     def check_permissions(self, user):
         perms = user.permissions
         group_name = self._get_repo_group_name()
+
         try:
             user_perms = set([perms['repositories_groups'][group_name]])
         except KeyError:
+            log.debug('cannot locate repo group with name: `%s` in permissions defs',
+                      group_name)
             return False
 
+        log.debug('checking `%s` permissions for repo group `%s`',
+                  user_perms, group_name)
         if self.required_perms.intersection(user_perms):
             return True
         return False

rhodecode/lib/base.py

@@ -555,7 +555,7 b' class BaseRepoController(BaseController)'
                     "The repository at %(repo_name)s cannot be located.") %
                     {'repo_name': c.repo_name},
                     category='error', ignore_duplicate=True)
-                redirect(url('home'))
+                redirect(h.route_path('home'))
 
             # update last change according to VCS data
             if not missing_requirements:

rhodecode/lib/helpers.py

@@ -1534,7 +1534,7 b' def breadcrumb_repo_link(repo):'
     """
 
     path = [
-        link_to(group.name, url('repo_group_home', group_name=group.group_name))
+        link_to(group.name, route_path('repo_group_home', repo_group_name=group.group_name))
         for group in repo.groups_with_parents
     ] + [
         link_to(repo.just_name, url('summary_home', repo_name=repo.repo_name))
@@ -1960,24 +1960,24 b' def get_last_path_part(file_node):'
     return u'../' + path
 
 
-def route_url(*args, **kwds):
+def route_url(*args, **kwargs):
     """
     Wrapper around pyramids `route_url` (fully qualified url) function. 
     It is used to generate URLs from within pylons views or templates. 
     This will be removed when pyramid migration if finished.
     """
     req = get_current_request()
-    return req.route_url(*args, **kwds)
+    return req.route_url(*args, **kwargs)
 
 
-def route_path(*args, **kwds):
+def route_path(*args, **kwargs):
     """
     Wrapper around pyramids `route_path` function. It is used to generate
     URLs from within pylons views or templates. This will be removed when
     pyramid migration if finished.
     """
     req = get_current_request()
-    return req.route_path(*args, **kwds)
+    return req.route_path(*args, **kwargs)
 
 
 def route_path_or_none(*args, **kwargs):

rhodecode/lib/utils.py

@@ -96,10 +96,11 b' def repo_name_slug(value):'
 # PERM DECORATOR HELPERS FOR EXTRACTING NAMES FOR PERM CHECKS
 #==============================================================================
 def get_repo_slug(request):
-    if isinstance(request, Request) and getattr(request, 'matchdict', None):
+    if isinstance(request, Request) and getattr(request, 'db_repo', None):
         # pyramid
-        _repo = request.matchdict.get('repo_name')
+        _repo = request.db_repo.repo_name
     else:
+        # TODO(marcink): remove after pylons migration...
         _repo = request.environ['pylons.routes_dict'].get('repo_name')
 
     if _repo:
@@ -110,7 +111,7 b' def get_repo_slug(request):'
 def get_repo_group_slug(request):
     if isinstance(request, Request) and getattr(request, 'matchdict', None):
         # pyramid
-        _group = request.matchdict.get('group_name')
+        _group = request.matchdict.get('repo_group_name')
     else:
         _group = request.environ['pylons.routes_dict'].get('group_name')
 

rhodecode/lib/utils2.py

@@ -572,7 +572,8 b' def credentials_filter(uri):'
     return ''.join(uri)
 
 
-def get_clone_url(uri_tmpl, qualifed_home_url, repo_name, repo_id, **override):
+def get_clone_url(request, uri_tmpl, repo_name, repo_id, **override):
+    qualifed_home_url = request.route_url('home')
     parsed_url = urlobject.URLObject(qualifed_home_url)
     decoded_path = safe_unicode(urllib.unquote(parsed_url.path.rstrip('/')))
     args = {

rhodecode/model/db.py

@@ -44,8 +44,8 b' from sqlalchemy.sql.expression import tr'
 from beaker.cache import cache_region
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
-from pylons import url
 from pylons.i18n.translation import lazy_ugettext as _
+from pyramid.threadlocal import get_current_request
 
 from rhodecode.lib.vcs import get_vcs_instance
 from rhodecode.lib.vcs.backends.base import EmptyCommit, Reference
@@ -1774,7 +1774,7 b' class Repository(Base, BaseModel):'
             'repo_name': repo.repo_name,
             'repo_type': repo.repo_type,
             'clone_uri': repo.clone_uri or '',
-            'url': url('summary_home', repo_name=self.repo_name, qualified=True),
+            'url': repo.home_url(),
             'private': repo.private,
             'created_on': repo.created_on,
             'description': repo.description,
@@ -1908,7 +1908,6 b' class Repository(Base, BaseModel):'
         return clone_uri
 
     def clone_url(self, **override):
-        qualified_home_url = url('home', qualified=True)
 
         uri_tmpl = None
         if 'with_id' in override:
@@ -1930,11 +1929,16 b' class Repository(Base, BaseModel):'
                 # ie, not having tmpl_context set up
                 pass
 
-        return get_clone_url(uri_tmpl=uri_tmpl,
-                             qualifed_home_url=qualified_home_url,
+        request = get_current_request()
+        return get_clone_url(request=request,
+                             uri_tmpl=uri_tmpl,
                              repo_name=self.repo_name,
                              repo_id=self.repo_id, **override)
 
+    def home_url(self):
+        request = get_current_request()
+        return request.route_url('repo_summary', repo_name=self.repo_name)
+
     def set_state(self, state):
         self.repo_state = state
         Session().add(self)
@@ -3299,6 +3303,7 b' class _PullRequestBase(BaseModel):'
             return None
 
     def get_api_data(self):
+        from pylons import url
         from rhodecode.model.pull_request import PullRequestModel
         pull_request = self
         merge_status = PullRequestModel().merge_status(pull_request)
@@ -3690,6 +3695,8 b' class Gist(Base, BaseModel):'
 
     def gist_url(self):
         import rhodecode
+        from pylons import url
+
         alias_url = rhodecode.CONFIG.get('gist_alias_url')
         if alias_url:
             return alias_url.replace('{gistid}', self.gist_access_id)

rhodecode/model/notification.py

@@ -334,9 +334,9 b' class EmailNotificationModel(BaseModel):'
         """
 
         kwargs['rhodecode_instance_name'] = self.rhodecode_instance_name
-
+        instance_url = h.route_url('home')
         _kwargs = {
-            'instance_url': h.url('home', qualified=True),
+            'instance_url': instance_url,
             'whitespace_filter': self.whitespace_filter
         }
         _kwargs.update(kwargs)

rhodecode/model/repo.py

@@ -131,6 +131,7 b' class RepoModel(BaseModel):'
         :param repo_name:
         :return: repo object if matched else None
         """
+
         try:
             _repo_id = self._extract_id_from_repo_name(repo_name)
             if _repo_id:

rhodecode/public/js/rhodecode/routes.js

@@ -99,6 +99,7 b' function registerRCRoutes() {'
     pyroutes.register('user_group_autocomplete_data', '/_user_groups', []);
     pyroutes.register('repo_list_data', '/_repos', []);
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
+    pyroutes.register('repo_summary', '/%(repo_name)s', ['repo_name']);
     pyroutes.register('repo_summary_explicit', '/%(repo_name)s/summary', ['repo_name']);
     pyroutes.register('tags_home', '/%(repo_name)s/tags', ['repo_name']);
     pyroutes.register('branches_home', '/%(repo_name)s/branches', ['repo_name']);
@@ -121,6 +122,8 b' function registerRCRoutes() {'
     pyroutes.register('strip', '/%(repo_name)s/settings/strip', ['repo_name']);
     pyroutes.register('strip_check', '/%(repo_name)s/settings/strip_check', ['repo_name']);
     pyroutes.register('strip_execute', '/%(repo_name)s/settings/strip_execute', ['repo_name']);
+    pyroutes.register('repo_group_home', '/%(repo_group_name)s', ['repo_group_name']);
+    pyroutes.register('repo_group_home_slash', '/%(repo_group_name)s/', ['repo_group_name']);
     pyroutes.register('search', '/_admin/search', []);
     pyroutes.register('search_repo', '/%(repo_name)s/search', ['repo_name']);
     pyroutes.register('user_profile', '/_profiles/%(username)s', ['username']);

rhodecode/templates/admin/integrations/list.mako

@@ -164,7 +164,7 b''
               ${_('repo')}:${integration.repo.repo_name}
             </a>
             %elif integration.repo_group:
-            <a href="${h.url('repo_group_home', group_name=integration.repo_group.group_name)}">
+            <a href="${h.route_path('repo_group_home', repo_group_name=integration.repo_group.group_name)}">
               ${_('repogroup')}:${integration.repo_group.group_name}
               %if integration.child_repos_only:
               ${_('child repos only')}

rhodecode/templates/admin/repo_groups/repo_group_edit.mako

@@ -13,7 +13,7 b''
     »
     ${h.link_to(_('Repository Groups'),h.url('repo_groups'))}
     %if c.repo_group.parent_group:
-        » ${h.link_to(c.repo_group.parent_group.name,h.url('repo_group_home',group_name=c.repo_group.parent_group.group_name))}
+        » ${h.link_to(c.repo_group.parent_group.name, h.route_path('repo_group_home', repo_group_name=c.repo_group.parent_group.group_name))}
     %endif
     » ${c.repo_group.name}
 </%def>

rhodecode/templates/admin/repos/repo_creating.mako

@@ -61,7 +61,7 b''
             }
         }
         else {
-            window.location = "${h.url('home')}";
+            window.location = "${h.route_path('home')}";
         }
     }
   });

rhodecode/templates/admin/users/user_edit_advanced.mako

@@ -59,7 +59,7 b''
         ${h.secure_form(h.url('create_personal_repo_group', user_id=c.user.user_id), method='post')}
 
         %if c.personal_repo_group:
-            <div class="panel-body-title-text">${_('Users personal repository group')} : ${h.link_to(c.personal_repo_group.group_name, url('repo_group_home', group_name=c.personal_repo_group.group_name))}</div>
+            <div class="panel-body-title-text">${_('Users personal repository group')} : ${h.link_to(c.personal_repo_group.group_name, h.route_path('repo_group_home', repo_group_name=c.personal_repo_group.group_name))}</div>
         %else:
             <div class="panel-body-title-text">
                 ${_('This user currently does not have a personal repository group')}

rhodecode/templates/base/base.mako

@@ -7,7 +7,7 b''
       <div id="header-inner" class="wrapper">
           <div id="logo">
               <div class="logo-wrapper">
-                  <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                  <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
               </div>
               %if c.rhodecode_name:
                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
@@ -343,7 +343,7 b''
             <ol class="links">
               <li>${h.link_to(_(u'My account'),h.route_path('my_account_profile'))}</li>
               % if c.rhodecode_user.personal_repo_group:
-                <li>${h.link_to(_(u'My personal group'), h.url('repo_group_home', group_name=c.rhodecode_user.personal_repo_group.group_name))}</li>
+                <li>${h.link_to(_(u'My personal group'), h.route_path('repo_group_home', repo_group_name=c.rhodecode_user.personal_repo_group.group_name))}</li>
               % endif
               <li class="logout">
               ${h.secure_form(h.route_path('logout'))}

rhodecode/templates/base/perms_summary.mako

@@ -126,7 +126,7 b''
                         %if section == 'repositories':
                             <a href="${h.url('summary_home',repo_name=k)}">${k}</a>
                         %elif section == 'repositories_groups':
-                            <a href="${h.url('repo_group_home',group_name=k)}">${k}</a>
+                            <a href="${h.route_path('repo_group_home', repo_group_name=k)}">${k}</a>
                         %elif section == 'user_groups':
                             ##<a href="${h.url('edit_users_group',user_group_id=k)}">${k}</a>
                             ${k}

rhodecode/templates/base/root.mako

@@ -84,7 +84,7 b" c.template_context['default_user'] = {"
             // register templateContext to pass template variables to JS
             var templateContext = ${h.json.dumps(c.template_context)|n};
 
-            var APPLICATION_URL = "${h.url('home').rstrip('/')}";
+            var APPLICATION_URL = "${h.route_path('home').rstrip('/')}";
             var ASSET_URL = "${h.asset('')}";
             var DEFAULT_RENDERER = "${h.get_visual_attr(c, 'default_renderer')}";
             var CSRF_TOKEN = "${getattr(c, 'csrf_token', '')}";

rhodecode/templates/data_table/_dt_elements.mako

@@ -146,7 +146,7 b''
   <div class="menu_items_container hidden">
     <ul class="menu_items">
       <li>
-         <a href="${h.url('repo_group_home',group_name=repo_group_name)}">
+         <a href="${h.route_path('repo_group_home', repo_group_name=repo_group_name)}">
          <span class="icon">
              <i class="icon-file-text"></i>
          </span>
@@ -160,7 +160,7 b''
 
 <%def name="repo_group_name(repo_group_name, children_groups=None)">
   <div>
-    <a href="${h.url('repo_group_home',group_name=repo_group_name)}">
+    <a href="${h.route_path('repo_group_home', repo_group_name=repo_group_name)}">
     <i class="icon-folder-close" title="${_('Repository group')}"></i>
       %if children_groups:
           ${h.literal(' &raquo; '.join(children_groups))}

rhodecode/templates/index_repo_group.mako

@@ -10,9 +10,9 b''
 
 <%def name="breadcrumbs()">
     <span class="groups_breadcrumbs">
-    ${h.link_to(_(u'Home'),h.url('/'))}
+    ${h.link_to(_(u'Home'), h.route_path('home'))}
     %if c.repo_group.parent_group:
-        &raquo; ${h.link_to(c.repo_group.parent_group.name,h.url('repo_group_home',group_name=c.repo_group.parent_group.group_name))}
+        &raquo; ${h.link_to(c.repo_group.parent_group.name, h.route_path('repo_group_home', repo_group_name=c.repo_group.parent_group.group_name))}
     %endif
     &raquo; ${c.repo_group.name}
     </span>

rhodecode/templates/login.mako

@@ -14,7 +14,7 b''
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>

rhodecode/templates/password_reset.mako

@@ -14,7 +14,7 b''
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>

rhodecode/templates/register.mako

@@ -14,7 +14,7 b''
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.url('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
                 <div class="branding"> ${h.branding(c.rhodecode_name)}</div>

rhodecode/tests/__init__.py

@@ -48,7 +48,6 b' from rhodecode.model.db import User'
 from rhodecode.lib import auth
 from rhodecode.lib.helpers import flash, link_to
 from rhodecode.lib.utils2 import safe_unicode, safe_str
-from rhodecode.tests.utils import get_session_from_response
 
 
 log = logging.getLogger(__name__)
@@ -178,7 +177,7 b' def login_user_session('
     response = response.follow()
     assert response.status == '200 OK'
 
-    session = get_session_from_response(response)
+    session = response.get_session_from_response()
     assert 'rhodecode_user' in session
     rc_user = session['rhodecode_user']
     assert rc_user.get('username') == username

rhodecode/tests/events/test_pullrequest.py

@@ -42,7 +42,7 b' from rhodecode.events import ('
     PullRequestMergeEvent,
     PullRequestCloseEvent,
 ])
-def test_pullrequest_events_serialized(pr_util, EventClass):
+def test_pullrequest_events_serialized(EventClass, pr_util, config_stub):
     pr = pr_util.create_pull_request()
     event = EventClass(pr)
     data = event.as_dict()
@@ -51,15 +51,17 b' def test_pullrequest_events_serialized(p'
     assert data['pullrequest']['pull_request_id'] == pr.pull_request_id
     assert data['pullrequest']['url']
 
+
 @pytest.mark.backends("git", "hg")
-def test_create_pull_request_events(pr_util):
+def test_create_pull_request_events(pr_util, config_stub):
     with EventCatcher() as event_catcher:
         pr_util.create_pull_request()
 
     assert PullRequestCreateEvent in event_catcher.events_types
 
+
 @pytest.mark.backends("git", "hg")
-def test_pullrequest_comment_events_serialized(pr_util):
+def test_pullrequest_comment_events_serialized(pr_util, config_stub):
     pr = pr_util.create_pull_request()
     comment = CommentsModel().get_comments(
         pr.target_repo.repo_id, pull_request=pr)[0]
@@ -73,7 +75,7 b' def test_pullrequest_comment_events_seri'
 
 
 @pytest.mark.backends("git", "hg")
-def test_close_pull_request_events(pr_util, user_admin):
+def test_close_pull_request_events(pr_util, user_admin, config_stub):
     pr = pr_util.create_pull_request()
 
     with EventCatcher() as event_catcher:
@@ -83,7 +85,7 b' def test_close_pull_request_events(pr_ut'
 
 
 @pytest.mark.backends("git", "hg")
-def test_close_pull_request_with_comment_events(pr_util, user_admin):
+def test_close_pull_request_with_comment_events(pr_util, user_admin, config_stub):
     pr = pr_util.create_pull_request()
 
     with EventCatcher() as event_catcher:

rhodecode/tests/events/test_repo.py

@@ -75,7 +75,6 b' def test_vcs_repo_events_serialize(repo_'
     assert data['repo']['url']
 
 
-
 @pytest.mark.parametrize('EventClass', [RepoPushEvent])
 def test_vcs_repo_push_event_serialize(repo_stub, scm_extras, EventClass):
     event = EventClass(repo_name=repo_stub.repo_name,

rhodecode/tests/functional/test_admin_gists.py

@@ -28,7 +28,6 b' from rhodecode.model.meta import Session'
 from rhodecode.tests import (
     TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS,
     TestController, assert_session_flash, url)
-from rhodecode.tests.utils import AssertResponse
 
 
 class GistUtility(object):
@@ -273,7 +272,7 b' class TestGistsController(TestController'
 
         response.mustcontain('added file: gist-show-me<')
 
-        assert_response = AssertResponse(response)
+        assert_response = response.assert_response()
         assert_response.element_equals_to(
             'div.rc-user span.user',
             '<a href="/_profiles/test_admin">test_admin</a></span>')
@@ -296,7 +295,7 b' class TestGistsController(TestController'
         response = self.app.get(url('gist', gist_id=gist.gist_access_id))
         response.mustcontain('added file: gist-show-me-only-when-im-logged-in')
 
-        assert_response = AssertResponse(response)
+        assert_response = response.assert_response()
         assert_response.element_equals_to(
             'div.rc-user span.user',
             '<a href="/_profiles/test_admin">test_admin</a></span>')

rhodecode/tests/functional/test_admin_my_account.py

@@ -31,6 +31,12 b' from rhodecode.tests.utils import Assert'
 fixture = Fixture()
 
 
+def route_path(name, **kwargs):
+    return {
+        'home': '/',
+    }[name].format(**kwargs)
+
+
 class TestMyAccountController(TestController):
     test_user_1 = 'testme'
     test_user_1_password = '0jd83nHNS/d23n'
@@ -41,7 +47,7 b' class TestMyAccountController(TestContro'
         fixture.destroy_users(cls.destroy_users)
 
     def test_logout_form_contains_csrf(self, autologin_user, csrf_token):
-        response = self.app.get(url('home'))
+        response = self.app.get(route_path('home'))
         assert_response = AssertResponse(response)
         element = assert_response.get_element('.logout #csrf_token')
         assert element.value == csrf_token

rhodecode/tests/functional/test_admin_repo_groups.py

@@ -31,6 +31,7 b' from rhodecode.tests.fixture import Fixt'
 fixture = Fixture()
 
 
+
 def test_update(app, csrf_token, autologin_user, user_util):
     repo_group = user_util.create_repo_group()
     description = 'description for newly created repo group'
@@ -123,11 +124,13 b' class _BaseTest(TestController):'
         # run the check page that triggers the flash message
         # response = self.app.get(url('repo_check_home', repo_name=repo_name))
         # assert response.json == {u'result': True}
+        repo_gr_url = h.route_path(
+            'repo_group_home', repo_group_name=repo_group_name)
+
         assert_session_flash(
             response,
-            u'Created repository group <a href="%s">%s</a>' % (
-                h.url('repo_group_home', group_name=repo_group_name),
-                repo_group_name_unicode))
+            'Created repository group <a href="%s">%s</a>' % (
+                repo_gr_url, repo_group_name_unicode))
 
         # # test if the repo group was created in the database
         new_repo_group = RepoGroupModel()._get_repo_group(
@@ -138,8 +141,7 b' class _BaseTest(TestController):'
         assert new_repo_group.group_description == description
 
         # test if the repository is visible in the list ?
-        response = self.app.get(
-            url('repo_group_home', group_name=repo_group_name))
+        response = self.app.get(repo_gr_url)
         response.mustcontain(repo_group_name)
 
         # test if the repository group was created on filesystem
@@ -173,7 +175,7 b' class _BaseTest(TestController):'
             assert_session_flash(
                 response,
                 u'Created repository group <a href="%s">%s</a>' % (
-                    h.url('repo_group_home', group_name=expected_group_name),
+                    h.route_path('repo_group_home', repo_group_name=expected_group_name),
                     expected_group_name_unicode))
         finally:
             RepoGroupModel().delete(expected_group_name_unicode)
@@ -199,6 +201,13 b' class TestRepoGroupsControllerGIT(_BaseT'
     REPO_TYPE = 'git'
 
 
+class TestRepoGroupsControllerNonAsciiGit(_BaseTest):
+    REPO_GROUP = None
+    NEW_REPO_GROUP = 'git_repo_ąć'
+    REPO = GIT_REPO
+    REPO_TYPE = 'git'
+
+
 class TestRepoGroupsControllerHG(_BaseTest):
     REPO_GROUP = None
     NEW_REPO_GROUP = 'hg_repo'

rhodecode/tests/functional/test_delegated_admin.py

@@ -30,6 +30,12 b' from rhodecode.tests.fixture import Fixt'
 fixture = Fixture()
 
 
+def route_path(name, **kwargs):
+    return {
+        'home': '/',
+    }[name].format(**kwargs)
+
+
 class TestAdminUsersGroupsController(TestController):
 
     def test_regular_user_cannot_see_admin_interfaces(self, user_util):
@@ -37,7 +43,7 b' class TestAdminUsersGroupsController(Tes'
         self.log_user(user.username, 'qweqwe')
 
         # check if in home view, such user doesn't see the "admin" menus
-        response = self.app.get(url('home'))
+        response = self.app.get(route_path('home'))
 
         assert_response = response.assert_response()
 
@@ -69,7 +75,7 b' class TestAdminUsersGroupsController(Tes'
 
         self.log_user(username, 'qweqwe')
         # check if in home view, such user doesn't see the "admin" menus
-        response = self.app.get(url('home'))
+        response = self.app.get(route_path('home'))
 
         assert_response = response.assert_response()
 
@@ -109,7 +115,7 b' class TestAdminUsersGroupsController(Tes'
 
         self.log_user(username, 'qweqwe')
         # check if in home view, such user doesn't see the "admin" menus
-        response = self.app.get(url('home'))
+        response = self.app.get(route_path('home'))
 
         assert_response = response.assert_response()
 

rhodecode/tests/functional/test_login.py

@@ -28,7 +28,6 b' from rhodecode.tests import ('
     assert_session_flash, url, HG_REPO, TEST_USER_ADMIN_LOGIN,
     no_newline_id_generator)
 from rhodecode.tests.fixture import Fixture
-from rhodecode.tests.utils import AssertResponse, get_session_from_response
 from rhodecode.lib.auth import check_password
 from rhodecode.model.auth_token import AuthTokenModel
 from rhodecode.model import validators
@@ -72,7 +71,7 b' class TestLoginController(object):'
                                  {'username': 'test_admin',
                                   'password': 'test12'})
         assert response.status == '302 Found'
-        session = get_session_from_response(response)
+        session = response.get_session_from_response()
         username = session['rhodecode_user'].get('username')
         assert username == 'test_admin'
         response = response.follow()
@@ -84,7 +83,7 b' class TestLoginController(object):'
                                   'password': 'test12'})
 
         assert response.status == '302 Found'
-        session = get_session_from_response(response)
+        session = response.get_session_from_response()
         username = session['rhodecode_user'].get('username')
         assert username == 'test_regular'
         response = response.follow()
@@ -184,7 +183,7 b' class TestLoginController(object):'
                                   'password': 'test123'})
 
         assert response.status == '302 Found'
-        session = get_session_from_response(response)
+        session = response.get_session_from_response()
         username = session['rhodecode_user'].get('username')
         assert username == temp_user
         response = response.follow()
@@ -213,7 +212,7 b' class TestLoginController(object):'
             }
         )
 
-        assertr = AssertResponse(response)
+        assertr = response.assert_response()
         msg = validators.ValidUsername()._messages['username_exists']
         msg = msg % {'username': uname}
         assertr.element_contains('#username+.error-message', msg)
@@ -231,7 +230,7 b' class TestLoginController(object):'
             }
         )
 
-        assertr = AssertResponse(response)
+        assertr = response.assert_response()
         msg = validators.UniqSystemEmail()()._messages['email_taken']
         assertr.element_contains('#email+.error-message', msg)
 
@@ -247,7 +246,7 b' class TestLoginController(object):'
                 'lastname': 'test'
             }
         )
-        assertr = AssertResponse(response)
+        assertr = response.assert_response()
         msg = validators.UniqSystemEmail()()._messages['email_taken']
         assertr.element_contains('#email+.error-message', msg)
 
@@ -301,7 +300,7 b' class TestLoginController(object):'
             }
         )
 
-        assertr = AssertResponse(response)
+        assertr = response.assert_response()
         msg = validators.ValidUsername()._messages['username_exists']
         msg = msg % {'username': usr}
         assertr.element_contains('#username+.error-message', msg)

rhodecode/tests/functional/test_sessions.py

@@ -21,8 +21,13 b''
 import mock
 import pytest
 
-from rhodecode.tests import TEST_USER_ADMIN_LOGIN, url
-from rhodecode.tests.utils import AssertResponse
+from rhodecode.tests import TEST_USER_ADMIN_LOGIN
+
+
+def route_path(name, **kwargs):
+    return {
+        'home': '/',
+    }[name].format(**kwargs)
 
 
 class TestSessionBehaviorOnPasswordChange(object):
@@ -39,18 +44,23 b' class TestSessionBehaviorOnPasswordChang'
 
     def test_sessions_are_ok_when_password_is_not_changed(
             self, app, autologin_user):
-        response = app.get(url('home'))
-        assert_response = AssertResponse(response)
+        response = app.get(route_path('home'))
+        assert_response = response.assert_response()
         assert_response.element_contains(
             '#quick_login_link .menu_link_user', TEST_USER_ADMIN_LOGIN)
-        assert 'rhodecode_user' in response.session
-        assert response.session.was_invalidated is False
+
+        session = response.get_session_from_response()
+
+        assert 'rhodecode_user' in session
+        assert session.was_invalidated is False
 
     def test_sessions_invalidated_when_password_is_changed(
             self, app, autologin_user):
         self.password_changed_mock.return_value = True
-        response = app.get(url('home'))
-        assert_response = AssertResponse(response)
+        response = app.get(route_path('home'))
+        assert_response = response.assert_response()
         assert_response.element_contains('#quick_login_link .user', 'Sign in')
-        assert 'rhodecode_user' not in response.session
-        assert response.session.was_invalidated is True
+
+        session = response.get_session_from_response()
+        assert 'rhodecode_user' not in session
+        assert session.was_invalidated is True

rhodecode/tests/functional/test_summary.py

@@ -41,7 +41,7 b' fixture = Fixture()'
 
 
 class TestSummaryController(TestController):
-    def test_index(self, backend):
+    def test_index(self, backend, http_host_only_stub):
         self.log_user()
         repo_id = backend.repo.repo_id
         repo_name = backend.repo_name
@@ -61,12 +61,12 b' class TestSummaryController(TestControll'
         # clone url...
         response.mustcontain(
             'id="clone_url" readonly="readonly"'
-            ' value="http://[e-mail]:80/%s"' % (repo_name, ))
+            ' value="http://test_admin@%s/%s"' % (http_host_only_stub, repo_name, ))
         response.mustcontain(
             'id="clone_url_id" readonly="readonly"'
-            ' value="http://[e-mail]:80/_%s"' % (repo_id, ))
+            ' value="http://test_admin@%s/_%s"' % (http_host_only_stub, repo_id, ))
 
-    def test_index_svn_without_proxy(self, backend_svn):
+    def test_index_svn_without_proxy(self, backend_svn, http_host_only_stub):
         self.log_user()
         repo_id = backend_svn.repo.repo_id
         repo_name = backend_svn.repo_name
@@ -74,12 +74,13 b' class TestSummaryController(TestControll'
         # clone url...
         response.mustcontain(
             'id="clone_url" disabled'
-            ' value="http://[e-mail]:80/%s"' % (repo_name, ))
+            ' value="http://test_admin@%s/%s"' % (http_host_only_stub, repo_name, ))
         response.mustcontain(
             'id="clone_url_id" disabled'
-            ' value="http://[e-mail]:80/_%s"' % (repo_id, ))
+            ' value="http://test_admin@%s/_%s"' % (http_host_only_stub, repo_id, ))
 
-    def test_index_with_trailing_slash(self, autologin_user, backend):
+    def test_index_with_trailing_slash(self, autologin_user, backend,
+                                       http_host_only_stub):
         repo_id = backend.repo.repo_id
         repo_name = backend.repo_name
         with mock.patch('rhodecode.lib.helpers.is_svn_without_proxy',
@@ -91,10 +92,10 b' class TestSummaryController(TestControll'
         # clone url...
         response.mustcontain(
             'id="clone_url" readonly="readonly"'
-            ' value="http://[e-mail]:80/%s"' % (repo_name, ))
+            ' value="http://test_admin@%s/%s"' % (http_host_only_stub, repo_name, ))
         response.mustcontain(
             'id="clone_url_id" readonly="readonly"'
-            ' value="http://[e-mail]:80/_%s"' % (repo_id, ))
+            ' value="http://test_admin@%s/_%s"' % (http_host_only_stub, repo_id, ))
 
     def test_index_by_id(self, backend):
         self.log_user()

rhodecode/tests/lib/middleware/test_simplevcs.py

@@ -35,7 +35,6 b' from rhodecode.model.meta import Session'
 from rhodecode.tests import (
     HG_REPO, TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS)
 from rhodecode.tests.lib.middleware import mock_scm_app
-from rhodecode.tests.utils import set_anonymous_access
 
 
 class StubVCSController(simplevcs.SimpleVCS):
@@ -70,7 +69,7 b' def vcscontroller(pylonsapp, config_stub'
     config_stub.testing_securitypolicy()
     config_stub.include('rhodecode.authentication')
 
-    set_anonymous_access(True)
+    #set_anonymous_access(True)
     controller = StubVCSController(pylonsapp, pylonsapp.config, None)
     app = HttpsFixup(controller, pylonsapp.config)
     app = CustomTestApp(app)
@@ -93,13 +92,6 b' def _remove_default_user_from_query_cach'
     Session().expire(user)
 
 
[e-mail]
-def disable_anonymous_user(request, pylonsapp):
-    set_anonymous_access(False)
-
-    @request.addfinalizer
-    def cleanup():
-        set_anonymous_access(True)
 
 
 def test_handles_exceptions_during_permissions_checks(
@@ -275,7 +267,7 b' class TestShadowRepoExposure(object):'
                 controller.vcs_repo_name ==
                 controller._get_repository_name(environ_stub))
 
-    def test_set_repo_names_with_shadow(self, pylonsapp, pr_util):
+    def test_set_repo_names_with_shadow(self, pylonsapp, pr_util, config_stub):
         """
         Check that the set_repo_names method sets correct names on a request
         to a shadow repo.
@@ -304,7 +296,7 b' class TestShadowRepoExposure(object):'
         assert controller.is_shadow_repo
 
     def test_set_repo_names_with_shadow_but_missing_pr(
-            self, pylonsapp, pr_util):
+            self, pylonsapp, pr_util, config_stub):
         """
         Checks that the set_repo_names method enforces matching target repos
         and pull request IDs.
@@ -326,7 +318,7 b' class TestShadowRepoExposure(object):'
 
 
 @pytest.mark.usefixtures('db')
-class TestGenerateVcsResponse:
+class TestGenerateVcsResponse(object):
 
     def test_ensures_that_start_response_is_called_early_enough(self):
         self.call_controller_with_response_body(iter(['a', 'b']))
@@ -418,7 +410,7 b' class TestGenerateVcsResponse:'
         return self.controller._invalidate_cache.called
 
 
-class TestInitializeGenerator:
+class TestInitializeGenerator(object):
 
     def test_drains_first_element(self):
         gen = self.factory(['__init__', 1, 2])

rhodecode/tests/lib/test_codeblocks.py

@@ -19,11 +19,12 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import pytest
+from pygments.lexers import get_lexer_by_name
 
+from rhodecode.tests import no_newline_id_generator
 from rhodecode.lib.codeblocks import (
     tokenize_string, split_token_stream, rollup_tokenstream,
     render_tokenstream)
-from pygments.lexers import get_lexer_by_name
 
 
 class TestTokenizeString(object):
@@ -298,7 +299,7 b' class TestRenderTokenStream(object):'
             [('A', '', u'hel'), ('B', 'ins', u'lo')],
             '<span class="A">hel</span><span class="B"><ins>lo</ins></span>',
         ),
-    ])
+    ], ids=no_newline_id_generator)
     def test_render_tokenstream_with_ops(self, tokenstream, output):
         html = render_tokenstream(tokenstream)
         assert html == output

rhodecode/tests/lib/test_helpers.py

@@ -27,6 +27,7 b' from pylons.util import ContextObj'
 from rhodecode.lib import helpers
 from rhodecode.lib.utils2 import AttributeDict
 from rhodecode.model.settings import IssueTrackerSettingsModel
+from rhodecode.tests import no_newline_id_generator
 
 
 @pytest.mark.parametrize('url, expected_url', [
@@ -204,7 +205,7 b' def test_get_visual_attr(pylonsapp):'
     ('just a string\n', False, 'just a string'),
     ('just a string\n next line', False, 'just a string...'),
     ('just a string\n next line', True, 'just a string\n...'),
-])
+], ids=no_newline_id_generator)
 def test_chop_at(test_text, inclusive, expected_text):
     assert helpers.chop_at_smart(
         test_text, '\n', inclusive, '...') == expected_text

rhodecode/tests/lib/test_mako_emails.py

@@ -7,13 +7,13 b' from rhodecode.lib.utils2 import Attribu'
 from rhodecode.model.notification import EmailNotificationModel
 
 
-def test_get_template_obj(pylonsapp):
+def test_get_template_obj(app):
     template = EmailNotificationModel().get_renderer(
         EmailNotificationModel.TYPE_TEST)
     assert isinstance(template, PartialRenderer)
 
 
-def test_render_email(pylonsapp):
+def test_render_email(app, http_host_only_stub):
     kwargs = {}
     subject, headers, body, body_plaintext = EmailNotificationModel().render_email(
         EmailNotificationModel.TYPE_TEST, **kwargs)
@@ -28,12 +28,13 b' def test_render_email(pylonsapp):'
     assert body_plaintext == 'Email Plaintext Body'
 
     # body
-    assert 'This is a notification ' \
-           'from RhodeCode. http://test.example.com:80/' in body
+    notification_footer = 'This is a notification from RhodeCode. http://%s/' \
+                          % http_host_only_stub
+    assert notification_footer in body
     assert 'Email Body' in body
 
 
-def test_render_pr_email(pylonsapp, user_admin):
+def test_render_pr_email(app, user_admin):
 
     ref = collections.namedtuple('Ref',
         'name, type')(
@@ -77,7 +78,7 b' def test_render_pr_email(pylonsapp, user'
     EmailNotificationModel.TYPE_COMMIT_COMMENT,
     EmailNotificationModel.TYPE_PULL_REQUEST_COMMENT
 ])
-def test_render_comment_subject_no_newlines(pylonsapp, mention, email_type):
+def test_render_comment_subject_no_newlines(app, mention, email_type):
     ref = collections.namedtuple('Ref',
         'name, type')(
         'fxies123', 'book'

rhodecode/tests/models/test_changeset_status.py

@@ -30,7 +30,7 b' pytestmark = ['
 ]
 
 
-def test_new_pull_request_is_under_review(pr_util):
+def test_new_pull_request_is_under_review(pr_util, config_stub):
     pull_request = pr_util.create_pull_request()
 
     # Expect that review status "Under Review"
@@ -44,7 +44,7 b' def test_new_pull_request_is_under_revie'
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
 def test_pull_request_under_review_if_one_reviewer_voted(
-        pr_util, voted_status):
+        pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_status_votes(
         voted_status, pull_request.reviewers[0])
@@ -59,7 +59,7 b' def test_pull_request_under_review_if_on'
     db.ChangesetStatus.STATUS_REJECTED,
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
-def test_pull_request_has_voted_status_if_all_voted(pr_util, voted_status):
+def test_pull_request_has_voted_status_if_all_voted(pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_status_votes(
         voted_status, *pull_request.reviewers)
@@ -74,7 +74,8 b' def test_pull_request_has_voted_status_i'
     db.ChangesetStatus.STATUS_REJECTED,
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
-def test_pull_request_stays_if_update_without_change(pr_util, voted_status):
+def test_pull_request_stays_if_update_without_change(
+        pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_status_votes(
         voted_status, *pull_request.reviewers)
@@ -92,7 +93,7 b' def test_pull_request_stays_if_update_wi'
     db.ChangesetStatus.STATUS_REJECTED,
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
-def test_pull_request_under_review_if_update(pr_util, voted_status):
+def test_pull_request_under_review_if_update(pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_status_votes(
         voted_status, *pull_request.reviewers)
@@ -106,7 +107,7 b' def test_pull_request_under_review_if_up'
     assert pull_request.calculated_review_status() == expected_review_status
 
 
-def test_commit_under_review_if_part_of_new_pull_request(pr_util):
+def test_commit_under_review_if_part_of_new_pull_request(pr_util, config_stub):
     pull_request = pr_util.create_pull_request()
     for commit_id in pull_request.revisions:
         status = ChangesetStatusModel().get_status(
@@ -120,7 +121,7 b' def test_commit_under_review_if_part_of_'
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
 def test_commit_has_voted_status_after_vote_on_pull_request(
-        pr_util, voted_status):
+        pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_status_votes(
         voted_status, pull_request.reviewers[0])
@@ -130,7 +131,7 b' def test_commit_has_voted_status_after_v'
         assert status == voted_status
 
 
-def test_commit_under_review_if_added_to_pull_request(pr_util):
+def test_commit_under_review_if_added_to_pull_request(pr_util, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_status_votes(
         db.ChangesetStatus.STATUS_APPROVED, pull_request.reviewers[0])
@@ -147,7 +148,7 b' def test_commit_under_review_if_added_to'
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
 def test_commit_keeps_status_if_removed_from_pull_request(
-        pr_util, voted_status):
+        pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.add_one_commit()
     pr_util.create_status_votes(voted_status, pull_request.reviewers[0])
@@ -165,7 +166,7 b' def test_commit_keeps_status_if_removed_'
     db.ChangesetStatus.STATUS_UNDER_REVIEW,
 ])
 def test_commit_keeps_status_if_unchanged_after_update_of_pull_request(
-        pr_util, voted_status):
+        pr_util, voted_status, config_stub):
     pull_request = pr_util.create_pull_request()
     commit_id = pull_request.revisions[-1]
     pr_util.create_status_votes(voted_status, pull_request.reviewers[0])

rhodecode/tests/models/test_notifications.py

@@ -30,7 +30,7 b' from rhodecode.model.user import UserMod'
 fixture = Fixture()
 
 
-class TestNotifications:
+class TestNotifications(object):
     destroy_users = set()
 
     @classmethod
@@ -38,7 +38,7 b' class TestNotifications:'
         fixture.destroy_users(cls.destroy_users)
 
     @pytest.fixture(autouse=True)
-    def create_users(self, request, pylonsapp):
+    def create_users(self, request, app):
         Session.remove()
         self.u1 = UserModel().create_or_update(
             username=u'u1', password=u'qweqwe',
@@ -62,7 +62,7 b' class TestNotifications:'
         self.destroy_users.add('u3')
 
     @pytest.fixture(autouse=True)
-    def _clean_notifications(self, request, pylonsapp):
+    def _clean_notifications(self, request, app):
         for n in Notification.query().all():
             Session().delete(n)
 

rhodecode/tests/models/test_pullrequest.py

@@ -41,7 +41,8 b' pytestmark = ['
 ]
 
 
-class TestPullRequestModel:
[e-mail]('config_stub')
+class TestPullRequestModel(object):
 
     @pytest.fixture
     def pull_request(self, request, backend, pr_util):
@@ -372,6 +373,7 b' class TestPullRequestModel:'
         assert type(title) == unicode
 
 
[e-mail]('config_stub')
 class TestIntegrationMerge(object):
     @pytest.mark.parametrize('extra_config', (
         {'vcs.hooks.protocol': 'http', 'vcs.hooks.direct_calls': False},
@@ -433,7 +435,7 b' class TestIntegrationMerge(object):'
     (True, 0, 1),
 ])
 def test_outdated_comments(
-        pr_util, use_outdated, inlines_count, outdated_count):
+        pr_util, use_outdated, inlines_count, outdated_count, config_stub):
     pull_request = pr_util.create_pull_request()
     pr_util.create_inline_comment(file_path='not_in_updated_diff')
 
@@ -465,6 +467,7 b' def merge_extras(user_regular):'
     return extras
 
 
[e-mail]('config_stub')
 class TestUpdateCommentHandling(object):
 
     @pytest.fixture(autouse=True, scope='class')
@@ -572,6 +575,7 b' class TestUpdateCommentHandling(object):'
             assert_inline_comments(pull_request, visible=0, outdated=1)
 
 
[e-mail]('config_stub')
 class TestUpdateChangedFiles(object):
 
     def test_no_changes_on_unchanged_diff(self, pr_util):
@@ -681,7 +685,7 b' class TestUpdateChangedFiles(object):'
             removed=['file_a', 'file_b', 'file_c'])
 
 
-def test_update_writes_snapshot_into_pull_request_version(pr_util):
+def test_update_writes_snapshot_into_pull_request_version(pr_util, config_stub):
     model = PullRequestModel()
     pull_request = pr_util.create_pull_request()
     pr_util.update_source_repository()
@@ -692,7 +696,7 b' def test_update_writes_snapshot_into_pul'
     assert len(model.get_versions(pull_request)) == 1
 
 
-def test_update_skips_new_version_if_unchanged(pr_util):
+def test_update_skips_new_version_if_unchanged(pr_util, config_stub):
     pull_request = pr_util.create_pull_request()
     model = PullRequestModel()
     model.update_commits(pull_request)
@@ -701,7 +705,7 b' def test_update_skips_new_version_if_unc'
     assert len(model.get_versions(pull_request)) == 0
 
 
-def test_update_assigns_comments_to_the_new_version(pr_util):
+def test_update_assigns_comments_to_the_new_version(pr_util, config_stub):
     model = PullRequestModel()
     pull_request = pr_util.create_pull_request()
     comment = pr_util.create_comment()
@@ -713,7 +717,7 b' def test_update_assigns_comments_to_the_'
     assert comment.pull_request_version == model.get_versions(pull_request)[0]
 
 
-def test_update_adds_a_comment_to_the_pull_request_about_the_change(pr_util):
+def test_update_adds_a_comment_to_the_pull_request_about_the_change(pr_util, config_stub):
     model = PullRequestModel()
     pull_request = pr_util.create_pull_request()
     pr_util.update_source_repository()
@@ -745,7 +749,7 b' def test_update_adds_a_comment_to_the_pu'
     assert update_comment.text == expected_message
 
 
-def test_create_version_from_snapshot_updates_attributes(pr_util):
+def test_create_version_from_snapshot_updates_attributes(pr_util, config_stub):
     pull_request = pr_util.create_pull_request()
 
     # Avoiding default values
@@ -784,7 +788,7 b' def test_create_version_from_snapshot_up'
     assert version.pull_request == pull_request
 
 
-def test_link_comments_to_version_only_updates_unlinked_comments(pr_util):
+def test_link_comments_to_version_only_updates_unlinked_comments(pr_util, config_stub):
     version1 = pr_util.create_version_of_pull_request()
     comment_linked = pr_util.create_comment(linked_to=version1)
     comment_unlinked = pr_util.create_comment()

rhodecode/tests/models/test_pullrequest_git.py

@@ -25,6 +25,7 b' from rhodecode.lib.vcs.exceptions import'
 from rhodecode.model.pull_request import PullRequestModel
 
 
[e-mail]('config_stub')
 @pytest.mark.backends('git')
 class TestGetDiffForPrOrVersion(object):
 

rhodecode/tests/other/test_libs.py

@@ -332,7 +332,17 b' def test_initials_gravatar_mapping_algo('
 ])
 def test_clone_url_generator(tmpl, repo_name, overrides, prefix, expected):
     from rhodecode.lib.utils2 import get_clone_url
-    clone_url = get_clone_url(uri_tmpl=tmpl, qualifed_home_url='http://vps1:8000'+prefix,
+
+    class RequestStub(object):
+        def request_url(self, name):
+            return 'http://vps1:8000' + prefix
+
+        def route_url(self, name):
+            return self.request_url(name)
+
+    clone_url = get_clone_url(
+        request=RequestStub(),
+        uri_tmpl=tmpl,
                               repo_name=repo_name, repo_id=23, **overrides)
     assert clone_url == expected
 

rhodecode/tests/other/vcs_operations/conftest.py

@@ -41,8 +41,7 b' from rhodecode.model.settings import Set'
 from rhodecode.tests import (
     GIT_REPO, HG_REPO, TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS,)
 from rhodecode.tests.fixture import Fixture
-from rhodecode.tests.utils import (
-    set_anonymous_access, is_url_reachable, wait_for_url)
+from rhodecode.tests.utils import is_url_reachable, wait_for_url
 
 RC_LOG = os.path.join(tempfile.gettempdir(), 'rc.log')
 REPO_GROUP = 'a_repo_group'
@@ -188,11 +187,6 b' def rc_web_server('
     return RcWebServer(rc_web_server_config)
 
 
[e-mail](scope='class', autouse=True)
-def disable_anonymous_user_access(pylonsapp):
-    set_anonymous_access(False)
-
-
 @pytest.fixture
 def disable_locking(pylonsapp):
     r = Repository.get_by_repo_name(GIT_REPO)

rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_403.py

@@ -43,8 +43,8 b' def rc_web_server_config(testini_factory'
     return testini_factory(CUSTOM_PARAMS)
 
 
[e-mail]("disable_locking")
-class TestVCSOperationsOnCustomIniConfig:
[e-mail]("disable_locking", "disable_anonymous_user")
+class TestVCSOperationsOnCustomIniConfig(object):
 
     def test_clone_wrong_credentials_hg_ret_code(self, rc_web_server, tmpdir):
         clone_url = rc_web_server.repo_clone_url(HG_REPO, passwd='bad!')

rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_404.py

@@ -43,8 +43,8 b' def rc_web_server_config(testini_factory'
     return testini_factory(CUSTOM_PARAMS)
 
 
[e-mail]("disable_locking")
-class TestVCSOperationsOnCustomIniConfig:
[e-mail]("disable_locking", "disable_anonymous_user")
+class TestVCSOperationsOnCustomIniConfig(object):
 
     def test_clone_wrong_credentials_hg_ret_code(self, rc_web_server, tmpdir):
         clone_url = rc_web_server.repo_clone_url(HG_REPO, passwd='bad!')

rhodecode/tests/other/vcs_operations/test_vcs_calls_custom_auth_code_bad_code.py

@@ -43,8 +43,8 b' def rc_web_server_config(testini_factory'
     return testini_factory(CUSTOM_PARAMS)
 
 
[e-mail]("disable_locking")
-class TestVCSOperationsOnCustomIniConfig:
[e-mail]("disable_locking", "disable_anonymous_user")
+class TestVCSOperationsOnCustomIniConfig(object):
 
     def test_clone_wrong_credentials_hg_ret_code(self, rc_web_server, tmpdir):
         clone_url = rc_web_server.repo_clone_url(HG_REPO, passwd='bad!')

rhodecode/tests/other/vcs_operations/test_vcs_operations.py

@@ -48,7 +48,7 b' from rhodecode.tests.other.vcs_operation'
     HG_REPO_WITH_GROUP, GIT_REPO_WITH_GROUP)
 
 
[e-mail]("disable_locking")
[e-mail]("disable_locking", "disable_anonymous_user")
 class TestVCSOperations(object):
 
     def test_clone_hg_repo_by_admin(self, rc_web_server, tmpdir):

rhodecode/tests/other/vcs_operations/test_vcs_operations_locking.py

@@ -50,8 +50,8 b' def rc_web_server_config(testini_factory'
     return testini_factory(CUSTOM_PARAMS)
 
 
[e-mail]("disable_locking")
-class TestVCSOperationsOnCustomIniConfig:
[e-mail]("disable_locking", "disable_anonymous_user")
+class TestVCSOperationsOnCustomIniConfig(object):
 
     def test_clone_and_create_lock_hg(self, rc_web_server, tmpdir):
         # enable locking

rhodecode/tests/other/vcs_operations/test_vcs_operations_locking_custom_code.py

@@ -49,8 +49,8 b' def rc_web_server_config(testini_factory'
     return testini_factory(CUSTOM_PARAMS)
 
 
[e-mail]("disable_locking")
-class TestVCSOperationsOnCustomIniConfig:
[e-mail]("disable_locking", "disable_anonymous_user")
+class TestVCSOperationsOnCustomIniConfig(object):
 
     def test_clone_after_repo_was_locked_hg(self, rc_web_server, tmpdir):
         # lock repo

rhodecode/tests/plugin.py

@@ -62,7 +62,7 b' from rhodecode.tests import ('
     login_user_session, get_new_dir, utils, TESTS_TMP_PATH,
     TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR2_LOGIN,
     TEST_USER_REGULAR_PASS)
-from rhodecode.tests.utils import CustomTestApp
+from rhodecode.tests.utils import CustomTestApp, set_anonymous_access, add_test_routes
 from rhodecode.tests.fixture import Fixture
 
 
@@ -191,7 +191,15 b' def http_host_stub():'
     """
     Value of HTTP_HOST in the test run.
     """
-    return 'test.example.com:80'
+    return 'example.com:80'
+
+
[e-mail]
+def http_host_only_stub():
+    """
+    Value of HTTP_HOST in the test run.
+    """
+    return http_host_stub().split(':')[0]
 
 
 @pytest.fixture
@@ -204,7 +212,7 b' def http_environ(http_host_stub):'
     to override this for a specific test case.
     """
     return {
-        'SERVER_NAME': http_host_stub.split(':')[0],
+        'SERVER_NAME': http_host_only_stub(),
         'SERVER_PORT': http_host_stub.split(':')[1],
         'HTTP_HOST': http_host_stub,
         'HTTP_USER_AGENT': 'rc-test-agent',
@@ -213,7 +221,7 b' def http_environ(http_host_stub):'
 
 
 @pytest.fixture(scope='function')
-def app(request, pylonsapp, http_environ):
+def app(request, config_stub, pylonsapp, http_environ):
     app = CustomTestApp(
         pylonsapp,
         extra_environ=http_environ)
@@ -1680,6 +1688,7 b' def config_stub(request, request_stub):'
     Set up pyramid.testing and return the Configurator.
     """
     config = pyramid.testing.setUp(request=request_stub)
+    add_test_routes(config)
 
     @request.addfinalizer
     def cleanup():
@@ -1811,3 +1820,12 b' def local_dt_to_utc():'
         return dt.replace(tzinfo=dateutil.tz.tzlocal()).astimezone(
             dateutil.tz.tzutc()).replace(tzinfo=None)
     return _factory
+
+
[e-mail]
+def disable_anonymous_user(request, pylonsapp):
+    set_anonymous_access(False)
+
+    @request.addfinalizer
+    def cleanup():
+        set_anonymous_access(True)

rhodecode/tests/scripts/test_concurency.py

@@ -138,14 +138,6 b' def create_test_repo(force=True):'
     print 'done'
 
 
-def set_anonymous_access(enable=True):
-    sa = get_session()
-    user = sa.query(User).filter(User.username == 'default').one()
-    user.active = enable
-    sa.add(user)
-    sa.commit()
-
-
 def get_anonymous_access():
     sa = get_session()
     return sa.query(User).filter(User.username == 'default').one().active

rhodecode/tests/utils.py

@@ -94,6 +94,14 b' class CustomTestResponse(TestResponse):'
     def assert_response(self):
         return AssertResponse(self)
 
+    def get_session_from_response(self):
+        """
+        This returns the session from a response object. Pylons has some magic
+        to make the session available as `response.session`. But pyramid
+        doesn't expose it.
+        """
+        return self.request.environ['beaker.session']
+
 
 class TestRequest(Request):
 
@@ -109,9 +117,6 b' class CustomTestApp(TestApp):'
     RequestClass = TestRequest
 
 
-
-
-
 def set_anonymous_access(enabled):
     """(Dis)allows anonymous access depending on parameter `enabled`"""
     user = User.get_default_user()
@@ -357,16 +362,6 b' def is_url_reachable(url):'
     return True
 
 
-def get_session_from_response(response):
-    """
-    This returns the session from a response object. Pylons has some magic
-    to make the session available as `response.session`. But pyramid
-    doesn't expose it.
-    """
-    # TODO: Try to look up the session key also.
-    return response.request.environ['beaker.session']
-
-
 def repo_on_filesystem(repo_name):
     from rhodecode.lib import vcs
     from rhodecode.tests import TESTS_TMP_PATH
@@ -407,3 +402,13 b' def commit_change('
             f_path=filename
         )
     return commit
+
+
+def add_test_routes(config):
+    """
+    Adds test routing that can be used in different functional tests
+
+    """
+    config.add_route(name='home', pattern='/')
+    config.add_route(name='repo_summary', pattern='/{repo_name}')
+    config.add_route(name='repo_group_home', pattern='/{repo_group_name}')

rhodecode/tests/vcs/test_hg_vcsserver_cache_invalidation.py

@@ -114,7 +114,7 b' class TestMercurialRemoteRepoInvalidatio'
         return shadow_repo, source_ref, target_ref
 
     @pytest.mark.backends('hg')
-    def test_commit_does_not_exist_error_happens(self, pr_util, pylonsapp):
+    def test_commit_does_not_exist_error_happens(self, pr_util, app):
         """
         This test is somewhat special. It does not really test the system
         instead it is more or less a precondition for the
@@ -152,8 +152,7 b' class TestMercurialRemoteRepoInvalidatio'
             shadow_repo.get_commit(source_ref.commit_id)
 
     @pytest.mark.backends('hg')
-    def test_commit_does_not_exist_error_does_not_happen(
-            self, pr_util, pylonsapp):
+    def test_commit_does_not_exist_error_does_not_happen(self, pr_util, app):
         """
         This test simulates a pull request merge in which the pull operations
         are handled by a different VCSServer process than all other operations.