Skip to content

Commit

Permalink
Fix references to ANONYMOUS_USER_NAME in tests
Browse files Browse the repository at this point in the history
settings.ANONYMOUS_USER_NAME does not use the default value.

It doesn't really matter as ANONYMOUS_USER_NAME is given, but better to
be correct.
  • Loading branch information
brianmay committed Mar 17, 2016
1 parent 5ff294d commit 649101d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion guardian/testapp/tests/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import os
import unittest
from guardian.utils import abspath
from guardian.conf import settings as guardian_settings
from django.conf import settings
from django.conf import UserSettingsHolder
from django.utils.functional import wraps
Expand Down Expand Up @@ -34,7 +35,7 @@ def setUp(self):
from django.contrib.auth.models import User
Group.objects.create(pk=1, name='admins')
jack_group = Group.objects.create(pk=2, name='jackGroup')
User.objects.get_or_create(username=settings.ANONYMOUS_USER_NAME)
User.objects.get_or_create(username=guardian_settings.ANONYMOUS_USER_NAME)
jack = User.objects.create(username='jack', is_active=True,
is_superuser=False, is_staff=False)
jack.groups.add(jack_group)
Expand Down
5 changes: 3 additions & 2 deletions guardian/testapp/tests/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from itertools import chain

from django.conf import settings
from guardian.conf import settings as guardian_settings
# Try the new app settings (Django 1.7) and fall back to the old system
try:
from django.apps import apps as django_apps
Expand All @@ -28,7 +29,7 @@ def test_create_anonymous_user(self):
create_anonymous_user(object())
self.assertEqual(1, User.objects.all().count())
anonymous = User.objects.all()[0]
self.assertEqual(anonymous.username, settings.ANONYMOUS_USER_NAME)
self.assertEqual(anonymous.username, guardian_settings.ANONYMOUS_USER_NAME)


class ObjectPermissionTestCase(TestCase):
Expand All @@ -40,7 +41,7 @@ def setUp(self):
self.ctype = ContentType.objects.create(
model='bar', app_label='fake-for-guardian-tests')
self.anonymous_user = User.objects.get(
username=settings.ANONYMOUS_USER_NAME)
username=guardian_settings.ANONYMOUS_USER_NAME)


class ObjectPermissionCheckerTest(ObjectPermissionTestCase):
Expand Down

0 comments on commit 649101d

Please sign in to comment.