made users.testutils work with auth api

misago/users/tests/test_testutils.py

@@ -1,3 +1,4 @@
+import json
 from django.core.urlresolvers import reverse
 
 from misago.users.testutils import (UserTestCase, AuthenticatedUserTestCase,
@@ -32,16 +33,22 @@ class UserTestCaseTests(UserTestCase):
         user = self.get_authenticated_user()
         self.login_user(user)
 
-        response = self.client.get(reverse('misago:index'))
-        self.assertIn(user.username, response.content)
+        response = self.client.get(reverse('misago:api:auth_user'))
+        self.assertEqual(response.status_code, 200)
+
+        user_json = json.loads(response.content)
+        self.assertEqual(user_json['id'], user.id)
 
     def test_login_superuser(self):
         """login_user logs superuser"""
         user = self.get_superuser()
         self.login_user(user)
 
-        response = self.client.get(reverse('misago:index'))
-        self.assertIn(user.username, response.content)
+        response = self.client.get(reverse('misago:api:auth_user'))
+        self.assertEqual(response.status_code, 200)
+
+        user_json = json.loads(response.content)
+        self.assertEqual(user_json['id'], user.id)
 
     def test_logout_user(self):
         """logout_user logs user out"""
@@ -49,8 +56,11 @@ class UserTestCaseTests(UserTestCase):
         self.login_user(user)
         self.logout_user()
 
-        response = self.client.get(reverse('misago:index'))
-        self.assertNotIn(user.username, response.content)
+        response = self.client.get(reverse('misago:api:auth_user'))
+        self.assertEqual(response.status_code, 200)
+
+        user_json = json.loads(response.content)
+        self.assertIsNone(user_json['id'])
 
     def test_logout_superuser(self):
         """logout_user logs superuser out"""
@@ -58,8 +68,11 @@ class UserTestCaseTests(UserTestCase):
         self.login_user(user)
         self.logout_user()
 
-        response = self.client.get(reverse('misago:index'))
-        self.assertNotIn(user.username, response.content)
+        response = self.client.get(reverse('misago:api:auth_user'))
+        self.assertEqual(response.status_code, 200)
+
+        user_json = json.loads(response.content)
+        self.assertIsNone(user_json['id'])
 
 
 class AuthenticatedUserTestCaseTests(AuthenticatedUserTestCase):
@@ -79,5 +92,11 @@ class AuthenticatedUserTestCaseTests(AuthenticatedUserTestCase):
 class SuperUserTestCaseTests(SuperUserTestCase):
     def test_setup(self):
         """setup executed correctly"""
-        response = self.client.get(reverse('misago:index'))
-        self.assertIn(self.user.username, response.content)
+        self.assertTrue(self.user.is_staff)
+        self.assertTrue(self.user.is_superuser)
+
+        response = self.client.get(reverse('misago:api:auth_user'))
+        self.assertEqual(response.status_code, 200)
+
+        user_json = json.loads(response.content)
+        self.assertEqual(user_json['id'], self.user.id)

misago/users/testutils.py

@@ -25,7 +25,7 @@ class UserTestCase(TestCase):
             "TestSuperUser", "test@superuser.com", self.USER_PASSWORD)
 
     def login_user(self, user):
-        self.client.post(reverse('misago:login'), data={
+        self.client.post(reverse('misago:api:login'), data={
             'username': user.email,
             'password': self.USER_PASSWORD,
         })