Changeset 897

Show
Ignore:
Timestamp:
06/27/07 11:50:59
Author:
mylan
Message:

Fix incorrect notification bug.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • qPloneComments/trunk/tests/testQPloneCommentsModeration.py

    r878 r897  
    1111import re 
    1212 
    13 PRODUCT = 'qPloneComments' 
    14 USERS = {# Common Members 
    15          'admin':{'passw': 'secret_admin', 'roles': ['Manager']}, 
    16          'owner':{'passw': 'secret_owner', 'roles': ['Owner']}, 
    17          'member':{'passw': 'secret_member', 'roles': ['Member']}, 
    18          'reviewer':{'passw': 'secret_reviewer', 'roles': ['Reviewer']}, 
    19          # Members for discussion manager group 
    20          'dm_admin':{'passw': 'secret_dm_admin', 'roles': ['Manager']}, 
    21          'dm_owner':{'passw': 'secret_dm_owner', 'roles': ['Owner']}, 
    22          'dm_member':{'passw': 'secret_dm_member', 'roles': ['Member']}, 
    23          'dm_reviewer':{'passw': 'secret_dm_reviewer', 'roles': ['Reviewer']}, 
    24         } 
    25 COMMON_USERS_IDS = [u for u in USERS.keys() if not u.startswith('dm_')] 
    26 COMMON_USERS_IDS.append('anonym') 
    27 DM_USERS_IDS = [u for u in USERS.keys() if u.startswith('dm_')] 
    28  
    29  
    30  
     13from common import * 
    3114 
    3215PloneTestCase.installProduct(PRODUCT) 
    3316PloneTestCase.setupPloneSite() 
    34  
    3517 
    3618class TestModeration(PloneTestCase.FunctionalTestCase): 
    …… 
    4830 
    4931        # Add all users 
    50         self.membership = getToolByName(self.portal, 'portal_membership', None) 
    51         for user_id in USERS.keys(): 
    52             self.membership.addMember(user_id, USERS[user_id]['passw'] , USERS[user_id]['roles'], []) 
     32        addMembers(self.portal, USERS) 
     33             
    5334        # For correct testing notification - add 'portal_owner' with 'email' 
    5435        #self.membership.addMember('portal_owner', 'secret' , ['Manager'], []) 
    …… 
    5839 
    5940        # Add users to Discussion Manager group 
    60         portal_groups = getToolByName(self.portal, 'portal_groups') 
    61         #portal_groups.addGroup('DiscussionManager', roles=['DiscussionManager']) 
    62         dm_group = portal_groups.getGroupById('DiscussionManager') 
    63         dm_users = [dm_group.addMember(u) for u in DM_USERS_IDS] 
     41        add2Group(self.portal, 'DiscussionManager', DM_USERS_IDS) 
     42         
     43        #portal_groups = getToolByName(self.portal, 'portal_groups') 
     44        ##portal_groups.addGroup('DiscussionManager', roles=['DiscussionManager']) 
     45        #dm_group = portal_groups.getGroupById('DiscussionManager') 
     46        #dm_users = [dm_group.addMember(u) for u in DM_USERS_IDS] 
    6447 
    6548        # Allow discussion for Document 

  • qPloneComments/trunk/tests/testQPloneCommentsNotification.py

    r877 r897  
    188188 
    189189 
     190    #def test_ 
     191 
    190192TESTS = [TestNotification] 
    191193