Merge branch 'master' into aureplop/cof-tests_registration

This commit is contained in:
Aurélien Delobelle 2018-09-30 12:57:35 +02:00
commit 10f4bd02d5
98 changed files with 7440 additions and 717 deletions

View file

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
"""
This file demonstrates writing tests using the unittest module. These will pass
when you run "manage.py test".
@ -6,10 +5,6 @@ when you run "manage.py test".
Replace this with more appropriate tests for your application.
"""
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
from django.test import TestCase
from gestioncof.models import CofProfile, User

View file

@ -371,9 +371,9 @@ class ProfileViewTests(ViewTestCaseMixin, TestCase):
u = self.users['member']
r = self.client.post(self.url, {
'first_name': 'First',
'last_name': 'Last',
'phone': '',
'u-first_name': 'First',
'u-last_name': 'Last',
'p-phone': '',
# 'mailing_cof': '1',
# 'mailing_bda': '1',
# 'mailing_bda_revente': '1',
@ -516,14 +516,14 @@ class MegaHelpers:
u2 = create_user('u2')
u2.profile.save()
m = Event.objects.create(title='MEGA 2017')
m = Event.objects.create(title='MEGA 2018')
cf1 = m.commentfields.create(name='Commentaire')
cf1 = m.commentfields.create(name='Commentaires')
cf2 = m.commentfields.create(
name='Comment Field 2', fieldtype='char',
)
option_type = m.options.create(name='Conscrit/Orga ?')
option_type = m.options.create(name='Orga ? Conscrit ?')
choice_orga = option_type.choices.create(value='Orga')
choice_conscrit = option_type.choices.create(value='Conscrit')