Merge https://github.com/ForSpareParts/rest_framework_ember into test-runner

Author: jerel

example/tests/test_format_keys.py

@@ -36,7 +36,7 @@ def test_camelization(self):
 
         user = get_user_model().objects.all()[0]
         expected = {
-            u'user': [{
+            u'users': [{
                 u'id': user.pk,
                 u'firstName': user.first_name,
                 u'lastName': user.last_name,
@@ -47,8 +47,9 @@ def test_camelization(self):
         json_content = json.loads(response.content)
         meta = json_content.get('meta')
 
-        self.assertEquals(expected.get('user'), json_content.get('user'))
-        self.assertEqual('http://testserver/user-viewset/?page=2', meta.get('nextLink'))
+        self.assertEquals(expected.get('users'), json_content.get('users'))
+        self.assertEqual('http://testserver/user-viewset/?page=2',
+            meta.get('nextLink'))
 
     def test_pluralization(self):
         """
@@ -74,3 +75,12 @@ def test_pluralization(self):
 
         json_content = json.loads(response.content)
         self.assertEquals(expected.get('users'), json_content.get('users'))
+
+        #test that the key is still pluralized when there are no records for the
+        #model, as long as the endpoint serves a list
+        get_user_model().objects.all().delete()
+        response = self.client.get(self.list_url)
+        self.assertEqual(response.status_code, 200)
+
+        json_content = json.loads(response.content)
+        self.assertEqual(json_content.get('users'), [])

rest_framework_ember/utils.py

@@ -66,7 +66,6 @@ def format_resource_name(obj, name):
     """
     if (getattr(settings, 'REST_EMBER_PLURALIZE_KEYS', False)
         and isinstance(obj, list)):
-
-        return inflection.pluralize(name) if len(obj) > 1 else name
+        return inflection.pluralize(name)
     else:
         return name

runtests.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+import os
+import sys
+
+import django
+from django.conf import settings
+from django.test.utils import get_runner
+
+if __name__ == "__main__":
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'example.settings'
+    django.setup()
+    TestRunner = get_runner(settings)
+    test_runner = TestRunner()
+    failures = test_runner.run_tests([
+        'example.tests'])
+    sys.exit(bool(failures))