Revision 1808f7bc snf-astakos-app/astakos/im/tests/auth.py

b/snf-astakos-app/astakos/im/tests/auth.py
1 1
# -*- coding: utf-8 -*-
2
# Copyright 2011 GRNET S.A. All rights reserved.
2
# Copyright 2011, 2012, 2013 GRNET S.A. All rights reserved.
3 3
#
4 4
# Redistribution and use in source and binary forms, with or
5 5
# without modification, are permitted provided that the following
......
434 434

  
435 435
        form = forms.LocalUserCreationForm(data)
436 436
        self.assertTrue(form.is_valid())
437
        user = form.save()
438
        form.store_user(user, {})
437
        user = form.create_user()
439 438

  
440 439
        u = AstakosUser.objects.get()
441 440
        self.assertEqual(u.email, 'kPap@synnefo.org')
......
657 656
        # she can't because account is not active yet
658 657
        self.assertContains(r, "Changing password is not")
659 658

  
659
    def test_fix_superuser(self):
660
        u = User.objects.create(username="dummy", email="email@example.org",
661
                                first_name="Super", last_name="User",
662
                                is_superuser=True)
663
        User.objects.create(username="dummy2", email="email2@example.org",
664
                            first_name="Other", last_name="User")
665
        fixed = auth_functions.fix_superusers()
666
        self.assertEqual(len(fixed), 1)
667
        fuser = fixed[0]
668
        self.assertEqual(fuser.email, fuser.username)
669

  
660 670

  
661 671
class UserActionsTests(TestCase):
662 672

  
......
789 799
        Pending = PendingThirdPartyUser
790 800
        User = AstakosUser
791 801

  
792
        User.objects.create(email="newuser@synnefo.org")
802
        auth_functions.make_user("newuser@synnefo.org")
793 803
        get_local_user("olduser@synnefo.org")
794 804
        cl_olduser = ShibbolethClient()
795 805
        get_local_user("olduser2@synnefo.org")
......
946 956

  
947 957
    @im_settings(IM_MODULES=['local', 'shibboleth'])
948 958
    def test_create(self):
949
        user = AstakosUser.objects.create(email="kpap@synnefo.org")
950
        user2 = AstakosUser.objects.create(email="kpap2@synnefo.org")
959
        user = auth_functions.make_user(email="kpap@synnefo.org")
960
        user2 = auth_functions.make_user(email="kpap2@synnefo.org")
951 961

  
952 962
        module = 'shibboleth'
953 963
        identifier = 'SHIB_UUID'
......
1000 1010
                        CREATION_GROUPS_POLICY=['localgroup-create',
1001 1011
                                                'group-create'])
1002 1012
    def test_add_groups(self):
1003
        user = AstakosUser.objects.create(email="kpap@synnefo.org")
1013
        user = auth_functions.make_user("kpap@synnefo.org")
1004 1014
        provider = auth.get_provider('shibboleth', user, 'test123')
1005 1015
        provider.add_to_user()
1006 1016
        user = AstakosUser.objects.get()
......
1037 1047
        settings.ASTAKOS_AUTH_PROVIDER_GOOGLE_ADD_GROUPS_POLICY = \
1038 1048
            ['google-user']
1039 1049

  
1040
        user = AstakosUser.objects.create(email="kpap@synnefo.org")
1050
        user = auth_functions.make_user("kpap@synnefo.org")
1041 1051
        user.groups.add(group_old)
1042 1052
        user.add_auth_provider('local')
1043 1053

  
1044
        user2 = AstakosUser.objects.create(email="kpap2@synnefo.org")
1054
        user2 = auth_functions.make_user("kpap2@synnefo.org")
1045 1055
        user2.add_auth_provider('shibboleth', identifier='shibid')
1046 1056

  
1047
        user3 = AstakosUser.objects.create(email="kpap3@synnefo.org")
1057
        user3 = auth_functions.make_user("kpap3@synnefo.org")
1048 1058
        user3.groups.add(group_old)
1049 1059
        user3.add_auth_provider('local')
1050 1060
        user3.add_auth_provider('shibboleth', identifier='1234')
......
1109 1119
    @im_settings(IM_MODULES=['local', 'shibboleth'])
1110 1120
    def test_create_http(self):
1111 1121
        # this should be wrapped inside a transaction
1112
        user = AstakosUser(email="test@test.com")
1113
        user.save()
1122
        user = auth_functions.make_user(email="test@test.com")
1114 1123
        provider = auth_providers.get_provider('shibboleth', user,
1115 1124
                                               'test@academia.test')
1116 1125
        provider.add_to_user()
......
1120 1129
        user.get_auth_provider('local')
1121 1130

  
1122 1131
        settings.ASTAKOS_AUTH_PROVIDER_SHIBBOLETH_CREATE_POLICY = False
1123
        user = AstakosUser(email="test2@test.com")
1124
        user.save()
1132
        user = auth_functions.make_user("test2@test.com")
1125 1133
        provider = auth_providers.get_provider('shibboleth', user,
1126 1134
                                               'test@shibboleth.com',
1127 1135
                                               **{'info': {'name':
......
1255 1263
            'password2': '123'
1256 1264
        }
1257 1265
        form = backend.get_signup_form('local', user_data)
1258
        user = form.save(commit=False)
1259
        form.store_user(user)
1266
        user = form.create_user()
1260 1267
        self.assertEqual(user.is_active, False)
1261 1268
        self.assertEqual(user.email_verified, False)
1262 1269

  
......
1311 1318
        }
1312 1319
        form = backend.get_signup_form(provider='local',
1313 1320
                                       initial_data=user_data)
1314
        user = form.save(commit=False)
1315
        form.store_user(user)
1321
        user = form.create_user()
1316 1322
        self.assertEqual(user.is_active, False)
1317 1323
        self.assertEqual(user.email_verified, False)
1318 1324

  

Also available in: Unified diff