Add more tests.

Author: gaker

example/api/api.py

@@ -3,7 +3,7 @@
 """
 from django.contrib.auth import models as auth_models
 
-from rest_framework import serializers, generics
+from rest_framework import serializers, generics, viewsets
 from rest_framework.response import Response
 
 from rest_framework_ember import renderers, parsers
@@ -49,3 +49,12 @@ class UserEmber(User):
     renderer_classes = (renderers.JSONRenderer, )
     parser_classes = (parsers.EmberJSONParser, )
 
+
+class EmberUserModelViewSet(viewsets.ModelViewSet):
+    model = auth_models.User
+    serializer_class = IdentitySerializer
+    allowed_methods = ['GET', 'POST', 'PUT', ]
+    renderer_classes = (renderers.JSONRenderer, )
+    parser_classes = (parsers.EmberJSONParser, )
+
+

example/api/urls.py

@@ -2,11 +2,17 @@
 Example app URLs
 """
 from django.conf.urls import patterns, include, url
-from .api import User, UserEmber
+from .api import User, UserEmber, EmberUserModelViewSet
+
+from rest_framework import routers
 
 urlpatterns = patterns('',
     url(r'^user-default/(?P<pk>\d+)/$', User.as_view(), name='user-default'),
     url(r'^user-ember/(?P<pk>\d+)/$', UserEmber.as_view(), name='user-ember'),
-
+    url(r'^user-viewset/$', EmberUserModelViewSet.as_view({'get': 'list'}),
+        name='user-list'),
+    url(r'^user-viewset/(?P<pk>\d+)/$',
+        EmberUserModelViewSet.as_view(
+            {'get': 'retrieve', 'post': 'create', 'put': 'update'}), name='user-detail'),
 )
 

example/settings.py

@@ -1,6 +1,7 @@
 import os
 
 SITE_ID = 1
+DEBUG = True
 
 MEDIA_ROOT = os.path.normcase(os.path.dirname(os.path.abspath(__file__)))
 MEDIA_URL = '/media/'
@@ -17,6 +18,7 @@
 INSTALLED_APPS = [
     'django.contrib.contenttypes',
     'django.contrib.sites',
+    'django.contrib.sessions',
     'django.contrib.auth',
     'django.contrib.admin',
     'rest_framework',

example/tests/__init__.py

@@ -20,7 +20,6 @@ def create_user(self, username, email, password="pw",
         Helper method to create a user
         """
         User = get_user_model()
-
         user = User.objects.create_user(
             username, email, password=password
         )

example/tests/test_model_viewsets.py

@@ -0,0 +1,82 @@
+
+
+import json
+from example.tests import TestBase
+from django.contrib.auth import get_user_model
+from django.core.urlresolvers import reverse, reverse_lazy
+from django.conf import settings
+
+
+class ModelViewSetTests(TestBase):
+    """
+    Test usage with ModelViewSets
+
+    [<RegexURLPattern user-list ^user-viewsets/$>, <RegexURLPattern user-detail ^user-viewsets/(?P<pk>[^/]+)/$>]
+    """
+    list_url = reverse_lazy('user-list')
+
+    def setUp(self):
+        super(ModelViewSetTests, self).setUp()
+        self.detail_url = reverse('user-detail', kwargs={'pk': self.miles.pk})
+
+    def test_key_in_list_result(self):
+        """
+        Ensure the result has a "user" key since that is the name of the model
+        """
+        response = self.client.get(self.list_url)
+        self.assertEqual(response.status_code, 200)
+
+        expected = {"user": []}
+        for user in get_user_model().objects.all():
+            expected['user'].append({
+                'id': user.pk,
+                'first_name': user.first_name,
+                'last_name': user.last_name,
+                'email': user.email})
+
+        self.assertEquals(expected, json.loads(response.content))
+
+    def test_key_in_detail_result(self):
+        """
+        Ensure the result has a "user" key.
+        """
+        response = self.client.get(self.detail_url)
+        self.assertEqual(response.status_code, 200)
+
+        result = json.loads(response.content)
+        expected = {
+            'user': {
+                'id': self.miles.pk,
+                'first_name': self.miles.first_name,
+                'last_name': self.miles.last_name,
+                'email': self.miles.email
+            }
+        }
+
+        self.assertEqual(result, expected)
+
+    def test_key_in_post(self):
+        """
+        Ensure a key is in the post.
+        """
+        self.client.login(username='miles', password='pw')
+        data = {
+            'user': {
+                'id': self.miles.pk,
+                'first_name': self.miles.first_name,
+                'last_name': self.miles.last_name,
+                'email': 'miles@trumpet.org'
+            }
+        }
+        response = self.client.put(self.detail_url, data=data, format='json')
+
+        result = json.loads(response.content)
+
+        self.assertIn('user', result.keys())
+        self.assertEqual(result['user']['email'], 'miles@trumpet.org')
+
+        # is it updated?
+        self.assertEqual(
+            get_user_model().objects.get(pk=self.miles.pk).email,
+            'miles@trumpet.org')
+

setup.py

@@ -1,10 +1,15 @@
 #!/usr/bin/env python
+import os
 from setuptools import setup, find_packages
 
+def get_readme():
+    return open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
+
 setup(
     name='rest_framework_ember',
     version='1.0',
     description="Make EmberJS and Django Rest Framework play nice together.",
+    long_description=get_readme(),
     author="nGen Works",
     author_email='tech@ngenworks.com',
     url='http://www.ngenworks.com',