diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py
index 92e0a07..01ce59f 100644
--- a/tests/test_pagure_flask_api_issue.py
+++ b/tests/test_pagure_flask_api_issue.py
@@ -1094,7 +1094,10 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
data = json.loads(output.data)
self.assertDictEqual(
data,
- {'message': 'Successfully edited issue #1'}
+ {'message':[
+ 'Issue status updated to: Closed',
+ 'Issue close_status updated to: Fixed'
+ ]}
)
headers = {'Authorization': 'token pingou_foo'}
@@ -1506,7 +1509,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
data = json.loads(output.data)
self.assertDictEqual(
data,
- {'message': 'Issue assigned'}
+ {'message': 'Issue assigned to pingou'}
)
# Un-assign
@@ -1544,7 +1547,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
data = json.loads(output.data)
self.assertDictEqual(
data,
- {'message': 'Issue assigned'}
+ {'message': 'Issue assigned to pingou'}
)
# Un-assign
@@ -1566,7 +1569,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
data = json.loads(output.data)
self.assertDictEqual(
data,
- {'message': 'Issue assigned'}
+ {'message': 'Issue assigned to pingou'}
)
# One comment added
@@ -1666,7 +1669,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
data = json.loads(output.data)
self.assertDictEqual(
data,
- {'message': 'Issue assigned'}
+ {'message': 'Issue assigned to pingou'}
)
@patch('pagure.lib.git.update_git')
@@ -1993,7 +1996,8 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
self.assertDictEqual(
data,
{
- "message": "Custom field adjusted"
+ "message": "Custom field bugzilla adjusted to "
+ "https://bugzilla.redhat.com/1234"
}
)
@@ -2014,7 +2018,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
self.assertDictEqual(
data,
{
- "message": "Custom field adjusted"
+ "message": "Custom field bugzilla reset"
}
)
diff --git a/tests/test_pagure_flask_api_project.py b/tests/test_pagure_flask_api_project.py
index 8e37209..27de057 100644
--- a/tests/test_pagure_flask_api_project.py
+++ b/tests/test_pagure_flask_api_project.py
@@ -29,9 +29,6 @@ sys.path.insert(0, os.path.join(os.path.dirname(
import pagure.lib
import tests
from pagure.lib.repo import PagureRepo
-from pagure.lib import MetaComment
-
-mcomment = MetaComment()
class PagureFlaskApiProjecttests(tests.Modeltests):
@@ -124,8 +121,8 @@ class PagureFlaskApiProjecttests(tests.Modeltests):
# Adding a tag
output = pagure.lib.update_tags(
self.session, repo, 'infra', 'pingou',
- None, mcomment)
- self.assertEqual(output, ['Tag added: infra'])
+ None)
+ self.assertEqual(output, ['Issue tagged with: infra'])
# Check after adding
repo = pagure.lib.get_project(self.session, 'test')
@@ -322,8 +319,8 @@ class PagureFlaskApiProjecttests(tests.Modeltests):
# Adding a tag
output = pagure.lib.update_tags(
self.session, repo, 'infra', 'pingou',
- ticketfolder=None, mcomment=mcomment)
- self.assertEqual(output, ['Tag added: infra'])
+ ticketfolder=None)
+ self.assertEqual(output, ['Issue tagged with: infra'])
# Check after adding
repo = pagure.lib.get_project(self.session, 'test')
diff --git a/tests/test_pagure_flask_dump_load_ticket.py b/tests/test_pagure_flask_dump_load_ticket.py
index 0e00519..b88c0ff 100644
--- a/tests/test_pagure_flask_dump_load_ticket.py
+++ b/tests/test_pagure_flask_dump_load_ticket.py
@@ -26,9 +26,6 @@ sys.path.insert(0, os.path.join(os.path.dirname(
import pagure.lib
import tests
-from pagure.lib import MetaComment
-
-mcomment = MetaComment()
class PagureFlaskDumpLoadTicketTests(tests.Modeltests):
@@ -132,10 +129,9 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests):
assignee='pingou',
user='pingou',
ticketfolder=repopath,
- mcomment=mcomment
)
self.session.commit()
- self.assertEqual(msg, 'Issue assigned')
+ self.assertEqual(msg, 'Issue assigned to pingou')
# Add a couple of tags on the ticket
msg = pagure.lib.add_tag_obj(
session=self.session,
@@ -145,7 +141,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests):
ticketfolder=repopath,
)
self.session.commit()
- self.assertEqual(msg, 'Tag added: feature, future')
+ self.assertEqual(msg, 'Issue tagged with: feature, future')
# Add dependencies
msg = pagure.lib.add_issue_dependency(
session=self.session,
@@ -155,7 +151,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests):
ticketfolder=repopath,
)
self.session.commit()
- self.assertEqual(msg, 'Dependency added')
+ self.assertEqual(msg, 'Issue marked as depending on: #2')
msg = pagure.lib.add_issue_dependency(
session=self.session,
issue=issue3,
@@ -164,7 +160,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests):
ticketfolder=repopath,
)
self.session.commit()
- self.assertEqual(msg, 'Dependency added')
+ self.assertEqual(msg, 'Issue marked as depending on: #1')
# Dump the JSON
pagure.lib.git.update_git(issue, repo, repopath)
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index 20a6f9b..8213d8f 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -31,9 +31,6 @@ sys.path.insert(0, os.path.join(os.path.dirname(
import pagure.lib
import tests
-from pagure.lib import MetaComment
-
-mcomment = MetaComment()
class PagureFlaskIssuestests(tests.Modeltests):
@@ -550,11 +547,14 @@ class PagureFlaskIssuestests(tests.Modeltests):
milestone=b'käpy'.decode('utf-8'),
private=False,
user='pingou',
- ticketfolder=None,
- mcomment=mcomment
+ ticketfolder=None
+ )
+ self.assertEqual(
+ message,
+ [
+ u'Issue set to the milestone: k\xe4py'
+ ]
)
- print "MARK2 " + message
- self.assertEqual(message, 'Successfully edited issue #1')
self.session.commit()
output = self.app.get('/test/issue/1')
@@ -681,16 +681,20 @@ class PagureFlaskIssuestests(tests.Modeltests):
'href="/test/issue/1/edit" title="Edit this issue">',
output.data)
self.assertIn(
- '\n Successfully edited issue #1',
+ '\n '
+ 'Issue close_status updated to: Fixed\n',
+ output.data)
+ self.assertIn(
+ '\n '
+ 'Issue status updated to: Closed\n',
output.data)
self.assertTrue(
''
in output.data)
self.assertIn(
- '
'
- '@pingou updated metadata'
- .format(
- app_url=pagure.APP.config['APP_URL'].rstrip('/')),
+ '''
Metadata Update:
+- Issue status updated to: Closed
+- Issue close_status updated to: Fixed
''',
output.data)
# Add new comment
@@ -792,7 +796,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
'href="/test/issue/1/edit" title="Edit this issue">',
output.data)
self.assertIn(
- '\n Issue assigned',
+ '\n Issue assigned to pingou\n',
output.data)
self.assertTrue(
'' in output.data)
@@ -1495,7 +1499,12 @@ class PagureFlaskIssuestests(tests.Modeltests):
'/test/issue/1/edit', data=data, follow_redirects=True)
self.assertEqual(output.status_code, 200)
self.assertIn(
- '\n Successfully edited issue #1',
+ '\n '
+ 'Issue title edited\n',
+ output.data)
+ self.assertIn(
+ '\n '
+ 'Issue description edited\n',
output.data)
self.assertIn(
'#1\n'
@@ -1566,7 +1575,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
user='pingou',
ticketfolder=None)
self.session.commit()
- self.assertEqual(msg, 'Tag added: tag1')
+ self.assertEqual(msg, 'Issue tagged with: tag1')
# Before edit, list tags
tags = pagure.lib.get_tags_of_project(self.session, repo)
@@ -1669,7 +1678,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
user='pingou',
ticketfolder=None)
self.session.commit()
- self.assertEqual(msg, 'Tag added: tag1')
+ self.assertEqual(msg, 'Issue tagged with: tag1')
# Before edit, list tags
tags = pagure.lib.get_tags_of_project(self.session, repo)
@@ -1701,8 +1710,8 @@ class PagureFlaskIssuestests(tests.Modeltests):
self.assertEqual(output.status_code, 200)
self.assertTrue("Settings for test
" in output.data)
self.assertIn(
- '\n Removed tag: tag1',
- output.data)
+ '\n '
+ 'Issue **un**tagged with: tag1', output.data)
@patch('pagure.lib.git.update_git')
@patch('pagure.lib.notify.send_email')
@@ -1995,7 +2004,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
self.assertEqual(output.status_code, 200)
self.assertIn(
'\n '
- 'Successfully edited issue #2\n',
+ 'Issue close_status updated to: Invalid\n',
output.data
)
self.assertIn(
@@ -2003,6 +2012,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
output.data
)
self.assertIn(
+ '\n '
+ 'Issue status updated to: Closed\n',
+ output.data
+ )
+ self.assertIn(
'editmetadatatoggle">\n Edit Metadata',
output.data
)
@@ -2014,7 +2028,15 @@ class PagureFlaskIssuestests(tests.Modeltests):
# Ticket #2 has one less comment and is closed
issue = pagure.lib.search_issues(self.session, repo, issueid=2)
- self.assertEqual(len(issue.comments), 1)
+ self.assertEqual(len(issue.comments), 2)
+ self.assertEqual(
+ issue.comments[0].comment,
+ 'Nevermind figured it out')
+ self.assertEqual(
+ issue.comments[1].comment,
+ 'Metadata Update:\n'
+ '- Issue close_status updated to: Invalid\n'
+ '- Issue status updated to: Closed')
self.assertEqual(issue.status, 'Closed')
@patch('pagure.lib.git.update_git')
diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py
index 64755e8..503382b 100644
--- a/tests/test_pagure_flask_ui_roadmap.py
+++ b/tests/test_pagure_flask_ui_roadmap.py
@@ -461,7 +461,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
output.data)
self.assertIn(
u'\n '
- u'Successfully edited issue #%s' % cnt,
+ u'Issue set to the milestone: %s\n' % mstone,
output.data)
repo = pagure.lib.get_project(self.session, 'test')
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index b4120a7..903adbe 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""
- (c) 2015-2016 - Copyright Red Hat Inc
+ (c) 2015-2017 - Copyright Red Hat Inc
Authors:
Pierre-Yves Chibon
@@ -24,9 +24,6 @@ sys.path.insert(0, os.path.join(os.path.dirname(
import pagure.lib
import pagure.lib.model
import tests
-from pagure.lib import MetaComment
-
-mcomment = MetaComment()
class PagureLibtests(tests.Modeltests):
@@ -239,30 +236,27 @@ class PagureLibtests(tests.Modeltests):
session=self.session,
issue=issue,
user='pingou',
- ticketfolder=None,
- mcomment=mcomment)
+ ticketfolder=None)
self.session.commit()
- self.assertEqual(msg, None or '')
+ self.assertEqual(msg, None)
msg = pagure.lib.edit_issue(
session=self.session,
issue=issue,
user='pingou',
ticketfolder=None,
- mcomment=mcomment,
title='Test issue #2',
content='We should work on this for the second time',
status='Open',
)
self.session.commit()
- self.assertEqual(msg, None or '')
+ self.assertEqual(msg, None)
msg = pagure.lib.edit_issue(
session=self.session,
issue=issue,
user='pingou',
ticketfolder=None,
- mcomment=mcomment,
title='Foo issue #2',
content='We should work on this period',
status='Closed',
@@ -270,7 +264,16 @@ class PagureLibtests(tests.Modeltests):
private=True,
)
self.session.commit()
- self.assertEqual(msg, 'Successfully edited issue #2')
+ self.assertEqual(
+ msg,
+ [
+ 'Issue title edited',
+ 'Issue description edited',
+ 'Issue status updated to: Closed',
+ 'Issue close_status updated to: Invalid',
+ 'Issue private status set to: True'
+ ]
+ )
repo = pagure.lib.get_project(self.session, 'test')
self.assertEqual(repo.open_tickets, 1)
@@ -284,12 +287,11 @@ class PagureLibtests(tests.Modeltests):
issue=issue,
user='pingou',
status='Open',
- mcomment=mcomment,
ticketfolder=None,
private=True,
)
self.session.commit()
- self.assertEqual(msg, 'Successfully edited issue #2')
+ self.assertEqual(msg, ['Issue status updated to: Open'])
repo = pagure.lib.get_project(self.session, 'test')
for issue in repo.issues:
@@ -308,10 +310,15 @@ class PagureLibtests(tests.Modeltests):
close_status='Invalid',
ticketfolder=None,
private=True,
- mcomment=mcomment
)
self.session.commit()
- self.assertEqual(msg, 'Successfully edited issue #2')
+ self.assertEqual(
+ msg,
+ [
+ 'Issue status updated to: Closed',
+ 'Issue close_status updated to: Invalid'
+ ]
+ )
repo = pagure.lib.get_project(self.session, 'test')
self.assertEqual(repo.open_tickets, 1)
@@ -354,7 +361,7 @@ class PagureLibtests(tests.Modeltests):
user='pingou',
ticketfolder=None)
self.session.commit()
- self.assertEqual(msg, 'Dependency added')
+ self.assertEqual(msg, 'Issue marked as depending on: #2')
# After
self.assertEqual(len(issue.parents), 1)
@@ -386,7 +393,7 @@ class PagureLibtests(tests.Modeltests):
user='pingou',
ticketfolder=None)
self.session.commit()
- self.assertEqual(msg, 'Tag added: tag1')
+ self.assertEqual(msg, 'Issue tagged with: tag1')
# Try a second time
msg = pagure.lib.add_tag_obj(
@@ -431,7 +438,7 @@ class PagureLibtests(tests.Modeltests):
user='pingou',
ticketfolder=None)
- self.assertEqual(msgs, [u'Removed tag: tag1'])
+ self.assertEqual(msgs, ['Issue **un**tagged with: tag1'])
@patch('pagure.lib.git.update_git')
@patch('pagure.lib.notify.send_email')
@@ -450,7 +457,7 @@ class PagureLibtests(tests.Modeltests):
tags='tag1',
user='pingou',
ticketfolder=None)
- self.assertEqual(msgs, 'Removed tag: tag1')
+ self.assertEqual(msgs, 'Issue **un**tagged with: tag1')
@patch('pagure.lib.git.update_git')
@patch('pagure.lib.notify.send_email')
@@ -468,7 +475,7 @@ class PagureLibtests(tests.Modeltests):
tags=['pagure', 'test'],
user='pingou',
ticketfolder=None)
- self.assertEqual(msg, 'Tag added: pagure, test')
+ self.assertEqual(msg, 'Issue tagged with: pagure, test')
self.session.commit()
# Check the tags
@@ -482,7 +489,7 @@ class PagureLibtests(tests.Modeltests):
tags='test',
user='pingou',
ticketfolder=None)
- self.assertEqual(msgs, 'Removed tag: test')
+ self.assertEqual(msgs, 'Issue **un**tagged with: test')
self.session.commit()
# Check the tags
@@ -550,7 +557,7 @@ class PagureLibtests(tests.Modeltests):
user='pingou',
ticketfolder=None)
self.session.commit()
- self.assertEqual(msg, 'Tag added: tag3')
+ self.assertEqual(msg, 'Issue tagged with: tag3')
self.assertEqual([tag.tag for tag in issue.tags], ['tag2', 'tag3'])
# Attempt to rename an existing tag into another existing one
@@ -679,7 +686,6 @@ class PagureLibtests(tests.Modeltests):
assignee='foo@foobar.com',
user='foo@pingou.com',
ticketfolder=None,
- mcomment=mcomment
)
self.assertRaises(
@@ -690,7 +696,6 @@ class PagureLibtests(tests.Modeltests):
assignee='foo@bar.com',
user='foo@foopingou.com',
ticketfolder=None,
- mcomment=mcomment
)
# Set the assignee by its email
@@ -699,10 +704,9 @@ class PagureLibtests(tests.Modeltests):
issue=issue,
assignee='foo@bar.com',
user='foo@pingou.com',
- ticketfolder=None,
- mcomment=mcomment)
+ ticketfolder=None)
self.session.commit()
- self.assertEqual(msg, 'Issue assigned')
+ self.assertEqual(msg, 'Issue assigned to foo@bar.com')
# Change the assignee to someone else by its username
msg = pagure.lib.add_issue_assignee(
@@ -710,10 +714,9 @@ class PagureLibtests(tests.Modeltests):
issue=issue,
assignee='pingou',
user='pingou',
- ticketfolder=None,
- mcomment=mcomment)
+ ticketfolder=None)
self.session.commit()
- self.assertEqual(msg, 'Issue assigned')
+ self.assertEqual(msg, 'Issue assigned to pingou')
# After -- Searches by assignee
issues = pagure.lib.search_issues(
@@ -748,8 +751,7 @@ class PagureLibtests(tests.Modeltests):
issue=issue,
assignee=None,
user='pingou',
- ticketfolder=None,
- mcomment=mcomment)
+ ticketfolder=None)
self.session.commit()
self.assertEqual(msg, 'Assignee reset')
@@ -783,10 +785,9 @@ class PagureLibtests(tests.Modeltests):
issue=issue,
assignee='foo@bar.com',
user='foo@pingou.com',
- ticketfolder=None,
- mcomment=mcomment)
+ ticketfolder=None)
self.session.commit()
- self.assertEqual(msg, 'Issue assigned')
+ self.assertEqual(msg, 'Issue assigned to foo@bar.com')
# Add a comment to that issue
msg = pagure.lib.add_issue_comment(
@@ -1929,7 +1930,7 @@ class PagureLibtests(tests.Modeltests):
user='pingou',
ticketfolder=None)
self.session.commit()
- self.assertEqual(msg, 'Dependency removed')
+ self.assertEqual(msg, 'Issue **un**marked as depending on: #1')
# After
self.assertEqual(issue.parents, [])
@@ -1993,9 +1994,8 @@ class PagureLibtests(tests.Modeltests):
self.assertEqual(issue.tags_text, [])
messages = pagure.lib.update_tags(
- self.session, issue, 'tag', 'pingou', ticketfolder=None,
- mcomment=mcomment)
- self.assertEqual(messages, ['Tag added: tag'])
+ self.session, issue, 'tag', 'pingou', ticketfolder=None)
+ self.assertEqual(messages, ['Issue tagged with: tag'])
# after
repo = pagure.lib.get_project(self.session, 'test')
@@ -2008,9 +2008,13 @@ class PagureLibtests(tests.Modeltests):
# Replace the tag by two others
messages = pagure.lib.update_tags(
self.session, issue, ['tag2', 'tag3'], 'pingou',
- ticketfolder=None, mcomment=mcomment)
+ ticketfolder=None)
self.assertEqual(
- messages, ['Tag added: tag2, tag3', 'Removed tag: tag'])
+ messages, [
+ 'Issue tagged with: tag2, tag3',
+ 'Issue **un**tagged with: tag'
+ ]
+ )
# after
repo = pagure.lib.get_project(self.session, 'test')
@@ -2058,14 +2062,20 @@ class PagureLibtests(tests.Modeltests):
self.assertEqual(issue.blocks_text, [])
messages = pagure.lib.update_dependency_issue(
- self.session, repo, issue, '2', 'pingou', ticketfolder=None,
- mcomment=mcomment)
- self.assertEqual(messages, ['Dependency added'])
+ self.session, repo, issue, '2', 'pingou', ticketfolder=None)
+ self.assertEqual(messages, ['Issue marked as depending on: #2'])
messages = pagure.lib.update_dependency_issue(
self.session, repo, issue, ['3', '4', 5], 'pingou',
- ticketfolder=None, mcomment=mcomment)
+ ticketfolder=None)
self.assertEqual(
- messages, ['Dependency added', 'Dependency removed'])
+ messages,
+ [
+ 'Issue marked as depending on: #3',
+ 'Issue marked as depending on: #4',
+ 'Issue marked as depending on: #5',
+ 'Issue **un**marked as depending on: #2'
+ ]
+ )
# after
self.assertEqual(issue.tags_text, [])
@@ -2102,14 +2112,17 @@ class PagureLibtests(tests.Modeltests):
self.assertEqual(issue.blocks_text, [])
messages = pagure.lib.update_blocked_issue(
- self.session, repo, issue, '2', 'pingou', ticketfolder=None,
- mcomment=mcomment)
- self.assertEqual(messages, ['Dependency added'])
+ self.session, repo, issue, '2', 'pingou', ticketfolder=None)
+ self.assertEqual(messages, ['Issue marked as blocked by: #2'])
messages = pagure.lib.update_blocked_issue(
self.session, repo, issue, ['3', '4', 5], 'pingou',
- ticketfolder=None, mcomment=mcomment)
+ ticketfolder=None)
self.assertEqual(
- messages, ['Dependency added', 'Dependency removed'])
+ messages, [
+ 'Issue marked as blocked by: #3',
+ 'Issue marked as blocked by: #4',
+ 'Issue marked as blocked by: #5',
+ 'Issue **un**marked as blocked by: #2'])
# after
self.assertEqual(issue.tags_text, [])
diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py
index 7fc9146..bb1d0d7 100644
--- a/tests/test_pagure_lib_git.py
+++ b/tests/test_pagure_lib_git.py
@@ -27,9 +27,7 @@ import pagure.lib.git
import tests
from pagure.lib.repo import PagureRepo
-from pagure.lib import MetaComment
-mcomment = MetaComment()
class PagureLibGittests(tests.Modeltests):
""" Tests for pagure.lib.git """
@@ -1643,7 +1641,7 @@ index 0000000..60f7480
}
pagure.lib.git.update_custom_field_from_json(
- self.session, repo, issue, json_data, mcomment=mcomment)
+ self.session, repo, issue, json_data)
updated_issue = pagure.lib.get_issue_by_uid(self.session, 'someuid')
@@ -1686,7 +1684,7 @@ index 0000000..60f7480
}
pagure.lib.git.update_custom_field_from_json(
- self.session, repo, issue, json_data, mcomment=mcomment)
+ self.session, repo, issue, json_data)
updated_issue = pagure.lib.get_issue_by_uid(self.session, 'someuid')