Upgrade for allauth

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

diff --git a/src/api/tests/tests.py b/src/api/tests/tests.py
index 6862f24..27b98c1 100644 (file)
--- a/src/api/tests/tests.py
+++ b/src/api/tests/tests.py
@@ -17,9 +17,6 @@ from django.test import TestCase
 from django.test.utils import override_settings
 
 from catalogue.models import Book, Tag
 from django.test.utils import override_settings
 
 from catalogue.models import Book, Tag

-from picture.forms import PictureImportForm
-from picture.models import Picture
-import picture.tests

 from api.models import Consumer, Token
 
 
 from api.models import Consumer, Token
 
 


@@ -105,34 +102,6 @@ class TagTests(ApiTest):
                          'Wrong tag details.')
 
 
                          'Wrong tag details.')
 
 

-class PictureTests(ApiTest):
-    def test_publish(self):
-        slug = "kandinsky-composition-viii"
-        with open(path.join(
-                picture.tests.__path__[0], "files", slug + ".xml"
-            ), 'rb') as f:
-            xml = SimpleUploadedFile(
-                'composition8.xml',
-                f.read())
-        with open(path.join(
-                picture.tests.__path__[0], "files", slug + ".png"
-            ), 'rb') as f:
-            img = SimpleUploadedFile(
-                'kompozycja-8.png',
-                f.read())
-
-        import_form = PictureImportForm({}, {
-            'picture_xml_file': xml,
-            'picture_image_file': img
-            })
-
-        assert import_form.is_valid()
-        if import_form.is_valid():
-            import_form.save()
-
-        Picture.objects.get(slug=slug)
-
-

 class BooksTests(ApiTest):
     fixtures = ['test-books.yaml']
 
 class BooksTests(ApiTest):
     fixtures = ['test-books.yaml']
 


@@ -447,7 +416,7 @@ class AuthorizedTests(ApiTest):
         self.assert_slugs('/api/preview/', ['grandchild'])
         self.assertEqual(
             self.signed_json('/api/username/'),
         self.assert_slugs('/api/preview/', ['grandchild'])
         self.assertEqual(
             self.signed_json('/api/username/'),

-            {"username": "test", "premium": False})
+            {"username": "test", "confirmed": True, "premium": False})

         self.assertEqual(
             self.signed('/api/epub/grandchild/').status_code,
             403)
         self.assertEqual(
             self.signed('/api/epub/grandchild/').status_code,
             403)


@@ -455,7 +424,7 @@ class AuthorizedTests(ApiTest):
         with patch('club.models.Membership.is_active_for', return_value=True):
             self.assertEqual(
                 self.signed_json('/api/username/'),
         with patch('club.models.Membership.is_active_for', return_value=True):
             self.assertEqual(
                 self.signed_json('/api/username/'),

-                {"username": "test", "premium": True})
+                {"username": "test", "confirmed": True, "premium": True})

             with patch('django.core.files.storage.Storage.open',
                        return_value=BytesIO(b"<epub>")):
                 self.assertEqual(
             with patch('django.core.files.storage.Storage.open',
                        return_value=BytesIO(b"<epub>")):
                 self.assertEqual(


@@ -470,11 +439,6 @@ class AuthorizedTests(ApiTest):
                                data={"data": json.dumps({})})
         self.assertEqual(response.status_code, 403)
 
                                data={"data": json.dumps({})})
         self.assertEqual(response.status_code, 403)
 

-        response = self.signed('/api/pictures/',
-                               method='POST',
-                               data={"data": json.dumps({})})
-        self.assertEqual(response.status_code, 403)
-

         self.user.is_superuser = True
         self.user.save()
 
         self.user.is_superuser = True
         self.user.save()
 


@@ -487,15 +451,5 @@ class AuthorizedTests(ApiTest):
             self.assertTrue(mock.called)
         self.assertEqual(response.status_code, 201)
 
             self.assertTrue(mock.called)
         self.assertEqual(response.status_code, 201)
 

-        with patch('picture.models.Picture.from_xml_file') as mock:
-            response = self.signed('/api/pictures/',
-                                   method='POST',
-                                   data={"data": json.dumps({
-                                       "picture_xml": "<utwor/>",
-                                       "picture_image_data": "Kg==",
-                                   })})
-            self.assertTrue(mock.called)
-        self.assertEqual(response.status_code, 201)
-

         self.user.is_superuser = False
         self.user.save()
         self.user.is_superuser = False
         self.user.save()