diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index 3db132b..3925c68 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -91,9 +91,9 @@ namespace=repo.namespace, )}}" class="btn btn-sm btn-primary">{{repo.stargazers|length}} {% endif %} - + -
+
{% if g.repo_forked %} Fork {% endif %} -
-
- - - {% endif %} - - {% if repo.is_fork and repo.parent %} - - {% elif repo.is_fork and not repo.parent %} -
- Fork from a deleted repository -
+
+ +
+ + {% endif %} -
- {% if repo.description %}{{ repo.description | safe }}{% else %}-{% endif -%} - {%- if repo.url %}  |  {{ repo.url }}{% endif %} -
+ + {% if repo.is_fork and repo.parent %} + + {% elif repo.is_fork and not repo.parent %} +
+ Fork from a deleted repository +
+ {% endif %} +
+ {% if repo.description %}{{ repo.description | safe }}{% else %}-{% endif -%} + {%- if repo.url %}  |  {{ repo.url }}{% endif %} +
+
', + u'
\nProject #1
', output.data) self.assertIn(u'

This repo is brand new!

', output.data) self.assertIn( @@ -420,7 +420,7 @@ class PagureFlaskApptests(tests.Modeltests): output = self.app.post('/new/', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - u'
\nProject #1
', + u'
\nProject #1
', output.data) self.assertIn(u'

This repo is brand new!

', output.data) self.assertIn( @@ -474,7 +474,7 @@ class PagureFlaskApptests(tests.Modeltests): output = self.app.post('/new/', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - '
\nPrõjéctö #1
', + '
\nPrõjéctö #1
', output.data if six.PY2 else output.data.decode('utf-8')) self.assertIn( '''
@@ -491,7 +491,7 @@ class PagureFlaskApptests(tests.Modeltests): output = self.app.post('/new/', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - '
\nМой первый суперский репозиторий
', + '
\nМой первый суперский репозиторий
', output.data if six.PY2 else output.data.decode('utf-8')) self.assertIn( '''
@@ -1764,8 +1764,7 @@ class PagureFlaskAppNoDocstests(tests.Modeltests): output = self.app.post('/new/', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - u'
\nProject #1
', - output.data) + u'
\nProject #1
', output.data) self.assertIn(u'

This repo is brand new!

', output.data) self.assertIn( u'Overview - project-1 - Pagure', output.data) @@ -1819,7 +1818,7 @@ class PagureFlaskAppNoTicketstests(tests.Modeltests): output = self.app.post('/new/', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - u'
\nProject #1
', + u'
\nProject #1
', output.data) self.assertIn(u'

This repo is brand new!

', output.data) self.assertIn( diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index 1dd2be4..7d12afc 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -655,7 +655,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output = self.app.get('/test/issues') self.assertEqual(output.status_code, 200) self.assertIn( - 'div class="projectinfo m-t-1 m-b-1">\ntest project #1 ' + 'div class="projectinfo m-t-1 m-b-1">\ntest project #1 ' '
', output.data) self.assertIn( '

\n 0 Open Issues', output.data) diff --git a/tests/test_pagure_flask_ui_issues_private.py b/tests/test_pagure_flask_ui_issues_private.py index 892359f..ee77362 100644 --- a/tests/test_pagure_flask_ui_issues_private.py +++ b/tests/test_pagure_flask_ui_issues_private.py @@ -82,7 +82,7 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( u'div class="projectinfo m-t-1 m-b-1">\ntest project #1' - u' ', output.data) + u' ', output.data) self.assertIn( u'

\n 1 Open Issues', output.data) @@ -96,7 +96,7 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( u'div class="projectinfo m-t-1 m-b-1">\ntest project #1' - u' ', output.data) + u' ', output.data) self.assertIn( u'

\n 2 Open Issues', output.data) @@ -110,7 +110,7 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( u'div class="projectinfo m-t-1 m-b-1">\ntest project #1' - u' ', output.data) + u' ', output.data) self.assertIn( u'

\n 2 Open Issues', output.data) @@ -125,7 +125,7 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( u'div class="projectinfo m-t-1 m-b-1">\ntest project #1' - u' ', output.data) + u' ', output.data) self.assertIn( u'

\n 1 Open Issues', output.data) @@ -150,7 +150,7 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( u'div class="projectinfo m-t-1 m-b-1">\ntest project #1' - u' ', output.data) + u' ', output.data) self.assertIn( u'

\n 1 Open Issues', output.data) @@ -175,7 +175,7 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( u'div class="projectinfo m-t-1 m-b-1">\ntest project #1' - u' ', output.data) + u' ', output.data) self.assertIn( u'

\n 2 Open Issues', output.data) @@ -196,7 +196,7 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( u'div class="projectinfo m-t-1 m-b-1">\ntest project #1' - u' ', output.data) + u' ', output.data) self.assertIn( u'

\n 2 Open Issues', output.data) @@ -217,7 +217,7 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( u'div class="projectinfo m-t-1 m-b-1">\ntest project #1' - u' ', output.data) + u' ', output.data) self.assertIn( u'Issue #1: Test issue #1 - test - Pagure', output.data) @@ -232,7 +232,7 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( u'div class="projectinfo m-t-1 m-b-1">\ntest project #1' - u' ', output.data) + u' ', output.data) self.assertIn( u'Issue #1: Test issue #1 - test - Pagure', output.data) @@ -288,7 +288,7 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( u'div class="projectinfo m-t-1 m-b-1">\ntest project #1' - u' ', output.data) + u' ', output.data) self.assertIn( u'Issue #1: Test issue #1 - test - Pagure', output.data) @@ -310,7 +310,7 @@ class PagureFlaskIssuesPrivatetests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn( u'div class="projectinfo m-t-1 m-b-1">\ntest project #1' - u' ', output.data) + u' ', output.data) self.assertIn( u'Issue #1: Test issue #1 - test - Pagure', output.data) diff --git a/tests/test_pagure_flask_ui_plugins_fedmsg.py b/tests/test_pagure_flask_ui_plugins_fedmsg.py index ebb00d9..a70f0c3 100644 --- a/tests/test_pagure_flask_ui_plugins_fedmsg.py +++ b/tests/test_pagure_flask_ui_plugins_fedmsg.py @@ -48,7 +48,7 @@ class PagureFlaskPluginFedmsgtests(tests.SimplePagureTest): self.assertEqual(output.status_code, 200) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertTrue('

Fedmsg settings

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

Fedmsg settings

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

Fedmsg settings

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

Fedmsg settings

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

Fedmsg settings

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

IRC settings

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

IRC settings

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

IRC settings

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

IRC settings

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

IRC settings

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

Mail settings

' in output.data) self.assertTrue( '' @@ -55,7 +55,7 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest): self.assertEqual(output.status_code, 200) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertTrue('

Mail settings

' in output.data) self.assertTrue( '' @@ -80,7 +80,7 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest): self.assertEqual(output.status_code, 200) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertTrue('

Mail settings

' in output.data) self.assertTrue( '' @@ -100,7 +100,7 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest): self.assertEqual(output.status_code, 200) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertTrue('

Mail settings

' in output.data) self.assertFalse( '\n Hook activated' in output.data) @@ -134,7 +134,7 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest): output = self.app.get('/test/settings/Mail') self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertTrue('

Mail settings

' in output.data) self.assertTrue( '' @@ -160,7 +160,7 @@ class PagureFlaskPluginMailtests(tests.SimplePagureTest): output = self.app.get('/test/settings/Mail') self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertTrue('

Mail settings

' in output.data) self.assertTrue( '' diff --git a/tests/test_pagure_flask_ui_plugins_noff.py b/tests/test_pagure_flask_ui_plugins_noff.py index 491cf99..b5bbb7d 100644 --- a/tests/test_pagure_flask_ui_plugins_noff.py +++ b/tests/test_pagure_flask_ui_plugins_noff.py @@ -38,7 +38,7 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest): self.assertEqual(output.status_code, 200) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn( '

Block non fast-forward pushes settings

', output.data) @@ -59,7 +59,7 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest): self.assertEqual(output.status_code, 200) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn( '

Block non fast-forward pushes settings

', output.data) @@ -89,7 +89,7 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest): self.assertEqual(output.status_code, 200) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn( '

Block non fast-forward pushes settings

', output.data) @@ -112,7 +112,7 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest): self.assertEqual(output.status_code, 200) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn( '

Block non fast-forward pushes settings

', output.data) @@ -152,7 +152,7 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest): '/test/settings/Block non fast-forward pushes') self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn( '

Block non fast-forward pushes settings

', output.data) @@ -184,7 +184,7 @@ class PagureFlaskPluginNoFFtests(tests.SimplePagureTest): '/test/settings/Block non fast-forward pushes') self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn( '

Block non fast-forward pushes settings

', output.data) diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ci.py b/tests/test_pagure_flask_ui_plugins_pagure_ci.py index 6314f97..024924e 100644 --- a/tests/test_pagure_flask_ui_plugins_pagure_ci.py +++ b/tests/test_pagure_flask_ui_plugins_pagure_ci.py @@ -25,7 +25,7 @@ class PagureFlaskPluginPagureCItests(tests.SimplePagureTest): self.assertEqual(output.status_code, 200) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertTrue('

Pagure CI settings

' in output.data) self.assertIn( '
\n

Settings for test

', output.data) @@ -133,7 +133,7 @@ class PagureFlaskPluginUnsignedtests(tests.SimplePagureTest): '/test/settings/Block Un-Signed commits') self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn( '

Block Un-Signed commits settings

', output.data) diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 2a5bfc1..daf623a 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -96,7 +96,6 @@ class PagureFlaskRepotests(tests.Modeltests): pagure.config.config['ENABLE_USER_MNGT'] = True - @patch('pagure.decorators.admin_session_timedout') def test_add_deploykey(self, ast): """ Test the add_deploykey endpoint. """ @@ -1191,7 +1190,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'Overview - test - Pagure', output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn( '\n Edited successfully ' 'settings of repo: test', output.data) @@ -1221,7 +1220,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'Overview - test - Pagure', output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn( '\n Edited successfully ' 'settings of repo: test', output.data) @@ -1270,7 +1269,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'Overview - test - Pagure', output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn( '\n Edited successfully ' 'settings of repo: test', output.data) @@ -1467,7 +1466,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertTrue('

This repo is brand new!

' in output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn( 'Stats ', output.data) @@ -1479,7 +1478,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertTrue('

This repo is brand new!

' in output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.perfMaxWalks(0, 0) self.perfReset() @@ -1499,7 +1498,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertFalse('README.dummy' in output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.perfMaxWalks(3, 8) # Target: (1, 3) self.perfReset() @@ -1525,7 +1524,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertFalse('

This repo is brand new!

' in output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertTrue('Forked from' in output.data) self.perfMaxWalks(1, 3) self.perfReset() @@ -1555,7 +1554,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertFalse('

This repo is brand new!

' in output.data) self.assertIn( '
\n' - 'test project #3
', output.data) + 'test project #3 ', output.data) self.assertTrue('Forked from' in output.data) self.perfMaxWalks(3, 18) # Ideal: (1, 3) self.perfReset() @@ -1602,7 +1601,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertFalse('Forked from' in output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertEqual( output.data.count(''), 0) @@ -1637,7 +1636,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertFalse('Forked from' in output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) # Turn that repo into a fork repo = pagure.lib.get_authorized_project(self.session, 'test') @@ -1661,7 +1660,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertFalse('

This repo is brand new!

' in output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertTrue('Forked from' in output.data) # Add a fork of a fork @@ -1689,7 +1688,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertFalse('

This repo is brand new!

' in output.data) self.assertIn( '
\n' - 'test project #3
', output.data) + 'test project #3 ', output.data) self.assertTrue('Forked from' in output.data) def test_view_commits(self): @@ -1711,7 +1710,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertIn('

This repo is brand new!

', output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) # Add some content to the git repo tests.add_content_git_repo(os.path.join(self.path, 'repos', @@ -1724,7 +1723,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertNotIn('Forked from', output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn('Commits - test - Pagure', output.data) output = self.app.get('/test/commits/master') @@ -1733,7 +1732,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertNotIn('Forked from', output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) # Turn that repo into a fork repo = pagure.lib.get_authorized_project(self.session, 'test') @@ -1757,7 +1756,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertNotIn('

This repo is brand new!

', output.data) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn('Forked from', output.data) # Add a fork of a fork @@ -1788,7 +1787,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertNotIn('

This repo is brand new!

', output.data) self.assertIn( '
\n' - 'test project #3
', output.data) + 'test project #3 ', output.data) self.assertIn('Forked from', output.data) def test_compare_commits(self): @@ -2752,7 +2751,7 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 200) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn('Tree - test - Pagure', output.data) self.assertTrue('README.rst' in output.data) self.assertFalse( @@ -2763,7 +2762,7 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 200) self.assertIn( '
\n' - 'test project #1
', output.data) + 'test project #1 ', output.data) self.assertIn('Tree - test - Pagure', output.data) self.assertTrue('README.rst' in output.data) self.assertFalse( @@ -2789,7 +2788,7 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 200) self.assertIn( '
\n' - 'test project #3
', output.data) + 'test project #3 ', output.data) self.assertIn('Tree - test3 - Pagure', output.data) self.assertTrue( '
'