Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Commit

Permalink
fix test that failed due to missing DressSize
Browse files Browse the repository at this point in the history
  • Loading branch information
jlauinger committed Aug 24, 2016
1 parent 4fec25c commit c09a5d3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
16 changes: 9 additions & 7 deletions staff/admin_actions.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import io
from collections import namedtuple

from django.template import loader
from django.template.response import SimpleTemplateResponse
from django.http import HttpResponse
from django.db.models import Q, Count, Case, When
from django.utils.translation import ugettext as _
from django.utils.translation import ungettext
from django.urls import reverse
import odswriter
from django.contrib import messages
from django.contrib.admin import helpers
from django.core.mail import send_mass_mail
from django.db.models import Q, Case, Count, When
from django.http import HttpResponse
from django.template import loader
from django.template.response import SimpleTemplateResponse, TemplateResponse
from django.urls import reverse
from django.utils.translation import ugettext as _, ungettext

from staff.models import HelperJob, OrgaJob

Expand Down
7 changes: 3 additions & 4 deletions staff/tests/tests_legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,16 @@ class PersonSaveDuplicate(TransactionTestCase):
"""A Person can register only once per ophase instance"""
def test_person_register_once_per_ophase(self):
o1 = Ophase.objects.create(start_date=date(2014, 4, 7), end_date=date(2014, 4, 11), is_active=True)
d = DressSize.objects.create(name="S", sort_key=0)
p = Person.objects.create(prename="John", name="Doe", email="john@example.net", phone="0123456789", matriculated_since="2011", degree_course="B.Sc.", is_tutor=True, dress_size=d)
p = Person.objects.create(prename="John", name="Doe", email="john@example.net", phone="0123456789", matriculated_since="2011", degree_course="B.Sc.", is_tutor=True)
with self.assertRaises(IntegrityError):
p2 = Person.objects.create(prename="John", name="Doe", email="john@example.net", phone="0123456789", matriculated_since="2011", degree_course="B.Sc.", is_tutor=True, dress_size=d)
p2 = Person.objects.create(prename="John", name="Doe", email="john@example.net", phone="0123456789", matriculated_since="2011", degree_course="B.Sc.", is_tutor=True)

o2 = Ophase.objects.create(start_date=date(2014, 10, 6), end_date=date(2014, 10, 10), is_active=True)
o1 = Ophase.objects.get(pk=o1.pk)
self.assertEqual(o2.is_active, True)
self.assertEqual(o1.is_active, False)

p3 = Person.objects.create(prename="John", name="Doe", email="john@example.net", phone="0123456789", matriculated_since="2011", degree_course="B.Sc.", is_tutor=True, dress_size=d)
p3 = Person.objects.create(prename="John", name="Doe", email="john@example.net", phone="0123456789", matriculated_since="2011", degree_course="B.Sc.", is_tutor=True)
self.assertEqual(p3.ophase, o2)


Expand Down

0 comments on commit c09a5d3

Please sign in to comment.