diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 5190510..07ca938 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -710,6 +710,7 @@ def pull_request_edit_comment( form=form, comment=comment, is_js=is_js, + confirmationform=pagure.forms.ConfirmationForm(), ) diff --git a/runtests.sh b/runtests.sh index 6723663..1a84849 100755 --- a/runtests.sh +++ b/runtests.sh @@ -2,4 +2,4 @@ PAGURE_CONFIG=`pwd`/tests/test_config \ PYTHONPATH=pagure \ -./nosetests --with-html --with-coverage --cover-erase --cover-package=pagure --with-pagureperf $* +./nosetests --with-coverage --cover-erase --cover-package=pagure --with-pagureperf $* diff --git a/tests/test_pagure_flask_api_ui_private_repo.py b/tests/test_pagure_flask_api_ui_private_repo.py index e4f9ee2..dc57957 100644 --- a/tests/test_pagure_flask_api_ui_private_repo.py +++ b/tests/test_pagure_flask_api_ui_private_repo.py @@ -380,8 +380,8 @@ class PagurePrivateRepotest(tests.Modeltests): output = self.app.get('/') self.assertEqual(output.status_code, 200) self.assertIn( - '

All Projects ' - '0

', + '

All Projects ' + '0

', output.get_data(as_text=True)) # Add a private project @@ -410,8 +410,8 @@ class PagurePrivateRepotest(tests.Modeltests): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '

All Projects ' - '1

', + '

All Projects ' + '1

', output_text) user = tests.FakeUser(username='foo') diff --git a/tests/test_pagure_flask_ui_app_index.py b/tests/test_pagure_flask_ui_app_index.py index 2855e6d..0fc69cd 100644 --- a/tests/test_pagure_flask_ui_app_index.py +++ b/tests/test_pagure_flask_ui_app_index.py @@ -52,8 +52,8 @@ class PagureFlaskAppIndextests(tests.Modeltests): output_text = output.get_data(as_text=True) self.assertIn('Home - Pagure', output_text) self.assertIn( - '

All Projects ' - '0

', + '

All Projects ' + '0

', output_text) tests.create_projects(self.session) @@ -61,8 +61,8 @@ class PagureFlaskAppIndextests(tests.Modeltests): output = self.app.get('/?page=abc') self.assertEqual(output.status_code, 200) self.assertIn( - '

All Projects ' - '3

', + '

All Projects ' + '3

', output.get_data(as_text=True)) def test_index_logged_in(self): diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index 2c7a7ab..386ba37 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -450,7 +450,7 @@ class PagureFlaskForktests(tests.Modeltests): 'A commit on branch feature', output_text) self.assertNotIn( 'Merge #1 `PR from the feature branch`', output_text) - + # Check if the closing notification was added output = self.app.get('/test/pull-request/1') self.assertIn( @@ -1728,8 +1728,12 @@ index 0000000..2a552bb soup.find("title").string, 'PR#1: PR from the feature branch - test\n - Pagure' ) - h3 = soup.find("h3") + + h3 = soup.find_all("h3") self.assertIsNotNone(h3) + self.assertEqual(len(h3), 3) + # keep the last one only + h3 = h3[2] self.assertListEqual( h3.find("span")["class"], ["label", "label-default"]) self.assertEqual(h3.find("span").string, "PR#1") @@ -2854,7 +2858,7 @@ index 0000000..2a552bb 'Merge #1 `PR from the feature branch`', output_text) self.assertIn( 'A commit on branch feature', output_text) - + # Check if the closing notification was added output = self.app.get('/test/pull-request/1') self.assertIn( diff --git a/tests/test_pagure_flask_ui_groups.py b/tests/test_pagure_flask_ui_groups.py index f165b5f..21673bb 100644 --- a/tests/test_pagure_flask_ui_groups.py +++ b/tests/test_pagure_flask_ui_groups.py @@ -35,8 +35,8 @@ class PagureFlaskGroupstests(tests.Modeltests): """ Test the group_lists endpoint. """ output = self.app.get('/groups') self.assertIn( - '

\n' - ' Groups 0', + '

\n' + ' Groups 0', output.get_data(as_text=True)) def test_add_group_index_auth(self): @@ -117,8 +117,8 @@ class PagureFlaskGroupstests(tests.Modeltests): '\n Group `test_group` created.', output.get_data(as_text=True)) self.assertIn( - '

\n' - ' Groups 1', + '

\n' + ' Groups 1', output.get_data(as_text=True)) user = tests.FakeUser( @@ -149,8 +149,8 @@ class PagureFlaskGroupstests(tests.Modeltests): '\n Group `test_admin_group` ' 'created.',output.get_data(as_text=True)) self.assertIn( - '

\n' - ' Groups 2', + '

\n' + ' Groups 2', output.get_data(as_text=True)) def test_edit_group(self): @@ -221,8 +221,8 @@ class PagureFlaskGroupstests(tests.Modeltests): '\n You are not ' 'allowed to edit this group', output.get_data(as_text=True)) self.assertIn( - ' ' - ' Test Group', output.get_data(as_text=True)) + '

Test Group

', + output.get_data(as_text=True)) user.username = 'pingou' with tests.user_set(self.app.application, user): @@ -238,8 +238,8 @@ class PagureFlaskGroupstests(tests.Modeltests): self.assertIn( 'Group test_group - Pagure', output.get_data(as_text=True)) self.assertIn( - ' ' - ' Test Group', output.get_data(as_text=True)) + '

Test Group edited

', + output.get_data(as_text=True)) self.assertIn( 'Group "Test Group edited" (test_group) edited', output.get_data(as_text=True)) @@ -257,8 +257,8 @@ class PagureFlaskGroupstests(tests.Modeltests): '

No groups have been created on this pagure instance ' 'yet

', output.get_data(as_text=True)) self.assertIn( - '

\n' - ' Groups 0', + '

\n' + ' Groups 0', output.get_data(as_text=True)) self.test_add_group() @@ -267,8 +267,8 @@ class PagureFlaskGroupstests(tests.Modeltests): output = self.app.post('/group/foo/delete', follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - '

\n' - ' Groups 1', + '

\n' + ' Groups 1', output.get_data(as_text=True)) output = self.app.get('/new/') @@ -288,8 +288,8 @@ class PagureFlaskGroupstests(tests.Modeltests): '\n No group `bar` found', output.get_data(as_text=True)) self.assertIn( - '

\n' - ' Groups 1', + '

\n' + ' Groups 1', output.get_data(as_text=True)) output = self.app.post( @@ -299,8 +299,8 @@ class PagureFlaskGroupstests(tests.Modeltests): '\n You are not allowed to ' 'delete the group test_group', output.get_data(as_text=True)) self.assertIn( - '

\n' - ' Groups 1', + '

\n' + ' Groups 1', output.get_data(as_text=True)) user.username = 'bar' @@ -320,8 +320,8 @@ class PagureFlaskGroupstests(tests.Modeltests): '\n Group `test_group` has ' 'been deleted', output.get_data(as_text=True)) self.assertIn( - '

\n' - ' Groups 0', + '

\n' + ' Groups 0', output.get_data(as_text=True)) def test_view_group(self): @@ -336,8 +336,8 @@ class PagureFlaskGroupstests(tests.Modeltests): output = self.app.get('/group/test_group') self.assertEqual(output.status_code, 200) self.assertIn( - '  ' - 'Test Group', output.get_data(as_text=True)) + '

Test Group

', + output.get_data(as_text=True)) output = self.app.get('/group/test_admin_group') self.assertEqual(output.status_code, 404) @@ -350,9 +350,10 @@ class PagureFlaskGroupstests(tests.Modeltests): output = self.app.get('/group/test_admin_group') self.assertEqual(output.status_code, 200) self.assertIn( - '  ' - 'Test Admin Group', output.get_data(as_text=True)) - self.assertEqual(output.get_data(as_text=True).count('Test Admin Group', + output.get_data(as_text=True)) + self.assertEqual( + output.get_data(as_text=True).count('')[0] @@ -365,9 +366,10 @@ class PagureFlaskGroupstests(tests.Modeltests): output = self.app.post('/group/test_admin_group', data=data) self.assertEqual(output.status_code, 200) self.assertIn( - '  ' - 'Test Admin Group', output.get_data(as_text=True)) - self.assertEqual(output.get_data(as_text=True).count('Test Admin Group', + output.get_data(as_text=True)) + self.assertEqual( + output.get_data(as_text=True).count('  ' - 'Test Admin Group', output.get_data(as_text=True)) - self.assertEqual(output.get_data(as_text=True).count('Test Admin Group', + output.get_data(as_text=True)) + self.assertEqual( + output.get_data(as_text=True).count('  ' - 'Test Admin Group', output.get_data(as_text=True)) - self.assertEqual(output.get_data(as_text=True).count('Test Admin Group', + output.get_data(as_text=True)) + self.assertEqual( + output.get_data(as_text=True).count('  ' - 'Test Group', output.get_data(as_text=True)) - self.assertEqual(output.get_data(as_text=True).count('Test Group', + output.get_data(as_text=True)) + self.assertEqual( + output.get_data(as_text=True).count('  ' - 'Test Group', output.get_data(as_text=True)) - self.assertEqual(output.get_data(as_text=True).count('Test Group', + output.get_data(as_text=True)) + self.assertEqual( + output.get_data(as_text=True).count('  ' - 'Test Group', output.get_data(as_text=True)) - self.assertEqual(output.get_data(as_text=True).count('Test Group', + output.get_data(as_text=True)) + self.assertEqual( + output.get_data(as_text=True).count('  ' - 'Test Group', output.get_data(as_text=True)) - self.assertEqual(output.get_data(as_text=True).count('Test Group', + output.get_data(as_text=True)) + self.assertEqual( + output.get_data(as_text=True).count('  ' - 'Test Group', output.get_data(as_text=True)) - self.assertEqual(output.get_data(as_text=True).count('Test Group', + output.get_data(as_text=True)) + self.assertEqual( + output.get_data(as_text=True).count('  ' - 'Test Group', output.get_data(as_text=True)) - self.assertEqual(output.get_data(as_text=True).count('Test Group', + output.get_data(as_text=True)) + self.assertEqual( + output.get_data(as_text=True).count('  ' - 'Test Group', output.get_data(as_text=True)) - self.assertEqual(output.get_data(as_text=True).count('Test Group', + output.get_data(as_text=True)) + self.assertEqual( + output.get_data(as_text=True).count('