From 940ed4f66a7e901ac27e3e31850b9aac002b5cd3 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Jan 22 2016 08:29:50 +0000 Subject: [PATCH 1/4] tidied up the front page of a repo also added a view to show list the branches --- diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index 91c174e..388c048 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -178,12 +178,8 @@ git push -u origin master {% endif %}
- {%- if repo.url %} -

Project Website

-

{{ repo.url }}

- {% endif %} -

Admins

-

+

Owners
+
{{ repo.user.user | avatar(20) | safe }} @@ -205,84 +201,94 @@ git push -u origin master
{% endfor %} -

-
-
- -
-
- GIT URLs -
-
-
-
-
SSH
- -
-
-
-
GIT
- -
+
Branches
+
+ {% for branch in branches %} +
+ {% if not branchname == branch %} + + {% endif %} + {{branch}} + {% if not branchname == branch %} + + {% endif %} +
+ {% endfor %}
- {% if authenticated and repo_admin %} -
- {% if config['DOC_APP_URL'] and repo and repo.settings.get('project_documentation', True) %} -

Docs

-
-
-
SSH
- -
+
Source GIT URLs{% if authenticated and repo_admin %} + {%endif%}
+
+
+
+
SSH
+
-
-
-
GIT
- -
+
+
+
+
GIT
+
- {%endif%} - {% if config.get('ENABLE_TICKETS', True) %} -

Tickets

-
-
-
SSH
- +
+ {% if authenticated and repo_admin %} +
+ {% if config['DOC_APP_URL'] and repo and repo.settings.get('project_documentation', True) %} +
Docs GIT URLs
+
+
+
SSH
+ +
-
-
-
-
GIT
- +
+
+
GIT
+ +
-
- {%endif%} -

Requests

-
-
-
SSH
- + {%endif%} + {% if config.get('ENABLE_TICKETS', True) %} +
Issues GIT URLs
+
+
+
SSH
+ +
-
-
-
-
GIT
- +
+
+
GIT
+ +
+
+ {%endif%} +
Pull Requests GIT URLs
+
+
+
SSH
+ +
+
+
+
+
GIT
+ +
-
- - {% endif %} + {% endif %} +
diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index 2c99e4b..c7b5c03 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -66,8 +66,9 @@
{% endif %} -
- {% if repo.description %}{{ repo.description | markdown |safe }}{% else %}-{% endif -%} +
+ {% if repo.description %}{{ repo.description | safe }}{% else %}-{% endif -%} + {%- if repo.url %}  |  {{ repo.url }}{% endif %}
    From 66e52c5c83fcb224f3177fec65cd9ffe6285fed1 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 22 2016 09:06:00 +0000 Subject: [PATCH 2/4] Replace the more_gits id allowing to toggle more/less --- diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index 388c048..2c8c512 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -219,7 +219,8 @@ git push -u origin master
Source GIT URLs{% if authenticated and repo_admin %} {%endif%}
+ aria-expanded="false" aria-controls="moregiturls" + id="more_gits">more{%endif%}
@@ -342,14 +343,10 @@ $(document).ready(function() { $(function() { $( "#more_gits" ).click( function() { - var _xgits = $(".extra_gits"); - _xgits.toggle(); - console.log(_xgits[0]); - console.log(_xgits.is(':visible')); - if (_xgits.is(':visible')) { - $( "#more_gits" ).html('less'); + if ($( "#more_gits" ).html() == 'more') { + $( "#more_gits" ).html('less'); } else { - $( "#more_gits" ).html('more'); + $( "#more_gits" ).html('more'); } } ); From 18e5ecbf28c4c4c4c0cdb5e8c09d2f9ffc8719f2 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 22 2016 09:21:44 +0000 Subject: [PATCH 3/4] Rework a little what we show and when we show it --- diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index 2c8c512..47fbcf7 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -217,7 +217,11 @@ git push -u origin master
{% endfor %}
-
Source GIT URLs{% if authenticated and repo_admin %} +
Source GIT URLs{% if + (authenticated and repo_admin) or + (config['DOC_APP_URL'] and repo and + repo.settings.get('project_documentation', True)) + %} {%endif%}
@@ -236,10 +240,12 @@ git push -u origin master config.get('GIT_URL_GIT') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git" readonly>
- {% if authenticated and repo_admin %} -
- {% if config['DOC_APP_URL'] and repo and repo.settings.get('project_documentation', True) %} +
+ {% if config['DOC_APP_URL'] + and repo + and repo.settings.get('project_documentation', True) %}
Docs GIT URLs
+ {% if authenticated and repo_admin %}
SSH
@@ -247,6 +253,7 @@ git push -u origin master config.get('GIT_URL_SSH') }}docs/{{ repo.fullname }}.git" readonly>
+ {% endif %}
GIT
@@ -255,6 +262,7 @@ git push -u origin master
{%endif%} + {% if authenticated and repo_admin %} {% if config.get('ENABLE_TICKETS', True) %}
Issues GIT URLs
@@ -264,13 +272,6 @@ git push -u origin master config.get('GIT_URL_SSH') }}tickets/{{ repo.fullname }}.git" readonly>
-
-
-
GIT
- -
-
{%endif%}
Pull Requests GIT URLs
@@ -280,15 +281,10 @@ git push -u origin master config.get('GIT_URL_SSH') }}requests/{{ repo.fullname }}.git" readonly>
-
-
-
GIT
- -
-
-
{% endif %} +
+
+
From 98f2afacd46569d49493767fe4d3a5e8997548e0 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 22 2016 11:25:25 +0000 Subject: [PATCH 4/4] Fix the unit-tests for the changes in the UI --- diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py index b377a28..fcd5ded 100644 --- a/tests/test_pagure_flask_ui_app.py +++ b/tests/test_pagure_flask_ui_app.py @@ -185,7 +185,9 @@ class PagureFlaskApptests(tests.Modeltests): data['csrf_token'] = csrf_token output = self.app.post('/new/', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue('

Project #1

' in output.data) + self.assertIn( + '
\nProject #1
', + output.data) self.assertIn( '\n Project "project-1" created', output.data) diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index ca42902..bd34b53 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -128,12 +128,11 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( '\n Issue created', output.data) - self.assertTrue( - '

test project #1

' - in output.data) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) # Project w/o issue tracker repo = pagure.lib.get_project(self.session, 'test') @@ -188,12 +187,11 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( '\n Issue created', output.data) - self.assertTrue( - '

test project #1

' - in output.data) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) # Project w/o issue tracker repo = pagure.lib.get_project(self.session, 'test') @@ -231,7 +229,9 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.get('/test/issues') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + 'div class="projectinfo m-t-1 m-b-1">\ntest project #1 ' + '', output.data) self.assertTrue( '

\n 0 Open Issues' in output.data) @@ -251,27 +251,21 @@ class PagureFlaskIssuestests(tests.Modeltests): # Whole list output = self.app.get('/test/issues') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn('Issues - test - Pagure', output.data) self.assertTrue( '

\n 1 Open Issues' in output.data) # Status = closed output = self.app.get('/test/issues?status=cloSED') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn('Issues - test - Pagure', output.data) self.assertTrue( '

\n 0 Closed Issues' in output.data) # Status = fixed output = self.app.get('/test/issues?status=fixed') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn('Issues - test - Pagure', output.data) self.assertTrue( '

\n 0 Closed Issues' in output.data) @@ -314,9 +308,9 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.get('/test/issue/1') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + '', + output.data) self.assertTrue( '

Login to comment on this ticket.

' @@ -326,9 +320,9 @@ class PagureFlaskIssuestests(tests.Modeltests): with tests.user_set(pagure.APP, user): output = self.app.get('/test/issue/1') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + '', + output.data) self.assertFalse( '

Login to comment on this ticket.

' in output.data) @@ -337,9 +331,9 @@ class PagureFlaskIssuestests(tests.Modeltests): with tests.user_set(pagure.APP, user): output = self.app.get('/test/issue/1') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + '', output.data) csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] @@ -373,9 +367,14 @@ class PagureFlaskIssuestests(tests.Modeltests): with tests.user_set(pagure.APP, user): output = self.app.get('/test/issue/2') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #2 - test - Pagure', output.data) + self.assertIn( + '', output.data) + self.assertIn( + '', output.data) # Project w/o issue tracker repo = pagure.lib.get_project(self.session, 'test') @@ -419,9 +418,11 @@ class PagureFlaskIssuestests(tests.Modeltests): with tests.user_set(pagure.APP, user): output = self.app.get('/test/issue/1') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] @@ -441,9 +442,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertFalse( '' in output.data) @@ -452,9 +455,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertFalse( '' in output.data) @@ -463,9 +468,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n Successfully edited issue #1', output.data) @@ -482,9 +489,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n Comment added', output.data) @@ -508,9 +517,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n Tag added: tag2', output.data) @@ -534,9 +545,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n No user "ralph" found', output.data) @@ -557,9 +570,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n Issue assigned', output.data) @@ -603,9 +618,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/2/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #2 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n You cannot close a ticket ' 'that has ticket depending that are still open.', @@ -676,9 +693,11 @@ class PagureFlaskIssuestests(tests.Modeltests): with tests.user_set(pagure.APP, user): output = self.app.get('/test/issue/1') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] @@ -691,9 +710,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n Comment added', output.data) @@ -730,9 +751,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n Comment removed', output.data) @@ -785,9 +808,11 @@ class PagureFlaskIssuestests(tests.Modeltests): with tests.user_set(pagure.APP, user): output = self.app.get('/test/issue/1') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] @@ -800,9 +825,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n Dependency added', output.data) @@ -815,9 +842,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertNotIn( '\n Dependency added', output.data) @@ -865,9 +894,11 @@ class PagureFlaskIssuestests(tests.Modeltests): with tests.user_set(pagure.APP, user): output = self.app.get('/test/issue/1') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] @@ -880,9 +911,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n Dependency added', output.data) @@ -895,9 +928,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertNotIn( '\n Dependency added', output.data) @@ -936,9 +971,11 @@ class PagureFlaskIssuestests(tests.Modeltests): with tests.user_set(pagure.APP, user): output = self.app.get('/test/issue/1') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] @@ -1256,9 +1293,8 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/tag/tag1/edit', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Settings - test - Pagure', output.data) self.assertIn( '\n Edited tag: tag1 to tag2', output.data) @@ -1451,9 +1487,11 @@ class PagureFlaskIssuestests(tests.Modeltests): with tests.user_set(pagure.APP, user): output = self.app.get('/test/issue/1') self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] @@ -1466,9 +1504,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n Comment added', output.data) @@ -1507,9 +1547,11 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n Comment updated', output.data) @@ -1521,9 +1563,8 @@ class PagureFlaskIssuestests(tests.Modeltests): with tests.user_set(pagure.APP, user): output = self.app.get('/test/issue/1/comment/1/edit') - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'test - Pagure', output.data) self.assertTrue('
' in output.data) self.assertTrue('
' in output.data) self.assertTrue( @@ -1542,9 +1583,11 @@ class PagureFlaskIssuestests(tests.Modeltests): data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue( - '

test project #1

' - in output.data) + self.assertIn( + 'Issue #1 - test - Pagure', output.data) + self.assertIn( + '', output.data) self.assertIn( '\n Comment updated', output.data) diff --git a/tests/test_pagure_flask_ui_plugins_fedmsg.py b/tests/test_pagure_flask_ui_plugins_fedmsg.py index c05deae..1a2cc91 100644 --- a/tests/test_pagure_flask_ui_plugins_fedmsg.py +++ b/tests/test_pagure_flask_ui_plugins_fedmsg.py @@ -59,7 +59,9 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests): with tests.user_set(pagure.APP, user): output = self.app.get('/test/settings/Fedmsg') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

Fedmsg settings

' in output.data) self.assertTrue( '' @@ -72,7 +74,9 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests): output = self.app.post('/test/settings/Fedmsg', data=data) self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

Fedmsg settings

' in output.data) self.assertTrue( '' @@ -99,7 +103,9 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests): '\n Hook Fedmsg inactived', output.data) output = self.app.get('/test/settings/Fedmsg', data=data) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertIn('

Fedmsg settings

', output.data) self.assertIn( '', @@ -125,7 +131,9 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests): output.data) output = self.app.get('/test/settings/Fedmsg', data=data) self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

Fedmsg settings

' in output.data) self.assertTrue( 'test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

Fedmsg settings

' in output.data) self.assertTrue( 'test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

IRC settings

' in output.data) self.assertTrue( '' @@ -72,7 +74,9 @@ class PagureFlaskPluginIRCtests(tests.Modeltests): output = self.app.post('/test/settings/IRC', data=data) self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

IRC settings

' in output.data) self.assertTrue( '' @@ -100,7 +104,9 @@ class PagureFlaskPluginIRCtests(tests.Modeltests): output = self.app.get('/test/settings/IRC') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

IRC settings

' in output.data) self.assertTrue( '' @@ -129,7 +135,9 @@ class PagureFlaskPluginIRCtests(tests.Modeltests): output = self.app.get('/test/settings/IRC') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

IRC settings

' in output.data) self.assertTrue( 'test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

IRC settings

' in output.data) self.assertTrue( 'test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

Mail settings

' in output.data) self.assertTrue( '' @@ -75,7 +77,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests): output = self.app.post('/test/settings/Mail', data=data) self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

Mail settings

' in output.data) self.assertTrue( '' @@ -103,7 +107,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests): output = self.app.get('/test/settings/Mail') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

Mail settings

' in output.data) self.assertTrue( '' @@ -121,7 +127,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests): output = self.app.post( '/test/settings/Mail', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

Mail settings

' in output.data) self.assertFalse( '\n Hook activated' in output.data) @@ -153,7 +161,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests): '\n Hook Mail activated' in output.data) output = self.app.get('/test/settings/Mail') - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

Mail settings

' in output.data) self.assertTrue( '' @@ -177,7 +187,9 @@ class PagureFlaskPluginMailtests(tests.Modeltests): '\n Hook Mail inactived' in output.data) output = self.app.get('/test/settings/Mail') - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

Mail settings

' in output.data) self.assertTrue( '' diff --git a/tests/test_pagure_flask_ui_plugins_pagure_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_hook.py index e8a0265..a4b7c2f 100644 --- a/tests/test_pagure_flask_ui_plugins_pagure_hook.py +++ b/tests/test_pagure_flask_ui_plugins_pagure_hook.py @@ -61,7 +61,9 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests): with tests.user_set(pagure.APP, user): output = self.app.get('/test/settings/pagure') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure settings

' in output.data) self.assertTrue( '' @@ -74,7 +76,9 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests): output = self.app.post('/test/settings/pagure', data=data) self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure settings

' in output.data) self.assertTrue( '' @@ -102,7 +106,9 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests): output = self.app.get('/test/settings/pagure') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure settings

' in output.data) self.assertTrue( '' @@ -129,7 +135,9 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests): output = self.app.get('/test/settings/pagure') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure settings

' in output.data) self.assertTrue( 'test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure settings

' in output.data) self.assertTrue( 'test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure requests settings

' in output.data) self.assertTrue( '' @@ -72,7 +74,9 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests): output = self.app.post('/test/settings/pagure requests', data=data) self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure requests settings

' in output.data) self.assertTrue( '' @@ -101,7 +105,9 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests): output = self.app.get('/test/settings/pagure requests') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure requests settings

' in output.data) self.assertTrue( '' @@ -130,7 +136,9 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests): output = self.app.get('/test/settings/pagure requests') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure requests settings

' in output.data) self.assertTrue( 'test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure requests settings

' in output.data) self.assertTrue( 'test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure tickets settings

' in output.data) self.assertTrue( '' @@ -72,7 +74,9 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests): output = self.app.post('/test/settings/pagure tickets', data=data) self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure tickets settings

' in output.data) self.assertTrue( '' @@ -101,7 +105,9 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests): output = self.app.get('/test/settings/pagure tickets') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure tickets settings

' in output.data) self.assertTrue( '' @@ -130,7 +136,9 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests): output = self.app.get('/test/settings/pagure tickets') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure tickets settings

' in output.data) self.assertTrue( 'test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('

pagure tickets settings

' in output.data) self.assertTrue( 'Overview - test - Pagure', output.data) self.assertIn( - '
\n

test project #1

', - output.data) + '
\n' + 'test project #1
', output.data) self.assertIn( '\n Edited successfully ' 'settings of repo: test', output.data) @@ -474,8 +474,8 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertIn( 'Overview - test - Pagure', output.data) self.assertIn( - '
\n

test project #1

', - output.data) + '
\n' + 'test project #1
', output.data) self.assertIn( '\n Edited successfully ' 'settings of repo: test', output.data) @@ -524,7 +524,9 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/test') self.assertEqual(output.status_code, 200) self.assertTrue('

This repo is brand new!

' in output.data) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) # Add some content to the git repo tests.add_content_git_repo(os.path.join(tests.HERE, 'test.git')) @@ -534,7 +536,9 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertFalse('

This repo is brand new!

' in output.data) self.assertFalse('Forked from' in output.data) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) # Turn that repo into a fork repo = pagure.lib.get_project(self.session, 'test') @@ -555,7 +559,9 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/fork/pingou/test') self.assertEqual(output.status_code, 200) self.assertFalse('

This repo is brand new!

' in output.data) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('Forked from' in output.data) # Add a fork of a fork @@ -580,7 +586,9 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/fork/pingou/test3') self.assertEqual(output.status_code, 200) self.assertFalse('

This repo is brand new!

' in output.data) - self.assertTrue('

test project #3

' in output.data) + self.assertIn( + '
\n' + 'test project #3
', output.data) self.assertTrue('Forked from' in output.data) def test_view_repo_empty(self): @@ -623,7 +631,9 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertFalse('

This repo is brand new!

' in output.data) self.assertFalse('Forked from' in output.data) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertEqual( output.data.count(''), 0) @@ -655,7 +665,9 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertFalse('

This repo is brand new!

' in output.data) self.assertFalse('Forked from' in output.data) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) # Turn that repo into a fork repo = pagure.lib.get_project(self.session, 'test') @@ -676,7 +688,9 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/fork/pingou/test/branch/master') self.assertEqual(output.status_code, 200) self.assertFalse('

This repo is brand new!

' in output.data) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertTrue('Forked from' in output.data) # Add a fork of a fork @@ -701,7 +715,9 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/fork/pingou/test3/branch/master') self.assertEqual(output.status_code, 200) self.assertFalse('

This repo is brand new!

' in output.data) - self.assertTrue('

test project #3

' in output.data) + self.assertIn( + '
\n' + 'test project #3
', output.data) self.assertTrue('Forked from' in output.data) def test_view_commits(self): @@ -721,7 +737,9 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/test/commits') self.assertEqual(output.status_code, 200) self.assertIn('

This repo is brand new!

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

test project #1

', output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) # Add some content to the git repo tests.add_content_git_repo(os.path.join(tests.HERE, 'test.git')) @@ -731,14 +749,18 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertNotIn('

This repo is brand new!

', output.data) self.assertNotIn('Forked from', output.data) - self.assertIn('

test project #1

', output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertIn('Logs - test - Pagure', output.data) output = self.app.get('/test/commits/master') self.assertEqual(output.status_code, 200) self.assertNotIn('

This repo is brand new!

', output.data) self.assertNotIn('Forked from', output.data) - self.assertIn('

test project #1

', output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) # Turn that repo into a fork repo = pagure.lib.get_project(self.session, 'test') @@ -759,7 +781,9 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/fork/pingou/test/commits?page=abc') self.assertEqual(output.status_code, 200) self.assertNotIn('

This repo is brand new!

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

test project #1

', output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertIn('Forked from', output.data) # Add a fork of a fork @@ -787,7 +811,9 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/fork/pingou/test3/commits') self.assertEqual(output.status_code, 200) self.assertNotIn('

This repo is brand new!

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

test project #3

', output.data) + self.assertIn( + '
\n' + 'test project #3
', output.data) self.assertIn('Forked from', output.data) def test_view_file(self): @@ -1260,7 +1286,9 @@ index 0000000..fb7093d # View first commit output = self.app.get('/test/tree/%s' % commit.oid.hex) self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertIn('Tree - test - Pagure', output.data) self.assertTrue('README.rst' in output.data) self.assertFalse( @@ -1269,7 +1297,9 @@ index 0000000..fb7093d # View tree by branch output = self.app.get('/test/tree/master') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #1

' in output.data) + self.assertIn( + '
\n' + 'test project #1
', output.data) self.assertIn('Tree - test - Pagure', output.data) self.assertTrue('README.rst' in output.data) self.assertFalse( @@ -1291,7 +1321,9 @@ index 0000000..fb7093d output = self.app.get('/fork/pingou/test3/tree/') self.assertEqual(output.status_code, 200) - self.assertTrue('

test project #3

' in output.data) + self.assertIn( + '
\n' + 'test project #3
', output.data) self.assertIn('Tree - test3 - Pagure', output.data) self.assertTrue( '' diff --git a/tests/test_pagure_flask_ui_slash_branch_name.py b/tests/test_pagure_flask_ui_slash_branch_name.py index 2467395..84f3fe8 100644 --- a/tests/test_pagure_flask_ui_slash_branch_name.py +++ b/tests/test_pagure_flask_ui_slash_branch_name.py @@ -141,7 +141,8 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests): output = self.app.get('/test') self.assertEqual(output.status_code, 200) self.assertIn( - '

Admins

', output.data) + '
\n ' + '
Owners
', output.data) self.assertEqual(output.data.count( '

Admins

', output.data) + '
\n ' + '
Owners
', output.data) self.assertEqual(output.data.count( '