Revision ba27316a

b/snf-astakos-app/astakos/im/tests.py
149 149
                'email': username,
150 150
                'is_active': True,
151 151
                'activation_sent': datetime.now(),
152
                'email_verified': True,
153
                'provider': 'local'
152
                'email_verified': True
154 153
            }
155 154
            user_params.update(kwargs)
156 155
            user = AstakosUser(**user_params)
......
544 543
        form = forms.LocalUserCreationForm(data)
545 544
        self.assertFalse(form.is_valid())
546 545

  
547
    @im_settings(HELPDESK=(('support', 'support@synnefo.org'),))
548
    @im_settings(FORCE_PROFILE_UPDATE=False)
546
    @im_settings(HELPDESK=(('support', 'support@synnefo.org'),),
547
                 FORCE_PROFILE_UPDATE=False)
549 548
    def test_local_provider(self):
550 549
        self.helpdesk_email = astakos_settings.HELPDESK[0][1]
551 550
        # enable moderation
......
785 784

  
786 785
class TestAuthProviderViews(TestCase):
787 786

  
788
    @shibboleth_settings(CREATION_GROUPS_POLICY=['academic-login'])
789
    @shibboleth_settings(AUTOMODERATE_POLICY=True)
790
    @im_settings(IM_MODULES=['shibboleth', 'local'])
791
    @im_settings(MODERATION_ENABLED=True)
792
    @im_settings(FORCE_PROFILE_UPDATE=False)
787
    @shibboleth_settings(CREATION_GROUPS_POLICY=['academic-login'],
788
                         AUTOMODERATE_POLICY=True)
789
    @im_settings(IM_MODULES=['shibboleth', 'local'], MODERATION_ENABLED=True,
790
                 FORCE_PROFILE_UPDATE=False)
793 791
    def test_user(self):
794 792
        Profile = AuthProviderPolicyProfile
795 793
        Pending = PendingThirdPartyUser
......
990 988
        self.assertRaises(Exception, provider.add_to_user)
991 989

  
992 990
    @im_settings(IM_MODULES=['local', 'shibboleth'])
993
    @shibboleth_settings(ADD_GROUPS_POLICY=['group1', 'group2'])
994
    @shibboleth_settings(CREATION_GROUPS_POLICY=['group-create', 'group1',
991
    @shibboleth_settings(ADD_GROUPS_POLICY=['group1', 'group2'],
992
                         CREATION_GROUPS_POLICY=['group-create', 'group1',
995 993
                                                 'group2'])
996
    @localauth_settings(ADD_GROUPS_POLICY=['localgroup'])
997
    @localauth_settings(CREATION_GROUPS_POLICY=['localgroup-create',
994
    @localauth_settings(ADD_GROUPS_POLICY=['localgroup'],
995
                        CREATION_GROUPS_POLICY=['localgroup-create',
998 996
                                                'group-create'])
999 997
    def test_add_groups(self):
1000 998
        user = AstakosUser.objects.create(email="kpap@grnet.gr")

Also available in: Unified diff