Commit 3a90090
committed
[relationships] Updating models to use AUTH_USER_MODEL instead of accessing the User model directly. Updating tests and removing the need for a fixture.
1 parent 03f0f98 commit 3a90090
3 files changed
Lines changed: 16 additions & 32 deletions
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | + from django.conf import settings | ||
| 1 | 2 | from django.db import models | |
| 2 | - from django.contrib.auth.models import User | ||
| 3 | 3 | from django.utils.translation import ugettext_lazy as _ | |
| 4 | 4 | from django.core.cache import cache | |
| 5 | 5 | from django.conf import settings | |
@@ -65,8 +65,8 @@ def blocking(self, from_user, to_user): | |||
| 65 | 65 | ||
| 66 | 66 | class Relationship(models.Model): | |
| 67 | 67 | """Relationship model""" | |
| 68 | - from_user = models.ForeignKey(User, related_name='from_users') | ||
| 69 | - to_user = models.ForeignKey(User, related_name='to_users') | ||
| 68 | + from_user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='from_users') | ||
| 69 | + to_user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='to_users') | ||
| 70 | 70 | created = models.DateTimeField(auto_now_add=True) | |
| 71 | 71 | is_blocked = models.BooleanField(default=False) | |
| 72 | 72 | objects = RelationshipManager() | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,17 +1,18 @@ | |||
| 1 | - from django.test import TestCase | ||
| 1 | + from django.test import TestCase, override_settings | ||
| 2 | 2 | from django.core.urlresolvers import reverse | |
| 3 | 3 | from django.contrib.auth.models import User | |
| 4 | 4 | ||
| 5 | 5 | from basic.relationships.models import * | |
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | 8 | class RelationshipTestCase(TestCase): | |
| 9 | - fixtures = ['users.json'] | ||
| 10 | 9 | ||
| 10 | + @override_settings(AUTH_USER_MODEL='auth.User') | ||
| 11 | 11 | def setUp(self): | |
| 12 | - self.user1 = User.objects.get(username='nathanb') | ||
| 13 | - self.user2 = User.objects.get(username='laurah') | ||
| 14 | - | ||
| 12 | + self.user1 = User.objects.create_user('nathanb', email='nathanb@example.com', password='n') | ||
| 13 | + self.user2 = User.objects.create_user('laurah', email='laurah@example.com', password='l') | ||
| 14 | + | ||
| 15 | + @override_settings(AUTH_USER_MODEL='auth.User') | ||
| 15 | 16 | def test_follow(self): | |
| 16 | 17 | self.client.login(username=self.user1.username, password='n') | |
| 17 | 18 | ||
@@ -33,7 +34,8 @@ def test_follow(self): | |||
| 33 | 34 | ||
| 34 | 35 | fans = Relationship.objects.get_fans_for_user(self.user2) | |
| 35 | 36 | self.assertEqual(len(fans), 1) | |
| 36 | - | ||
| 37 | + | ||
| 38 | + @override_settings(AUTH_USER_MODEL='auth.User') | ||
| 37 | 39 | def test_block(self): | |
| 38 | 40 | self.client.login(username=self.user1.username, password='n') | |
| 39 | 41 | ||
@@ -59,7 +61,8 @@ def test_block(self): | |||
| 59 | 61 | ||
| 60 | 62 | friends = Relationship.objects.get_friends_for_user(self.user2) | |
| 61 | 63 | self.assertEqual(len(friends), 0) | |
| 62 | - | ||
| 64 | + | ||
| 65 | + @override_settings(AUTH_USER_MODEL='auth.User') | ||
| 63 | 66 | def test_following(self): | |
| 64 | 67 | kwargs = {'username': self.user1.username} | |
| 65 | 68 | ||
@@ -75,7 +78,8 @@ def test_following(self): | |||
| 75 | 78 | response = self.client.get(reverse('relationship_following', kwargs=kwargs)) | |
| 76 | 79 | self.assertEqual(response.status_code, 200) | |
| 77 | 80 | self.assertEqual([following.id for following in response.context['page'].object_list], [self.user2.pk]) | |
| 78 | - | ||
| 81 | + | ||
| 82 | + @override_settings(AUTH_USER_MODEL='auth.User') | ||
| 79 | 83 | def test_followers(self): | |
| 80 | 84 | kwargs = {'username': self.user2.username} | |
| 81 | 85 | ||
@@ -90,4 +94,4 @@ def test_followers(self): | |||
| 90 | 94 | # Test the relationship. | |
| 91 | 95 | response = self.client.get(reverse('relationship_followers', kwargs=kwargs)) | |
| 92 | 96 | self.assertEqual(response.status_code, 200) | |
| 93 | - self.assertEqual([following.id for following in response.context['page'].object_list], [self.user1.pk]) | ||
| 97 | + self.assertEqual([following.id for following in response.context['page'].object_list], [self.user1.pk]) | ||
0 commit comments