Revision f47ecf6b

b/snf-astakos-app/astakos/im/tests.py
168 168
        client.set_tokens(mail="kpap@grnet.gr", eppn="kpapeppn",
169 169
                          cn="Kostas Papadimitriou",
170 170
                          ep_affiliation="Test Affiliation")
171
        r = client.get('/im/login/shibboleth?')
171
        r = client.get('/im/login/shibboleth?', follow=True)
172 172
        self.assertEqual(r.status_code, 200)
173 173

  
174 174
        # astakos asks if we want to add shibboleth
......
232 232
        r = client.get("/im/login/shibboleth?", follow=True)
233 233
        self.assertContains(r, messages.ACCOUNT_PENDING_MODERATION)
234 234
        r = client.get("/im/profile", follow=True)
235
        self.assertRedirects(r, 'http://testserver/im/?next=%2Fim%2Fprofile')
235
        self.assertRedirects(r, 'http://testserver/im/?next=/im/profile')
236 236

  
237 237
        # admin activates our user
238 238
        u = AstakosUser.objects.get(username="kpap@grnet.gr")
......
512 512
        user = AstakosUser.objects.get(pk=user.pk)
513 513
        self.assertTrue(user.activation_sent)
514 514
        self.assertFalse(user.email_verified)
515
        self.assertFalse(user.is_active)
515 516
        self.assertEqual(len(get_mailbox('kpap@grnet.gr')), 1)
516 517

  
517 518
        # user forgot she got registered and tries to submit registration
......
522 523
        r = self.client.post("/im/signup", data)
523 524
        self.assertContains(r, messages.EMAIL_USED)
524 525

  
525
        # hmmm, email exists; lets get the password
526
        # hmmm, email exists; lets request a password change
526 527
        r = self.client.get('/im/local/password_reset')
527 528
        self.assertEqual(r.status_code, 200)
528 529
        r = self.client.post('/im/local/password_reset', {'email':
529
                                                          'kpap@grnet.gr'})
530
                                                          'kpap@grnet.gr'},
531
                            follow=True)
530 532
        # she can't because account is not active yet
531 533
        self.assertContains(r, "doesn't have an associated user account")
532 534

  
......
631 633
        r = self.client.post('/im/local/password_reset', {'email':
632 634
                                                          'kpap@grnet.gr'})
633 635
        # she can't because account is not active yet
634
        self.assertContains(r, "Password change for this account is not"
635
                                " supported")
636
        self.assertContains(r, messages.AUTH_PROVIDER_CANNOT_CHANGE_PASSWORD)
636 637

  
637 638
class UserActionsTests(TestCase):
638 639

  

Also available in: Unified diff