[FIX] portal: adapt tests to new signup process

bzr revid: rco@openerp.com-20121002075304-62r768sg7vt4i9z3

1 files changed, 36 insertions, 37 deletions

diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 653a05d40aa..fe26f3280a2 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -33,6 +33,7 @@ class test_portal(test_mail.TestMailMockups):
         self.mail_group = self.registry('mail.group')
         self.mail_mail = self.registry('mail.mail')
         self.mail_message = self.registry('mail.message')
+        self.mail_invite = self.registry('mail.wizard.invite')
         self.res_users = self.registry('res.users')
         self.res_partner = self.registry('res.partner')
 
@@ -41,19 +42,17 @@ class test_portal(test_mail.TestMailMockups):
             {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
 
         # Find Portal group
-        group_portal_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'portal', 'group_portal')
-        self.group_portal_id = group_portal_ref and group_portal_ref[1] or False
+        group_portal = self.registry('ir.model.data').get_object(cr, uid, 'portal', 'group_portal')
+        self.group_portal_id = group_portal.id
 
         # Create Chell (portal user)
         self.user_chell_id = self.res_users.create(cr, uid, {'name': 'Chell Gladys', 'login': 'chell', 'groups_id': [(6, 0, [self.group_portal_id])]})
-        self.user_chell = self.res_users.browse(cr, uid, self.user_chell_id)
-        self.partner_chell_id = self.user_chell.partner_id.id
+        user_chell = self.res_users.browse(cr, uid, self.user_chell_id)
+        self.partner_chell_id = user_chell.partner_id.id
 
     def test_00_access_rights(self):
         """ Test basic mail_message and mail_group access rights for portal users. """
         cr, uid = self.cr, self.uid
-        partner_chell_id = self.partner_chell_id
-        user_chell_id = self.user_chell_id
 
         # Prepare group: Pigs (portal)
         self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Message')
@@ -64,56 +63,56 @@ class test_portal(test_mail.TestMailMockups):
         # ----------------------------------------
 
         # Do: Chell reads Pigs messages, ok because restricted to portal group
-        message_ids = self.mail_group.read(cr, user_chell_id, self.group_pigs_id, ['message_ids'])['message_ids']
-        self.mail_message.read(cr, user_chell_id, message_ids)
+        message_ids = self.mail_group.read(cr, self.user_chell_id, self.group_pigs_id, ['message_ids'])['message_ids']
+        self.mail_message.read(cr, self.user_chell_id, message_ids)
+
         # Do: Chell posts a message on Pigs, crash because can not write on group or is not in the followers
-        self.assertRaises(except_orm,
-                          self.mail_group.message_post,
-                          cr, user_chell_id, self.group_pigs_id, body='Message')
+        with self.assertRaises(except_orm):
+            self.mail_group.message_post(cr, self.user_chell_id, self.group_pigs_id, body='Message')
+
         # Do: Chell is added to Pigs followers
-        self.mail_group.message_subscribe(cr, uid, [self.group_pigs_id], [partner_chell_id])
+        self.mail_group.message_subscribe(cr, uid, [self.group_pigs_id], [self.partner_chell_id])
+
         # Test: Chell posts a message on Pigs, ok because in the followers
-        self.mail_group.message_post(cr, user_chell_id, self.group_pigs_id, body='Message')
+        self.mail_group.message_post(cr, self.user_chell_id, self.group_pigs_id, body='Message')
 
     def test_50_mail_invite(self):
         cr, uid = self.cr, self.uid
         user_admin = self.res_users.browse(cr, uid, uid)
-        self.mail_invite = self.registry('mail.wizard.invite')
         base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='')
-        portal_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'portal', 'group_portal')
-        portal_id = portal_ref and portal_ref[1] or False
-
         # 0 - Admin
-        p_a_id = user_admin.partner_id.id
+        partner_admin_id = user_admin.partner_id.id
         # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
-        p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
+        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
 
         # ----------------------------------------
-        # CASE1: generated URL
+        # CASE: invite Bert to follow Pigs
         # ----------------------------------------
 
-        url = self.mail_mail._generate_signin_url(cr, uid, p_b_id, portal_id, 1234)
-        self.assertEqual(url,  base_url + '/login?action=signin&partner_id=%s&group=%s&key=%s' % (p_b_id, portal_id, 1234),
-            'generated signin URL incorrect')
-
-        # ----------------------------------------
-        # CASE2: invite Bert
-        # ----------------------------------------
-
-        _sent_email_subject = 'Invitation to follow Pigs'
-        _sent_email_body = append_content_to_html('<div>You have been invited to follow Pigs.</div>', url)
-
         # Do: create a mail_wizard_invite, validate it
         self._init_mock_build_email()
-        mail_invite_id = self.mail_invite.create(cr, uid, {'partner_ids': [(4, p_b_id)]}, {'default_res_model': 'mail.group', 'default_res_id': self.group_pigs_id})
+        context = {'default_res_model': 'mail.group', 'default_res_id': self.group_pigs_id}
+        mail_invite_id = self.mail_invite.create(cr, uid, {'partner_ids': [(4, partner_bert_id)]}, context)
         self.mail_invite.add_followers(cr, uid, [mail_invite_id])
-        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
 
         # Test: Pigs followers should contain Admin and Bert
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
         follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
-        self.assertEqual(set(follower_ids), set([p_a_id, p_b_id]), 'Pigs followers after invite is incorrect')
-        # Test: sent email subject, body
+        self.assertEqual(set(follower_ids), set([partner_admin_id, partner_bert_id]), 'Pigs followers after invite is incorrect')
+
+        # Test: partner must have been prepared for signup
+        partner_bert = self.res_partner.browse(cr, uid, partner_bert_id)
+        self.assertTrue(partner_bert.signup_valid, 'partner has not been prepared for signup')
+        self.assertTrue(base_url in partner_bert.signup_url, 'signup url is incorrect')
+        self.assertTrue(cr.dbname in partner_bert.signup_url, 'signup url is incorrect')
+        self.assertTrue(partner_bert.signup_token in partner_bert.signup_url, 'signup url is incorrect')
+
+        # Test: (pretend to) send email and check subject, body
         self.assertEqual(len(self._build_email_kwargs_list), 1, 'sent email number incorrect, should be only for Bert')
         for sent_email in self._build_email_kwargs_list:
-            self.assertEqual(sent_email.get('subject'), _sent_email_subject, 'sent email subject incorrect')
-            self.assertEqual(sent_email.get('body'), _sent_email_body, 'sent email body incorrect')
+            self.assertEqual(sent_email.get('subject'), 'Invitation to follow Pigs',
+                             'subject of invitation email is incorrect')
+            self.assertTrue('You have been invited to follow Pigs' in sent_email.get('body'),
+                            'body of invitation email is incorrect')
+            self.assertTrue(partner_bert.signup_url in sent_email.get('body'),
+                            'body of invitation email does not contain signup url')