Revision 31fdafa8

b/snf-astakos-app/astakos/im/tests.py
149 149
        self.assertContains(r, messages.SHIBBOLETH_MISSING_EPPN)
150 150
        client.set_tokens(eppn="kpapeppn")
151 151

  
152
        astakos_settings.SHIBBOLETH_REQUIRE_NAME_INFO = True
152 153
        # shibboleth user info required
153 154
        r = client.get('/im/login/shibboleth?', follow=True)
154 155
        self.assertContains(r, messages.SHIBBOLETH_MISSING_NAME)
156
        astakos_settings.SHIBBOLETH_REQUIRE_NAME_INFO = False
155 157

  
156 158
        # shibboleth logged us in
157 159
        client.set_tokens(mail="kpap@grnet.gr", eppn="kpapeppn", cn="1",
......
216 218
        # lets login (not activated yet)
217 219
        client.set_tokens(mail="kpap@grnet.gr", eppn="kpapeppn", cn="1", )
218 220
        r = client.get("/im/login/shibboleth?", follow=True)
219
        self.assertContains(r, "Your request is pending activation")
221
        self.assertContains(r, messages.ACCOUNT_PENDING_MODERATION)
220 222
        r = client.get("/im/profile", follow=True)
221 223
        self.assertRedirects(r, 'http://testserver/im/?next=%2Fim%2Fprofile')
222 224

  
......
273 275
                     'username': 'kpap@grnet.gr',
274 276
                     'key': pending_key}
275 277
        r = self.client.post('/im/local', post_data, follow=True)
276
        self.assertContains(r, "Failed to assign new login method")
278
        self.assertContains(r, messages.AUTH_PROVIDER_ADD_FAILED)
277 279
        self.client.logout()
278 280
        client.logout()
279 281

  
......
444 446

  
445 447
        # admin gets notified and activates the user from the command line
446 448
        self.assertEqual(len(get_mailbox('support@cloud.grnet.gr')), 1)
449
        r = self.client.post('/im/local', {'username': 'kpap@grnet.gr',
450
                                                 'password': 'password'})
451
        self.assertContains(r, messages.ACCOUNT_PENDING_MODERATION)
447 452
        functions.send_activation(user)
448 453

  
449 454
        # user activation fields updated and user gets notified via email
......
476 481
        # also she cannot login
477 482
        r = self.client.post('/im/local', {'username': 'kpap@grnet.gr',
478 483
                                                 'password': 'password'})
479
        self.assertContains(r, 'You have not followed the activation link')
484
        self.assertContains(r, messages.ACCOUNT_PENDING_ACTIVATION_HELP)
485
        self.assertContains(r, messages.ACCOUNT_PENDING_ACTIVATION)
480 486
        self.assertNotContains(r, 'Resend activation')
481 487
        self.assertFalse(r.context['request'].user.is_authenticated())
482 488
        self.assertFalse('_pithos2_a' in self.client.cookies)
......
488 494
        self.assertContains(r, "doesn't have an associated user account")
489 495
        r = self.client.post('/im/local', {'username': 'kpap@grnet.gr',
490 496
                                                 'password': 'password'})
491
        self.assertContains(r, 'You have not followed the activation link')
497
        print r
498
        self.assertContains(r, messages.ACCOUNT_PENDING_ACTIVATION)
492 499
        self.assertContains(r, 'Resend activation')
493 500
        self.assertFalse(r.context['request'].user.is_authenticated())
494 501
        self.assertFalse('_pithos2_a' in self.client.cookies)
......
550 557
        # old pass is not usable
551 558
        r = self.client.post('/im/local', {'username': 'kpap@grnet.gr',
552 559
                                           'password': 'password'})
553
        self.assertContains(r, messages.ACCOUNT_AUTHENTICATION_FAILED)
560
        self.assertContains(r, 'Please enter a correct username and password')
554 561
        r = self.client.post('/im/local', {'username': 'kpap@grnet.gr',
555 562
                                           'password': 'newpass'},
556 563
                                           follow=True)

Also available in: Unified diff