pylons: remove pylons as dependency
- dependencies: bumped: -setuptools-scm==1.15.6 -celery==4.1.0 -kombu==4.1.0 -pytz==2017.3 -Routes==2.4.1 Removed all pylons components. Refactored the code to use only pyramid parts
This commit is contained in:
Marcin Kuzminski
parent
038bcc5f72
commit
5f9ae2ae11
145 changed files with 925 additions and 1891 deletions
|
|
@ -46,10 +46,11 @@ def route_path(name, params=None, **kwargs):
|
|||
return base_url
|
||||
|
||||
|
||||
class TestAdminController(TestController):
|
||||
@pytest.mark.usefixtures('app')
|
||||
class TestAdminController(object):
|
||||
|
||||
@pytest.fixture(scope='class', autouse=True)
|
||||
def prepare(self, request, pylonsapp):
|
||||
def prepare(self, request, baseapp):
|
||||
UserLog.query().delete()
|
||||
Session().commit()
|
||||
|
||||
|
|
@ -84,104 +85,87 @@ class TestAdminController(TestController):
|
|||
UserLog.query().delete()
|
||||
Session().commit()
|
||||
|
||||
def test_index(self):
|
||||
self.log_user()
|
||||
def test_index(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs'))
|
||||
response.mustcontain('Admin audit logs')
|
||||
|
||||
def test_filter_all_entries(self):
|
||||
self.log_user()
|
||||
def test_filter_all_entries(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs'))
|
||||
all_count = UserLog.query().count()
|
||||
response.mustcontain('%s entries' % all_count)
|
||||
|
||||
def test_filter_journal_filter_exact_match_on_repository(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_exact_match_on_repository(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='repository:rhodecode')))
|
||||
response.mustcontain('3 entries')
|
||||
|
||||
def test_filter_journal_filter_exact_match_on_repository_CamelCase(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_exact_match_on_repository_CamelCase(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='repository:RhodeCode')))
|
||||
response.mustcontain('3 entries')
|
||||
|
||||
def test_filter_journal_filter_wildcard_on_repository(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_wildcard_on_repository(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='repository:*test*')))
|
||||
response.mustcontain('862 entries')
|
||||
|
||||
def test_filter_journal_filter_prefix_on_repository(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_prefix_on_repository(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='repository:test*')))
|
||||
response.mustcontain('257 entries')
|
||||
|
||||
def test_filter_journal_filter_prefix_on_repository_CamelCase(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_prefix_on_repository_CamelCase(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='repository:Test*')))
|
||||
response.mustcontain('257 entries')
|
||||
|
||||
def test_filter_journal_filter_prefix_on_repository_and_user(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_prefix_on_repository_and_user(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='repository:test* AND username:demo')))
|
||||
response.mustcontain('130 entries')
|
||||
|
||||
def test_filter_journal_filter_prefix_on_repository_or_target_repo(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_prefix_on_repository_or_target_repo(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='repository:test* OR repository:rhodecode')))
|
||||
response.mustcontain('260 entries') # 257 + 3
|
||||
|
||||
def test_filter_journal_filter_exact_match_on_username(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_exact_match_on_username(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='username:demo')))
|
||||
response.mustcontain('1087 entries')
|
||||
|
||||
def test_filter_journal_filter_exact_match_on_username_camelCase(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_exact_match_on_username_camelCase(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='username:DemO')))
|
||||
response.mustcontain('1087 entries')
|
||||
|
||||
def test_filter_journal_filter_wildcard_on_username(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_wildcard_on_username(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='username:*test*')))
|
||||
entries_count = UserLog.query().filter(UserLog.username.ilike('%test%')).count()
|
||||
response.mustcontain('{} entries'.format(entries_count))
|
||||
|
||||
def test_filter_journal_filter_prefix_on_username(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_prefix_on_username(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='username:demo*')))
|
||||
response.mustcontain('1101 entries')
|
||||
|
||||
def test_filter_journal_filter_prefix_on_user_or_other_user(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_prefix_on_user_or_other_user(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='username:demo OR username:volcan')))
|
||||
response.mustcontain('1095 entries') # 1087 + 8
|
||||
|
||||
def test_filter_journal_filter_wildcard_on_action(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_wildcard_on_action(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='action:*pull_request*')))
|
||||
response.mustcontain('187 entries')
|
||||
|
||||
def test_filter_journal_filter_on_date(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_on_date(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='date:20121010')))
|
||||
response.mustcontain('47 entries')
|
||||
|
||||
def test_filter_journal_filter_on_date_2(self):
|
||||
self.log_user()
|
||||
def test_filter_journal_filter_on_date_2(self, autologin_user):
|
||||
response = self.app.get(route_path('admin_audit_logs',
|
||||
params=dict(filter='date:20121020')))
|
||||
response.mustcontain('17 entries')
|
||||
|
|
|
|||
|
|
@ -429,7 +429,7 @@ class TestAdminSettingsVcs(object):
|
|||
# TODO: johbo: What we really want is to checkpoint before a test run and
|
||||
# reset the session afterwards.
|
||||
@pytest.fixture(scope='class', autouse=True)
|
||||
def cleanup_settings(self, request, pylonsapp):
|
||||
def cleanup_settings(self, request, baseapp):
|
||||
ui_id = RhodeCodeUi.ui_id
|
||||
original_ids = list(
|
||||
r.ui_id for r in RhodeCodeUi.query().values(ui_id))
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ from sqlalchemy.orm.exc import NoResultFound
|
|||
|
||||
from rhodecode.lib import auth
|
||||
from rhodecode.lib import helpers as h
|
||||
from rhodecode.model import validators
|
||||
from rhodecode.model.db import User, UserApiKeys, UserEmailMap, Repository
|
||||
from rhodecode.model.meta import Session
|
||||
from rhodecode.model.user import UserModel
|
||||
|
|
@ -386,8 +385,7 @@ class TestAdminUsersView(TestController):
|
|||
'csrf_token': self.csrf_token,
|
||||
})
|
||||
|
||||
msg = validators.ValidUsername(
|
||||
False, {})._messages['system_invalid_username']
|
||||
msg = '???'
|
||||
msg = h.html_escape(msg % {'username': 'new_user'})
|
||||
response.mustcontain('<span class="error-message">%s</span>' % msg)
|
||||
response.mustcontain(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue