From 546bc596826053336764ff35766cc0c61edbb71f Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 27 Apr 2017 10:36:32 +0200 Subject: [PATCH] tests: fixed some tests after new audit-logger --- rhodecode/tests/functional/test_admin.py | 6 ++++-- rhodecode/tests/functional/test_admin_repos.py | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/rhodecode/tests/functional/test_admin.py b/rhodecode/tests/functional/test_admin.py index 379564d4..0e68c763 100644 --- a/rhodecode/tests/functional/test_admin.py +++ b/rhodecode/tests/functional/test_admin.py @@ -79,7 +79,8 @@ class TestAdminController(TestController): def test_filter_all_entries(self): self.log_user() response = self.app.get(url(controller='admin/admin', action='index',)) - response.mustcontain('2034 entries') + all_count = UserLog.query().count() + response.mustcontain('%s entries' % all_count) def test_filter_journal_filter_exact_match_on_repository(self): self.log_user() @@ -139,7 +140,8 @@ class TestAdminController(TestController): self.log_user() response = self.app.get(url(controller='admin/admin', action='index', filter='username:*test*')) - response.mustcontain('100 entries') + 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() diff --git a/rhodecode/tests/functional/test_admin_repos.py b/rhodecode/tests/functional/test_admin_repos.py index aaa7fa72..392c4537 100644 --- a/rhodecode/tests/functional/test_admin_repos.py +++ b/rhodecode/tests/functional/test_admin_repos.py @@ -797,13 +797,14 @@ class TestVcsSettings(object): self, backend, user_util, settings_util, csrf_token): repo = backend.create_repo() repo_name = repo.repo_name - user = UserModel().get_by_username(TEST_USER_REGULAR_LOGIN) logout_user_session(self.app, csrf_token) session = login_user_session( self.app, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS) new_csrf_token = auth.get_csrf_token(session) + user = UserModel().get_by_username(TEST_USER_REGULAR_LOGIN) + repo = Repository.get_by_repo_name(repo_name) user_util.grant_user_permission_to_repo(repo, user, 'repository.admin') data = self.FORM_DATA.copy() data['csrf_token'] = new_csrf_token @@ -1179,11 +1180,14 @@ class TestVcsSettings(object): self, backend_svn, user_util, settings_util, csrf_token): repo = backend_svn.create_repo() repo_name = repo.repo_name - user = UserModel().get_by_username(TEST_USER_REGULAR_LOGIN) + logout_user_session(self.app, csrf_token) session = login_user_session( self.app, TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS) csrf_token = auth.get_csrf_token(session) + + repo = Repository.get_by_repo_name(repo_name) + user = UserModel().get_by_username(TEST_USER_REGULAR_LOGIN) user_util.grant_user_permission_to_repo(repo, user, 'repository.admin') branch = settings_util.create_repo_rhodecode_ui( repo, VcsSettingsModel.SVN_BRANCH_SECTION, 'test_branch',