From 8ee2c1f9b0d575b8587f7376c224958707df870f Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 11 Jun 2018 12:12:54 +0200
Subject: [PATCH] unit tests are compliant with the new model
---
smash/web/tests/forms/test_voucher_forms.py | 9 +++++----
smash/web/tests/functions.py | 5 ++++-
smash/web/tests/view/test_voucher.py | 13 +++++++------
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/smash/web/tests/forms/test_voucher_forms.py b/smash/web/tests/forms/test_voucher_forms.py
index 71031d21..17a25f96 100644
--- a/smash/web/tests/forms/test_voucher_forms.py
+++ b/smash/web/tests/forms/test_voucher_forms.py
@@ -8,7 +8,7 @@ from web.models.constants import VOUCHER_STATUS_USED
from web.models.worker_study_role import ROLE_CHOICES_VOUCHER_PARTNER
from web.tests import LoggedInWithWorkerTestCase
from web.tests.functions import create_study_subject, create_voucher_type, format_form_field, create_voucher, \
- create_worker
+ create_worker, create_voucher_partner
logger = logging.getLogger(__name__)
@@ -16,8 +16,8 @@ logger = logging.getLogger(__name__)
class VoucherFormTests(LoggedInWithWorkerTestCase):
def setUp(self):
super(VoucherFormTests, self).setUp()
- self.voucher_partner = create_worker()
- WorkerStudyRole.objects.filter(worker=self.voucher_partner).update(role=ROLE_CHOICES_VOUCHER_PARTNER)
+ self.worker = create_worker()
+ self.voucher_partner = create_voucher_partner()
def test_create_voucher(self):
voucher_type = create_voucher_type()
@@ -28,7 +28,8 @@ class VoucherFormTests(LoggedInWithWorkerTestCase):
voucher_form = VoucherForm()
form_data = {
"status": VOUCHER_STATUS_USED,
- "usage_partner": str(self.voucher_partner.id),
+ "usage_partner": self.voucher_partner.id,
+ "issue_worker": self.worker.id,
"hours": 10,
"voucher_type": voucher_type.id
}
diff --git a/smash/web/tests/functions.py b/smash/web/tests/functions.py
index 0164230b..fbb6a991 100644
--- a/smash/web/tests/functions.py
+++ b/smash/web/tests/functions.py
@@ -78,11 +78,13 @@ def get_test_id():
return result
-def create_voucher(study_subject=None, partner=None):
+def create_voucher(study_subject=None, partner=None, worker=None):
if study_subject is None:
study_subject = create_study_subject()
if partner is None:
partner = create_voucher_partner()
+ if worker is None:
+ worker = create_worker()
number = str(get_test_id())
return Voucher.objects.create(number=number,
study_subject=study_subject,
@@ -90,6 +92,7 @@ def create_voucher(study_subject=None, partner=None):
expiry_date=get_today_midnight_date(),
voucher_type=create_voucher_type(),
usage_partner=partner,
+ issue_worker=worker,
status=VOUCHER_STATUS_NEW)
diff --git a/smash/web/tests/view/test_voucher.py b/smash/web/tests/view/test_voucher.py
index baa693f3..40237c10 100644
--- a/smash/web/tests/view/test_voucher.py
+++ b/smash/web/tests/view/test_voucher.py
@@ -1,17 +1,15 @@
+import datetime
import logging
-import datetime
from django.urls import reverse
-from web.models import Worker
-from web.models.worker_study_role import WORKER_VOUCHER_PARTNER
-from web.views.notifications import get_today_midnight_date
-from web.views.voucher import ExpireVouchersJob
from web.forms import VoucherForm
from web.models import Voucher
from web.models.constants import VOUCHER_STATUS_NEW, VOUCHER_STATUS_USED, VOUCHER_STATUS_EXPIRED
from web.tests.functions import create_voucher, create_study_subject, format_form_field, create_voucher_type, \
- create_voucher_partner
+ create_voucher_partner, create_worker
+from web.views.notifications import get_today_midnight_date
+from web.views.voucher import ExpireVouchersJob
from .. import LoggedInTestCase
logger = logging.getLogger(__name__)
@@ -38,9 +36,12 @@ class VoucherTypeViewTests(LoggedInTestCase):
usage_partner.voucher_types.add(voucher_type)
usage_partner.save()
+ worker = create_worker()
+
visit_detail_form = VoucherForm()
form_data = {
"usage_partner": usage_partner.id,
+ "issue_worker": worker.id,
"status": VOUCHER_STATUS_NEW,
"hours": 10,
"voucher_type": voucher_type.id
--
GitLab