Remove json dumps
This commit is contained in:
+12
-13
@@ -2,19 +2,18 @@ from django.test import TestCase
|
|||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from rest_framework import status
|
from rest_framework import status
|
||||||
from rest_framework.test import APITestCase, APIRequestFactory, force_authenticate
|
from rest_framework.test import APITestCase, force_authenticate
|
||||||
|
|
||||||
from webapp.models import Signup, SignupForm
|
from webapp.models import Signup, SignupForm
|
||||||
from webapp.serializers import SignupSerializer, SignupFormSerializer
|
from webapp.serializers import SignupSerializer, SignupFormSerializer
|
||||||
from webapp.tests.event_fixture import createEventObject, createEventJSON
|
from webapp.tests.event_fixture import createEventObject
|
||||||
from webapp.utils import month_from_now
|
from webapp.utils import month_from_now
|
||||||
import json
|
|
||||||
|
|
||||||
URL = "/api/signup/"
|
URL = "/api/signup/"
|
||||||
|
|
||||||
ALL_QUESTION_TYPES = json.dumps([
|
ALL_QUESTION_TYPES = [
|
||||||
|
|
||||||
])
|
]
|
||||||
|
|
||||||
|
|
||||||
def createSignupForm(name="Form1", start_time=timezone.now(), end_time=month_from_now(), questions=ALL_QUESTION_TYPES, visible=True):
|
def createSignupForm(name="Form1", start_time=timezone.now(), end_time=month_from_now(), questions=ALL_QUESTION_TYPES, visible=True):
|
||||||
@@ -48,8 +47,8 @@ class SignupTestCase(APITestCase):
|
|||||||
self.hiddenForm = createSignupForm(visible=False)
|
self.hiddenForm = createSignupForm(visible=False)
|
||||||
# self.event = createEventObject(signup_id=self.signupForm.id)
|
# self.event = createEventObject(signup_id=self.signupForm.id)
|
||||||
|
|
||||||
self.signup1 = createSignupObject(self.signupForm, json.dumps([]))
|
self.signup1 = createSignupObject(self.signupForm, [])
|
||||||
self.signup2 = createSignupObject(self.signupForm, json.dumps([]))
|
self.signup2 = createSignupObject(self.signupForm, [])
|
||||||
|
|
||||||
username, password = "test_admin", "password123"
|
username, password = "test_admin", "password123"
|
||||||
self.authClient = User.objects.create_superuser(username, "myemail@test.com", password)
|
self.authClient = User.objects.create_superuser(username, "myemail@test.com", password)
|
||||||
@@ -85,19 +84,19 @@ class SignupTestCase(APITestCase):
|
|||||||
self.assertEqual(response.data, expected.data)
|
self.assertEqual(response.data, expected.data)
|
||||||
|
|
||||||
def test_create_signup(self):
|
def test_create_signup(self):
|
||||||
new = createSignupJSON(self.signup1.id, "[]")
|
new = createSignupJSON(self.signup1.id, [])
|
||||||
response = self.client.post(URL, format="json")
|
response = self.client.post(URL, new, format="json")
|
||||||
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
|
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
|
||||||
self.assertEqual(Signup.objects.count(), 3)
|
self.assertEqual(Signup.objects.count(), 3)
|
||||||
|
|
||||||
def test_create_signup_404_or_hidden(self):
|
def test_create_signup_404_or_hidden(self):
|
||||||
new = createSignupJSON(3001, "[]")
|
new = createSignupJSON(3001, [])
|
||||||
response = self.client.post(URL, format="json")
|
response = self.client.post(URL, new, format="json")
|
||||||
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
|
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
|
||||||
self.assertEqual(Signup.objects.count(), 2)
|
self.assertEqual(Signup.objects.count(), 2)
|
||||||
|
|
||||||
new = createSignupJSON(self.hiddenForm, "[]")
|
new = createSignupJSON(self.hiddenForm, [])
|
||||||
response = self.client.post(URL, format="json")
|
response = self.client.post(URL, new, format="json")
|
||||||
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
|
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
|
||||||
self.assertEqual(Signup.objects.count(), 2)
|
self.assertEqual(Signup.objects.count(), 2)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user