diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py index 01ce59f..28b31e1 100644 --- a/tests/test_pagure_flask_api_issue.py +++ b/tests/test_pagure_flask_api_issue.py @@ -1095,7 +1095,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertDictEqual( data, {'message':[ - 'Issue status updated to: Closed', + 'Issue status updated to: Closed (was: Open)', 'Issue close_status updated to: Fixed' ]} ) @@ -2024,7 +2024,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): repo = pagure.lib.get_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) - self.assertEqual(len(issue.other_fields), 1) + self.assertEqual(len(issue.other_fields), 0) if __name__ == '__main__': diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py index 1ab4c5f..e4bd60a 100644 --- a/tests/test_pagure_flask_ui_app.py +++ b/tests/test_pagure_flask_ui_app.py @@ -25,9 +25,6 @@ sys.path.insert(0, os.path.join(os.path.dirname( import pagure.lib import tests -from pagure.lib import MetaComment - -mcomment = MetaComment() class PagureFlaskApptests(tests.Modeltests): @@ -1153,10 +1150,9 @@ class PagureFlaskApptests(tests.Modeltests): issue=msg, assignee='pingou', user='foo', - ticketfolder=None, - mcomment=mcomment) + ticketfolder=None) self.session.commit() - self.assertEqual(msg, 'Issue assigned') + self.assertEqual(msg, 'Issue assigned to pingou') output = self.app.get('/user/pingou/issues') self.assertEqual(output.status_code, 200) diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index 8213d8f..afc6d27 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -686,14 +686,18 @@ class PagureFlaskIssuestests(tests.Modeltests): output.data) self.assertIn( '\n ' - 'Issue status updated to: Closed\n', + 'Issue status updated to: Closed (was: Open)\n', output.data) self.assertTrue( '' in output.data) + # FIXME: There is likely something going wrong in the html + # below self.assertIn( - '''

Metadata Update:
-- Issue status updated to: Closed
+ '

Metadata Update from '\ +' '\ +''' @pingou:
+- Issue status updated to: Closed (was: Open)
- Issue close_status updated to: Fixed

''', output.data) @@ -1499,14 +1503,6 @@ class PagureFlaskIssuestests(tests.Modeltests): '/test/issue/1/edit', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - '\n ' - 'Issue title edited\n', - output.data) - self.assertIn( - '\n ' - 'Issue description edited\n', - output.data) - self.assertIn( '#1\n' ' Test issue #1', output.data) @@ -2013,7 +2009,7 @@ class PagureFlaskIssuestests(tests.Modeltests): ) self.assertIn( '\n ' - 'Issue status updated to: Closed\n', + 'Issue status updated to: Closed (was: Open)\n', output.data ) self.assertIn( @@ -2034,9 +2030,9 @@ class PagureFlaskIssuestests(tests.Modeltests): 'Nevermind figured it out') self.assertEqual( issue.comments[1].comment, - 'Metadata Update:\n' + '**Metadata Update from @foo**:\n' '- Issue close_status updated to: Invalid\n' - '- Issue status updated to: Closed') + '- Issue status updated to: Closed (was: Open)') self.assertEqual(issue.status, 'Closed') @patch('pagure.lib.git.update_git') diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index 903adbe..33e40d8 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -267,9 +267,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual( msg, [ - 'Issue title edited', - 'Issue description edited', - 'Issue status updated to: Closed', + 'Issue status updated to: Closed (was: Open)', 'Issue close_status updated to: Invalid', 'Issue private status set to: True' ] @@ -291,7 +289,8 @@ class PagureLibtests(tests.Modeltests): private=True, ) self.session.commit() - self.assertEqual(msg, ['Issue status updated to: Open']) + self.assertEqual( + msg, ['Issue status updated to: Open (was: Closed)']) repo = pagure.lib.get_project(self.session, 'test') for issue in repo.issues: @@ -315,7 +314,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual( msg, [ - 'Issue status updated to: Closed', + 'Issue status updated to: Closed (was: Open)', 'Issue close_status updated to: Invalid' ] ) @@ -716,7 +715,7 @@ class PagureLibtests(tests.Modeltests): user='pingou', ticketfolder=None) self.session.commit() - self.assertEqual(msg, 'Issue assigned to pingou') + self.assertEqual(msg, 'Issue assigned to pingou (was: foo)') # After -- Searches by assignee issues = pagure.lib.search_issues(