# HG changeset patch # User Marcin Kuzminski # Date 2019-11-04 09:53:09 # Node ID f294c7c5eede6bc7035c23702d900f4f2444c00d # Parent 07c1bd09dd726a1bfc4390e1703e524d085df18a tooltips: small fixes/tests fixes. diff --git a/rhodecode/apps/home/tests/test_home.py b/rhodecode/apps/home/tests/test_home.py --- a/rhodecode/apps/home/tests/test_home.py +++ b/rhodecode/apps/home/tests/test_home.py @@ -101,20 +101,6 @@ class TestHomeController(TestController) RepoGroupModel().delete(repo_group='gr1', force_delete=True) Session().commit() - def test_index_with_name_with_tags(self, user_util, autologin_user): - user = user_util.create_user() - username = user.username - user.name = '' - user.lastname = '#">' - - Session().add(user) - Session().commit() - user_util.create_repo(owner=username) - - response = self.app.get(route_path('home')) - response.mustcontain(h.html_escape(user.first_name)) - response.mustcontain(h.html_escape(user.last_name)) - @pytest.mark.parametrize("name, state", [ ('Disabled', False), ('Enabled', True), diff --git a/rhodecode/apps/repository/tests/test_repo_issue_tracker.py b/rhodecode/apps/repository/tests/test_repo_issue_tracker.py --- a/rhodecode/apps/repository/tests/test_repo_issue_tracker.py +++ b/rhodecode/apps/repository/tests/test_repo_issue_tracker.py @@ -84,7 +84,7 @@ class TestRepoIssueTracker(object): extra_environ=xhr_header, params=data) assert response.body == \ - 'example of prefix replacement' + 'example of prefix replacement' @request.addfinalizer def cleanup(): diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako --- a/rhodecode/templates/data_table/_dt_elements.mako +++ b/rhodecode/templates/data_table/_dt_elements.mako @@ -144,7 +144,7 @@ <%def name="revision(repo_name, rev, commit_id, author, last_msg, commit_date)">
%if rev >= 0: - ${'r{}:{}'.format(rev,h.short_id(commit_id))} + ${'r{}:{}'.format(rev,h.short_id(commit_id))} %else: ${_('No commits yet')} %endif diff --git a/rhodecode/tests/lib/test_helpers.py b/rhodecode/tests/lib/test_helpers.py --- a/rhodecode/tests/lib/test_helpers.py +++ b/rhodecode/tests/lib/test_helpers.py @@ -110,6 +110,7 @@ def test_extract_issues(backend, text_st 'pat': pattern, 'url': 'http://r.io/${repo}/i/${issue_id}', 'pref': '#', + 'desc': 'Test Pattern' } } @@ -129,7 +130,7 @@ def test_extract_issues(backend, text_st @pytest.mark.parametrize('text_string, pattern, link_format, expected_text', [ ('Fix #42', '(?:#)(?P\d+)', 'html', - 'Fix #42'), + 'Fix #42'), ('Fix #42', '(?:#)(?P\d+)', 'markdown', 'Fix [#42](http://r.io/{repo}/i/42)'), @@ -150,6 +151,7 @@ def test_process_patterns_repo(backend, 'pat': pattern, 'url': 'http://r.io/${repo}/i/${issue_id}', 'pref': '#', + 'desc': 'Test Pattern' } } @@ -163,7 +165,7 @@ def test_process_patterns_repo(backend, @pytest.mark.parametrize('text_string, pattern, expected_text', [ ('Fix #42', '(?:#)(?P\d+)', - 'Fix #42'), + 'Fix #42'), ('Fix #42', '(?:#)?\d+)', 'Fix #42'), # Broken regex ]) @@ -176,6 +178,7 @@ def test_process_patterns_no_repo(text_s 'pat': pattern, 'url': 'http://r.io/i/${issue_id}', 'pref': '#', + 'desc': 'Test Pattern' } } @@ -190,8 +193,8 @@ def test_process_patterns_no_repo(text_s def test_process_patterns_non_existent_repo_name(backend): text_string = 'Fix #42' pattern = '(?:#)(?P\d+)' - expected_text = ('Fix #42') + expected_text = ('Fix #42') def get_settings_mock(self, cache=True): return { @@ -200,6 +203,7 @@ def test_process_patterns_non_existent_r 'pat': pattern, 'url': 'http://r.io/${repo}/i/${issue_id}', 'pref': '#', + 'desc': 'Test Pattern' } }