##// END OF EJS Templates
ip-restritions: fix issue with loading empty IP rules for non-logged not-anonymous users....
ip-restritions: fix issue with loading empty IP rules for non-logged not-anonymous users. This case won't have any IP rules set. And we accidentally loaded them becuase of no empty user filter was present. This caused some odd display warnings for users.

File last commit:

r2487:fcee5614 default
r2838:d1dcf373 default
Show More
conftest.py
52 lines | 1.8 KiB | text/x-python | PythonLexer
project: added all source files and assets
r1 # -*- coding: utf-8 -*-
release: update copyright year to 2018
r2487 # Copyright (C) 2010-2018 RhodeCode GmbH
project: added all source files and assets
r1 #
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License, version 3
# (only), as published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# This program is dual-licensed. If you wish to learn more about the
# RhodeCode Enterprise Edition, including its added features, Support services,
# and proprietary license terms, please see https://rhodecode.com/licenses/
import pytest
from rhodecode.model.meta import Session
from rhodecode.model.user import UserModel
auth-tokens: fixed tests
r1482 from rhodecode.model.auth_token import AuthTokenModel
project: added all source files and assets
r1 from rhodecode.tests import TEST_USER_ADMIN_LOGIN
@pytest.fixture(scope="class")
pylons: remove pylons as dependency...
r2351 def testuser_api(request, baseapp):
project: added all source files and assets
r1 cls = request.cls
auth-tokens: fixed tests
r1482
# ADMIN USER
project: added all source files and assets
r1 cls.usr = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
cls.apikey = cls.usr.api_key
auth-tokens: fixed tests
r1482
# REGULAR USER
project: added all source files and assets
r1 cls.test_user = UserModel().create_or_update(
username='test-api',
password='test',
email='test@api.rhodecode.org',
firstname='first',
lastname='last'
)
auth-tokens: fixed tests
r1482 # create TOKEN for user, if he doesn't have one
if not cls.test_user.api_key:
AuthTokenModel().create(
db: use unicode for some of the defaults to reduce sqlalchemy warnings.
r1967 user=cls.test_user, description=u'TEST_USER_TOKEN')
auth-tokens: fixed tests
r1482
project: added all source files and assets
r1 Session().commit()
cls.TEST_USER_LOGIN = cls.test_user.username
cls.apikey_regular = cls.test_user.api_key