refactoring the way tests are stored

v1/accounts/tests/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+# encoding: utf-8

v1/accounts/tests/tests.py → v1/accounts/tests/test_account.py

@@ -4,11 +4,12 @@
 from django.test import TestCase
 from rest_framework_jwt.settings import api_settings
 
-jwt_decode_handler = api_settings.JWT_DECODE_HANDLER
-
 
 class AccountTests(TestCase):
-    fixtures=['test/users.json']
+    fixtures = ['test/users.json']
+
+    def setUp(self):
+        self.jwt_decode_handler = api_settings.JWT_DECODE_HANDLER
 
     def test_obtain_authtoken_success(self):
         resp = self.client.post(
@@ -21,7 +22,7 @@ def test_obtain_authtoken_success(self):
 
         self.assertEqual(resp.status_code, 200)
         self.assertTrue(resp.json()['id'] == 1)
-        decoded_token = jwt_decode_handler(resp.json()['token'])
+        decoded_token = self.jwt_decode_handler(resp.json()['token'])
         self.assertTrue(decoded_token.get('user_id') == 1)
         self.assertTrue(decoded_token.get('username') == 'testuser1')
 
@@ -34,4 +35,4 @@ def test_obtain_authtoken_wrong_password(self):
             }
         )
 
-        self.assertEqual(resp.status_code, 400)
+        self.assertEqual(resp.status_code, 400)

v1/common/tests/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+# encoding: utf-8

v1/common/tests/tests.py → v1/common/tests/test_permission.py

@@ -3,39 +3,9 @@
 
 from django.contrib.auth.models import AnonymousUser, User
 from django.test import TestCase, RequestFactory
-from v1.recipe.models import Recipe
-from v1.common.recipe_search import get_search_results
 from v1.common.permissions import IsAdminOrReadOnly, IsOwnerOrReadOnly
 
 
-class GetSearchResultsTests(TestCase):
-    fixtures = [
-        'test/users.json',
-        'course_data.json',
-        'cuisine_data.json',
-        'ing_data.json',
-        'recipe_data.json'
-    ]
-
-    def test_get_search_results(self):
-        query = get_search_results(
-            ['title', 'ingredient_groups__ingredients__title', 'tags__title'],
-            Recipe.objects,
-            'chili'
-        ).distinct()
-
-        self.assertTrue(len(query.all()) > 0)
-
-    def test_get_search_no_results(self):
-        query = get_search_results(
-            ['title', 'ingredient_groups__ingredients__title', 'tags__title'],
-            Recipe.objects,
-            'blue berry'
-        ).distinct()
-
-        self.assertTrue(len(query.all()) == 0)
-
-
 class PermissionTest(TestCase):
     def setUp(self):
         # Every test needs access to the request factory.
@@ -71,7 +41,7 @@ def test_is_owner_admin(self):
             IsOwnerOrReadOnly().has_permission(request, None)
         )
 
-    def test_is_admin_admin(self):
+    def test_is_admin_or_read_only(self):
         # Recall that middleware are not supported. You can simulate a
         # logged-in user by setting request.user manually.
         request = self.factory.get('/admin')

v1/common/tests/test_search.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+from django.test import TestCase
+from v1.recipe.models import Recipe
+from v1.common.recipe_search import get_search_results
+
+
+class GetSearchResultsTests(TestCase):
+    fixtures = [
+        'test/users.json',
+        'course_data.json',
+        'cuisine_data.json',
+        'ing_data.json',
+        'recipe_data.json'
+    ]
+
+    def test_get_search_results(self):
+        query = get_search_results(
+            ['title', 'ingredient_groups__ingredients__title', 'tags__title'],
+            Recipe.objects,
+            'chili'
+        ).distinct()
+
+        self.assertTrue(len(query.all()) > 0)
+
+    def test_get_search_no_results(self):
+        query = get_search_results(
+            ['title', 'ingredient_groups__ingredients__title', 'tags__title'],
+            Recipe.objects,
+            'blue berry'
+        ).distinct()
+
+        self.assertTrue(len(query.all()) == 0)

v1/recipe/tests/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+# encoding: utf-8

v1/recipe_groups/tests/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+# encoding: utf-8