Author: cabraham
Date: 2007-11-13 15:34:26 -0500 (Tue, 13 Nov 2007)
New Revision: 10963

Modified:
   opencore/trunk/opencore/member/transient_messages.py
   opencore/trunk/opencore/project/browser/manage-team.txt
Log:
fixed tests for transient messages

Modified: opencore/trunk/opencore/member/transient_messages.py
===================================================================
--- opencore/trunk/opencore/member/transient_messages.py        2007-11-13 
20:30:17 UTC (rev 10962)
+++ opencore/trunk/opencore/member/transient_messages.py        2007-11-13 
20:34:26 UTC (rev 10963)
@@ -40,16 +40,11 @@
             msg = translate(msg, context=self)
         else:
             msg = _(msg)
-
-# at this point msg will always be of type Message
-#         is_unicode =  isinstance(msg, unicode)
             
         cleaner = Cleaner()
         msg = cleaner.clean_html(msg)
         if msg.startswith('<p>'):
             msg = msg[3:-4]
-#         if is_unicode:
-#             msg = unicode(msg)
         cat[new_id] = msg
         
     def get_msgs(self, mem_id, category):

Modified: opencore/trunk/opencore/project/browser/manage-team.txt
===================================================================
--- opencore/trunk/opencore/project/browser/manage-team.txt     2007-11-13 
20:30:17 UTC (rev 10962)
+++ opencore/trunk/opencore/project/browser/manage-team.txt     2007-11-13 
20:34:26 UTC (rev 10963)
@@ -79,7 +79,7 @@
     >>> from opencore.interfaces.message import ITransientMessage
     >>> tm = getUtility(ITransientMessage, context=self.portal)
     >>> list(tm.get_msgs('m4', view.msg_category))
-    [(0, u'You have been accepted to <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')]
+    [(0, 'You have been accepted to <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')]
 
 Next we recreate the request and test discarding; no add'l email
 should be sent:
@@ -122,9 +122,9 @@
 
     >>> msgs = list(tm.get_msgs('m4', view.msg_category))
     >>> msgs[0]
-    (0, u'You have been accepted to <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')
+    (0, 'You have been accepted to <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')
     >>> msgs[1]
-    (1, u'You have been denied membership to <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')
+    (1, 'You have been denied membership to <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')
 
 Verify that invitation reminders go out:
 
@@ -195,7 +195,7 @@
 Transient Message should be added as well
 
     >>> list(tm.get_msgs('m2', view.msg_category))
-    [(0, u'You have been deactivated from <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')]
+    [(0, 'You have been deactivated from <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')]
 
 Ensure that form submissions changing the team roles for members
 behave as expected.  At the beginning we re-add and approve m3 so we
@@ -213,7 +213,7 @@
     >>> wft.setStatusOf('openplans_team_membership_workflow', mship, status)
     >>> res = view.approve_requests(['m3'])
     >>> list(tm.get_msgs('m3', view.msg_category))
-    [(0, u'You have been accepted to <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')]
+    [(0, 'You have been accepted to <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')]
     >>> 'm3' in mship.getActiveMemberIds()
     True
 
@@ -255,7 +255,7 @@
 The user should also get a transient message saying that he was made
 into an admin
     >>> list(tm.get_msgs('m3', view.msg_category))[-1]
-    (1, u'You are now an admin of <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')
+    (1, 'You are now an admin of <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')
 
 If a project admin is removed from the team, he should lose the
 ProjectAdmin role::
@@ -278,7 +278,7 @@
     ...     })
     >>> html = view.set_roles(['m3'], [dict(role='ProjectMember')])
     >>> list(tm.get_msgs('m3', view.msg_category))[-1]
-    (2, u'You are no longer an admin of <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')
+    (2, 'You are no longer an admin of <a 
href="http://nohost/plone/projects/p3";>Project Three</a>')
 
 Now test member search.  We should be getting results on members w/o
 team memberships, and inactive team memberships, but not on those that



--
Archive: 
http://www.openplans.org/projects/opencore/lists/openplans-svn/archive/2007/11/1194986067100
To unsubscribe send an email with subject unsubscribe to [EMAIL PROTECTED]  
Please contact [EMAIL PROTECTED] for questions.

Reply via email to