From a57a5c1852209cc4c369ea0adf7c4f9860f6b260 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Dec 24 2015 09:22:02 +0000 Subject: Adjust HTML to avoid un-needed space and adjust unit-tests accordingly --- diff --git a/pagure/templates/_render_repo.html b/pagure/templates/_render_repo.html index 62e8f93..abaeda3 100644 --- a/pagure/templates/_render_repo.html +++ b/pagure/templates/_render_repo.html @@ -65,15 +65,16 @@ username=None, hide=True) %}
-

{{ title }} - {{ count }} - {% if username %} +

{{ + title + }} {{ count }} + {%- if username -%} - {% endif %} + {%- endif -%}

{% if total and total > 1 %} {{ pagination_link(pagetitle, page, total) }} diff --git a/tests/test_progit_flask_ui_app.py b/tests/test_progit_flask_ui_app.py index 700539e..6909998 100644 --- a/tests/test_progit_flask_ui_app.py +++ b/tests/test_progit_flask_ui_app.py @@ -56,16 +56,16 @@ class PagureFlaskApptests(tests.Modeltests): output = self.app.get('/') self.assertEqual(output.status_code, 200) self.assertIn( - '

All Projects 0All Projects ' + '0

', output.data) tests.create_projects(self.session) output = self.app.get('/?page=abc') self.assertEqual(output.status_code, 200) self.assertIn( - '

All Projects 2All Projects ' + '2

', output.data) # Add a 3rd project with a long description item = pagure.lib.model.Project( @@ -111,13 +111,15 @@ class PagureFlaskApptests(tests.Modeltests): output = self.app.get('/user/pingou?repopage=abc&forkpage=def') self.assertEqual(output.status_code, 200) - self.assertTrue( - '
' in output.data) self.assertIn( - '

Projects 0' in output.data) + '
', + output.data) + self.assertIn( + '

Projects ' + '0

', output.data) + self.assertIn( + '
', + output.data) self.assertIn( '

Forks 0' in output.data) self.assertIn( - '

Projects 2' in output.data) + '
', + output.data) + self.assertIn( + '

Projects ' + '2

', output.data) + self.assertIn( + '
', + output.data) self.assertIn( '

Forks 0