Feature: Remove unused tests and add tests for DRF-api

core/tests/api.py

@@ -1,16 +1,15 @@
+import json
+
+from django.urls import reverse
 import mock
+from rest_framework import status
+from rest_framework.test import APITestCase
 
 from django_images.models import Thumbnail
 from taggit.models import Tag
-from tastypie.exceptions import Unauthorized
-from tastypie.test import ResourceTestCase
 
-from .helpers import ImageFactory, PinFactory, UserFactory
+from .helpers import create_image, create_user, create_pin
 from core.models import Pin, Image
-from users.models import User
-
-
-__all__ = ['ImageResourceTest', 'PinResourceTest']
 
 
 def filter_generator_for(size):
@@ -19,265 +18,123 @@ def filter_generator_for(size):
     return wrapped_func
 
 
-def mock_requests_get(url):
+def mock_requests_get(url, **kwargs):
     response = mock.Mock(content=open('logo.png', 'rb').read())
     return response
 
 
-class ImageResourceTest(ResourceTestCase):
+class ImageTests(APITestCase):
     def test_post_create_unsupported(self):
-        """Make sure that new images can't be created using API"""
-        response = self.api_client.post('/api/v1/image/', format='json', data={})
-        self.assertHttpUnauthorized(response)
-
-    def test_list_detail(self):
-        image = ImageFactory()
-        thumbnail = filter_generator_for('thumbnail')(image)
-        standard = filter_generator_for('standard')(image)
-        square = filter_generator_for('square')(image)
-        response = self.api_client.get('/api/v1/image/', format='json')
-        self.assertDictEqual(self.deserialize(response)['objects'][0], {
-            u'image': unicode(image.image.url),
-            u'height': image.height,
-            u'width': image.width,
-            u'standard': {
-                u'image': unicode(standard.image.url),
-                u'width': standard.width,
-                u'height': standard.height,
-            },
-            u'thumbnail': {
-                u'image': unicode(thumbnail.image.url),
-                u'width': thumbnail.width,
-                u'height': thumbnail.height,
-            },
-            u'square': {
-                u'image': unicode(square.image.url),
-                u'width': square.width,
-                u'height': square.height,
-            },
-        })
+        url = reverse("image-list")
+        data = {}
+        response = self.client.post(
+            url,
+            data=data,
+            format='json',
+        )
+        self.assertEqual(response.status_code, 403, response.data)
 
 
-class PinResourceTest(ResourceTestCase):
+class PinTests(APITestCase):
+    _JSON_TYPE = "application/json"
+
     def setUp(self):
-        super(PinResourceTest, self).setUp()
-        self.user = UserFactory(password='password')
-        self.api_client.client.login(username=self.user.username, password='password')
+        super(PinTests, self).setUp()
+        self.user = create_user("default")
+        self.client.login(username=self.user.username, password='password')
+
+    def tearDown(self):
+        Pin.objects.all().delete()
+        Image.objects.all().delete()
+        Tag.objects.all().delete()
 
     @mock.patch('requests.get', mock_requests_get)
-    def test_post_create_url(self):
-        url = 'http://testserver/mocked/logo.png'
-        referer = 'http://testserver/'
+    def test_should_create_pin(self):
+        url = 'http://testserver.com/mocked/logo-01.png'
+        create_url = reverse("pin-list")
+        referer = 'http://testserver.com/'
         post_data = {
-            'submitter': '/api/v1/user/{}/'.format(self.user.pk),
             'url': url,
             'referer': referer,
             'description': 'That\'s an Apple!'
         }
-        response = self.api_client.post('/api/v1/pin/', data=post_data)
-        self.assertHttpCreated(response)
-        self.assertEqual(Pin.objects.count(), 1)
-        self.assertEqual(Image.objects.count(), 1)
-
-        # submitter is optional, current user will be used by default
-        post_data = {
-            'url': url,
-            'description': 'That\'s an Apple!',
-            'origin': None
-        }
-        response = self.api_client.post('/api/v1/pin/', data=post_data)
-        self.assertHttpCreated(response)
+        response = self.client.post(create_url, data=post_data, format="json")
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        pin = Pin.objects.get(url=url)
+        self.assertIsNotNone(pin.image.image)
 
     @mock.patch('requests.get', mock_requests_get)
     def test_post_create_url_with_empty_tags(self):
-        url = 'http://testserver/mocked/logo.png'
-        referer = 'http://testserver/'
+        url = 'http://testserver.com/mocked/logo-02.png'
+        create_url = reverse("pin-list")
+        referer = 'http://testserver.com/'
         post_data = {
-            'submitter': '/api/v1/user/{}/'.format(self.user.pk),
             'url': url,
             'referer': referer,
             'description': 'That\'s an Apple!',
             'tags': []
         }
-        response = self.api_client.post('/api/v1/pin/', data=post_data)
-        self.assertHttpCreated(response)
-        self.assertEqual(Pin.objects.count(), 1)
+        response = self.client.post(create_url, data=post_data, format="json")
+        self.assertEqual(
+            response.status_code, status.HTTP_201_CREATED, response.json()
+        )
         self.assertEqual(Image.objects.count(), 1)
         pin = Pin.objects.get(url=url)
+        self.assertIsNotNone(pin.image.image)
         self.assertEqual(pin.tags.count(), 0)
 
-    @mock.patch('requests.get', mock_requests_get)
-    def test_post_create_url_unauthorized(self):
-        url = 'http://testserver/mocked/logo.png'
-        referer = 'http://testserver/'
+    def test_should_post_create_pin_with_existed_image(self):
+        image = create_image()
+        create_pin(self.user, image=image, tags=[])
+        create_url = reverse("pin-list")
+        referer = 'http://testserver.com/'
         post_data = {
-            'submitter': '/api/v1/user/2/',
-            'url': url,
             'referer': referer,
-            'description': 'That\'s an Apple!',
-            'tags': []
-        }
-        with self.assertRaises(Unauthorized):
-            response = self.api_client.post('/api/v1/pin/', data=post_data)
-        self.assertEqual(Pin.objects.count(), 0)
-        self.assertEqual(Image.objects.count(), 0)
-
-    @mock.patch('requests.get', mock_requests_get)
-    def test_post_create_url_with_empty_origin(self):
-        url = 'http://testserver/mocked/logo.png'
-        referer = 'http://testserver/'
-        post_data = {
-            'submitter': '/api/v1/user/{}/'.format(self.user.pk),
-            'url': url,
-            'referer': referer,
-            'description': 'That\'s an Apple!',
-            'origin': None
-        }
-        response = self.api_client.post('/api/v1/pin/', data=post_data)
-        self.assertHttpCreated(response)
-        self.assertEqual(Pin.objects.count(), 1)
-        self.assertEqual(Image.objects.count(), 1)
-        self.assertEqual(Pin.objects.get(url=url).origin, None)
-
-    @mock.patch('requests.get', mock_requests_get)
-    def test_post_create_url_with_origin(self):
-        origin = 'http://testserver/mocked/'
-        url = origin + 'logo.png'
-        referer = 'http://testserver/'
-        post_data = {
-            'submitter': '/api/v1/user/{}/'.format(self.user.pk),
-            'url': url,
-            'referer': referer,
-            'description': 'That\'s an Apple!',
-            'origin': origin
-        }
-        response = self.api_client.post('/api/v1/pin/', data=post_data)
-        self.assertHttpCreated(response)
-        self.assertEqual(Pin.objects.count(), 1)
-        self.assertEqual(Image.objects.count(), 1)
-        self.assertEqual(Pin.objects.get(url=url).origin, origin)
-
-    def test_post_create_obj(self):
-        image = ImageFactory()
-        referer = 'http://testserver/'
-        post_data = {
-            'submitter': '/api/v1/user/{}/'.format(self.user.pk),
-            'referer': referer,
-            'image': '/api/v1/image/{}/'.format(image.pk),
+            'image_by_id': image.pk,
             'description': 'That\'s something else (probably a CC logo)!',
             'tags': ['random', 'tags'],
         }
-        response = self.api_client.post('/api/v1/pin/', data=post_data)
+        response = self.client.post(create_url, data=post_data, format="json")
+        resp_data = response.json()
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED, resp_data)
         self.assertEqual(
-            self.deserialize(response)['description'],
-            'That\'s something else (probably a CC logo)!'
+            resp_data['description'],
+            'That\'s something else (probably a CC logo)!',
+            resp_data
         )
-        self.assertHttpCreated(response)
-        # A number of Image objects should stay the same as we are using an existing image
-        self.assertEqual(Image.objects.count(), 1)
-        self.assertEqual(Pin.objects.count(), 1)
-        self.assertEquals(Tag.objects.count(), 2)
+        self.assertEquals(Pin.objects.count(), 2)
 
-    def test_put_detail_unauthenticated(self):
-        self.api_client.client.logout()
-        uri = '/api/v1/pin/{}/'.format(PinFactory().pk)
-        response = self.api_client.put(uri, format='json', data={})
-        self.assertHttpUnauthorized(response)
+    def test_patch_detail_unauthenticated(self):
+        image = create_image()
+        pin = create_pin(self.user, image, [])
+        self.client.logout()
+        uri = reverse("pin-detail", kwargs={"pk": pin.pk})
+        response = self.client.patch(uri, format='json', data={})
+        self.assertEqual(response.status_code, 403)
 
-    def test_put_detail_unauthorized(self):
-        uri = '/api/v1/pin/{}/'.format(PinFactory(submitter=self.user).pk)
-        user = UserFactory(password='password')
-        self.api_client.client.login(username=user.username, password='password')
-        response = self.api_client.put(uri, format='json', data={})
-        self.assertHttpUnauthorized(response)
-
-    def test_put_detail(self):
-        pin = PinFactory(submitter=self.user)
-        uri = '/api/v1/pin/{}/'.format(pin.pk)
+    def test_patch_detail(self):
+        image = create_image()
+        pin = create_pin(self.user, image, [])
+        uri = reverse("pin-detail", kwargs={"pk": pin.pk})
         new = {'description': 'Updated description'}
 
-        response = self.api_client.put(uri, format='json', data=new)
-        self.assertHttpAccepted(response)
+        response = self.client.patch(
+            uri, new, format="json",
+        )
+        self.assertEqual(response.status_code, status.HTTP_200_OK, response.json())
         self.assertEqual(Pin.objects.count(), 1)
         self.assertEqual(Pin.objects.get(pk=pin.pk).description, new['description'])
 
     def test_delete_detail_unauthenticated(self):
-        uri = '/api/v1/pin/{}/'.format(PinFactory(submitter=self.user).pk)
-        self.api_client.client.logout()
-        self.assertHttpUnauthorized(self.api_client.delete(uri))
-
-    def test_delete_detail_unauthorized(self):
-        uri = '/api/v1/pin/{}/'.format(PinFactory(submitter=self.user).pk)
-        User.objects.create_user('test', 'test@example.com', 'test')
-        self.api_client.client.login(username='test', password='test')
-        self.assertHttpUnauthorized(self.api_client.delete(uri))
+        image = create_image()
+        pin = create_pin(self.user, image, [])
+        uri = reverse("pin-detail", kwargs={"pk": pin.pk})
+        self.client.logout()
+        self.assertEqual(self.client.delete(uri).status_code, 403)
 
     def test_delete_detail(self):
-        uri = '/api/v1/pin/{}/'.format(PinFactory(submitter=self.user).pk)
-        self.assertHttpAccepted(self.api_client.delete(uri))
+        image = create_image()
+        pin = create_pin(self.user, image, [])
+        uri = reverse("pin-detail", kwargs={"pk": pin.pk})
+        self.client.delete(uri)
         self.assertEqual(Pin.objects.count(), 0)
-
-    def test_get_list_json_ordered(self):
-        _, pin = PinFactory(), PinFactory()
-        response = self.api_client.get('/api/v1/pin/', format='json', data={'order_by': '-id'})
-        self.assertValidJSONResponse(response)
-        self.assertEqual(self.deserialize(response)['objects'][0]['id'], pin.id)
-
-    def test_get_list_json_filtered_by_tags(self):
-        pin = PinFactory()
-        response = self.api_client.get('/api/v1/pin/', format='json', data={'tag': pin.tags.all()[0]})
-        self.assertValidJSONResponse(response)
-        self.assertEqual(self.deserialize(response)['objects'][0]['id'], pin.pk)
-
-    def test_get_list_json_filtered_by_submitter(self):
-        pin = PinFactory(submitter=self.user)
-        response = self.api_client.get('/api/v1/pin/', format='json', data={'submitter__username': self.user.username})
-        self.assertValidJSONResponse(response)
-        self.assertEqual(self.deserialize(response)['objects'][0]['id'], pin.pk)
-
-    def test_get_list_json(self):
-        image = ImageFactory()
-        pin = PinFactory(**{
-            'submitter': self.user,
-            'image': image,
-            'referer': 'http://testserver/mocked/',
-            'url': 'http://testserver/mocked/logo.png',
-            'description': u'Mocked Description',
-            'origin': None
-        })
-        standard = filter_generator_for('standard')(image)
-        thumbnail = filter_generator_for('thumbnail')(image)
-        square = filter_generator_for('square')(image)
-        response = self.api_client.get('/api/v1/pin/', format='json')
-        self.assertValidJSONResponse(response)
-        self.assertDictEqual(self.deserialize(response)['objects'][0], {
-            u'id': pin.id,
-            u'submitter': {
-                u'username': unicode(self.user.username),
-                u'gravatar': unicode(self.user.gravatar)
-            },
-            u'image': {
-                u'image': unicode(image.image.url),
-                u'width': image.width,
-                u'height': image.height,
-                u'standard': {
-                    u'image': unicode(standard.image.url),
-                    u'width': standard.width,
-                    u'height': standard.height,
-                },
-                u'thumbnail': {
-                    u'image': unicode(thumbnail.image.url),
-                    u'width': thumbnail.width,
-                    u'height': thumbnail.height,
-                },
-                u'square': {
-                    u'image': unicode(square.image.url),
-                    u'width': square.width,
-                    u'height': square.height,
-                    },
-            },
-            u'url': pin.url,
-            u'origin': pin.origin,
-            u'description': pin.description,
-            u'tags': [tag.name for tag in pin.tags.all()]
-        })