From b4c3aef8fb0cd465841ab98231c8717765a57b73 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 05 2018 14:37:12 +0000 Subject: Adjust message shown to the user deleting a tag off a project Fixes https://pagure.io/pagure/issue/2943 Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index ca7e653..03a2aea 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -781,7 +781,7 @@ def remove_tags(session, project, tags, gitfolder, user): if tagobj: tag_found = True removed_tags.append(tag) - msgs.append('Issue **un**tagged with: %s' % tag) + msgs.append('Tag: %s has been deleted' % tag) session.delete(tagobj) if not tag_found: diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index fe46be1..92cf4ff 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -2848,7 +2848,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertTrue("

Settings for test

" in output.data) self.assertIn( '\n ' - 'Issue **un**tagged with: tag1', output.data) + 'Tag: tag1 has been deleted', output.data) @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index fdbc710..7f6ea3a 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -1053,7 +1053,7 @@ class PagureLibtests(tests.Modeltests): user='pingou', gitfolder=None) - self.assertEqual(msgs, ['Issue **un**tagged with: tag1']) + self.assertEqual(msgs, ['Tag: tag1 has been deleted']) @patch('pagure.lib.REDIS', MagicMock(return_value=True)) @patch('pagure.lib.git.update_git', MagicMock(return_value=True))