ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor the comment creator/author_name to comply with the Plone core convention to store the username on the creator attribute and not the fullname.

Browse Source
This commit is contained in:
Timo Stollenwerk
2012-01-30 13:30:46 +01:00
parent 98dca81438
commit 0535e659ff
10 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plone/app/discussion/tests/functional_test_comments.txt
+1
View File
@@ -353,6 +353,7 @@ View the collection listing.
<Link text='Anonymous on Doc1' url='http://nohost/plone/doc1/++conversation++default/...'>
>>> browser.getLink('Anonymous on Doc1', index=1)
<Link text='Anonymous on Doc1' url='http://nohost/plone/doc1/++conversation++default/...'>
>>> open('/tmp/testbrowser.html', 'w').write(browser.contents)
>>> browser.getLink(tarek_fullname + ' on Doc1')
<Link text='Tarek Ziad\xc3\xa9 on Doc1' url='http://nohost/plone/doc1/++conversation++default/...'>
>>> browser.getLink(jim_fullname + ' on Doc1')
plone/app/discussion/tests/test_catalog.py
+5 -6
View File
@@ -63,7 +63,7 @@ class ConversationCatalogTest(unittest.TestCase):
comment1 = createObject('plone.Comment')
comment1.title = 'Comment 1'
comment1.text = 'Comment text'
comment1.creator = 'Jim'
comment1.creator = 'jim'
comment1.author_username = 'Jim'
comment1.creation_date = datetime(2006, 9, 17, 14, 18, 12)
comment1.modification_date = datetime(2006, 9, 17, 14, 18, 12)
@@ -89,7 +89,6 @@ class ConversationCatalogTest(unittest.TestCase):
comment2 = createObject('plone.Comment')
comment2.title = 'Comment 2'
comment2.text = 'Comment text'
comment2.creator = 'Emma'
new_comment2_id = self.conversation.addComment(comment2)
comment2 = self.portal.doc1.restrictedTraverse(
@@ -112,7 +111,6 @@ class ConversationCatalogTest(unittest.TestCase):
comment2 = createObject('plone.Comment')
comment2.title = 'Comment 2'
comment2.text = 'Comment text'
comment2.creator = 'Emma'
comment2.creation_date = datetime(2009, 9, 17, 14, 18, 12)
comment2.modification_date = datetime(2009, 9, 17, 14, 18, 12)
new_comment2_id = self.conversation.addComment(comment2)
@@ -159,7 +157,7 @@ class ConversationCatalogTest(unittest.TestCase):
comment2 = createObject('plone.Comment')
comment2.title = 'Comment 2'
comment2.text = 'Comment text'
comment2.creator = 'Emma'
comment2.creator = 'emma'
comment2.author_username = 'Emma'
new_comment2_id = self.conversation.addComment(comment2)
@@ -225,7 +223,8 @@ class CommentCatalogTest(unittest.TestCase):
comment1 = createObject('plone.Comment')
comment1.text = 'Comment text'
comment1.creator = 'Jim'
comment1.creator = 'jim'
comment1.author_name = 'Jim'
new_comment1_id = conversation.addComment(comment1)
self.comment_id = new_comment1_id
@@ -263,7 +262,7 @@ class CommentCatalogTest(unittest.TestCase):
self.assertEqual(self.comment_brain.review_state, 'published')
def test_creator(self):
self.assertEqual(self.comment_brain.Creator, 'Jim')
self.assertEqual(self.comment_brain.Creator, 'jim')
def test_in_response_to(self):
"""Make sure in_response_to returns the title or id of the content
plone/app/discussion/tests/test_comment.py
+4 -4
View File
@@ -98,7 +98,7 @@ class CommentTest(unittest.TestCase):
def test_title(self):
conversation = IConversation(self.portal.doc1)
comment1 = createObject('plone.Comment')
comment1.creator = "Jim Fulton"
comment1.author_name = "Jim Fulton"
conversation.addComment(comment1)
self.assertEqual("Jim Fulton on Document 1", comment1.Title())
@@ -114,14 +114,14 @@ class CommentTest(unittest.TestCase):
type_name='Document')
conversation = IConversation(self.portal.doc_sp_chars)
comment1 = createObject('plone.Comment')
comment1.creator = u"Tarek Ziadé"
comment1.author_name = u"Tarek Ziadé"
conversation.addComment(comment1)
self.assertEqual(u"Tarek Ziadé on Document äüö", comment1.Title())
def test_creator(self):
comment1 = createObject('plone.Comment')
comment1.creator = "Jim"
self.assertEqual("Jim", comment1.Creator())
comment1.creator = "jim"
self.assertEqual("jim", comment1.Creator())
def test_type(self):
comment1 = createObject('plone.Comment')
plone/app/discussion/tests/test_indexers.py
+6 -5
View File
@@ -49,7 +49,7 @@ class ConversationIndexersTest(unittest.TestCase):
comment1 = createObject('plone.Comment')
comment1.text = 'Comment Text'
comment1.creator = "Jim"
comment1.creator = "jim"
comment1.author_username = "Jim"
comment1.creation_date = datetime(2006, 9, 17, 14, 18, 12)
comment1.modification_date = datetime(2006, 9, 17, 14, 18, 12)
@@ -57,7 +57,7 @@ class ConversationIndexersTest(unittest.TestCase):
comment2 = createObject('plone.Comment')
comment2.text = 'Comment Text'
comment2.creator = "Emma"
comment2.creator = "emma"
comment2.author_username = "Emma"
comment2.creation_date = datetime(2007, 12, 13, 4, 18, 12)
comment2.modification_date = datetime(2007, 12, 13, 4, 18, 12)
@@ -65,7 +65,7 @@ class ConversationIndexersTest(unittest.TestCase):
comment3 = createObject('plone.Comment')
comment3.text = 'Comment Text'
comment3.creator = "Lukas"
comment3.creator = "lukas"
comment3.author_username = "Lukas"
comment3.creation_date = datetime(2009, 4, 12, 11, 12, 12)
comment3.modification_date = datetime(2009, 4, 12, 11, 12, 12)
@@ -124,7 +124,8 @@ class CommentIndexersTest(unittest.TestCase):
comment = createObject('plone.Comment')
comment.text = 'Lorem ipsum dolor sit amet.'
comment.creator = "Jim"
comment.creator = "jim"
comment.author_name = "Jim"
comment.creation_date = datetime(2006, 9, 17, 14, 18, 12)
comment.modification_date = datetime(2008, 3, 12, 7, 32, 52)
@@ -170,7 +171,7 @@ class CommentIndexersTest(unittest.TestCase):
DelegatingIndexerFactory))
def test_creator(self):
self.assertEqual(catalog.creator(self.comment)(), ('Jim'))
self.assertEqual(catalog.creator(self.comment)(), ('jim'))
def test_in_response_to(self):
# make sure in_response_to returns the title or id of the content
plone/app/discussion/tests/test_tool.py
+2 -1
View File
@@ -28,7 +28,8 @@ class ToolTest(unittest.TestCase):
# Add a comment.
comment = createObject('plone.Comment')
comment.creator = 'Jim'
comment.creator = 'jim'
comment.author_name = "Jim"
comment.text = 'Comment text'
conversation.addComment(comment)