Update NOTICE.

[wolnelektury.git] / apps / api / tests.py

diff --git a/apps/api/tests.py b/apps/api/tests.py
index fe8e70f..87c4f75 100644 (file)
--- a/apps/api/tests.py
+++ b/apps/api/tests.py
@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from os import path
 
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import TestCase
 from django.test.utils import override_settings
 from os import path
 
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import TestCase
 from django.test.utils import override_settings

-from django.utils import simplejson as json
+import json

 
 from catalogue.models import Book, Tag
 from picture.forms import PictureImportForm
 
 from catalogue.models import Book, Tag
 from picture.forms import PictureImportForm


@@ -14,7 +16,8 @@ import picture.tests
 
 
 @override_settings(
 
 
 @override_settings(

-    API_WAIT=-1, 
+    API_WAIT=-1,
+    NO_SEARCH_INDEX = True,

     CACHES = {'api': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
               'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
               'permanent': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}}
     CACHES = {'api': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
               'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
               'permanent': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}}


@@ -33,10 +36,10 @@ class ChangesTest(ApiTest):
         book.save()
 
         changes = json.loads(self.client.get('/api/changes/0.json?book_fields=title&tag_fields=name').content)
         book.save()
 
         changes = json.loads(self.client.get('/api/changes/0.json?book_fields=title&tag_fields=name').content)

-        self.assertEqual(changes['updated']['books'], 
+        self.assertEqual(changes['updated']['books'],

                          [{'id': book.id, 'title': book.title}],
                          'Invalid book format in changes')
                          [{'id': book.id, 'title': book.title}],
                          'Invalid book format in changes')

-        self.assertEqual(changes['updated']['tags'], 
+        self.assertEqual(changes['updated']['tags'],

                          [{'id': tag.id, 'name': tag.name}],
                          'Invalid tag format in changes')
 
                          [{'id': tag.id, 'name': tag.name}],
                          'Invalid tag format in changes')
 


@@ -155,5 +158,4 @@ class PictureTests(ApiTest):
         if import_form.is_valid():
             import_form.save()
 
         if import_form.is_valid():
             import_form.save()
 

-        pic = Picture.objects.get(slug=slug)
-
+        Picture.objects.get(slug=slug)