Skip to content
This repository has been archived by the owner on Jun 29, 2020. It is now read-only.

Commit

Permalink
django-permission 0.8.3のキャッシュの機構に対応した closes #310
Browse files Browse the repository at this point in the history
  • Loading branch information
giginet committed Oct 19, 2014
1 parent 5e434fd commit a61ed53
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion config/requirements.txt
Expand Up @@ -3,7 +3,7 @@ pytz
pillow
markdown2==2.2.2
djangorestframework
django-permission>=0.7.1
django-permission==0.8.3
django-filter
django-roughpages>=0.1.2
django-thumbnailfield>=0.2.0
Expand Down
6 changes: 6 additions & 0 deletions src/kawaz/apps/events/tests/test_perms.py
@@ -1,5 +1,6 @@
import datetime
from unittest import mock
from kawaz.core.personas.models import Persona
from kawaz.core.tests.testcases.permissions import BasePermissionLogicTestCase
from kawaz.core.personas.tests.factories import PersonaFactory
from ..models import Event
Expand Down Expand Up @@ -114,6 +115,11 @@ def test_attend_permission_with_obj(self):
self._test('children', 'attend', obj=self.event)
self._test('wille', 'attend', obj=self.event)
self._test('anonymous', 'attend', obj=self.event, neg=True)

# django-permissionのキャッシュ対応
organizer = Persona.objects.get(pk=self.users['organizer'].pk)
self.users['organizer'] = organizer

self._test('organizer', 'attend', obj=self.event, neg=True)
self._test('attendee', 'attend', obj=self.event, neg=True)

Expand Down
4 changes: 4 additions & 0 deletions src/kawaz/apps/projects/tests/test_models.py
Expand Up @@ -3,6 +3,7 @@
from django.core.exceptions import PermissionDenied

from .factories import ProjectFactory, CategoryFactory
from kawaz.core.personas.models import Persona
from kawaz.core.personas.tests.factories import PersonaFactory
from ..models import Project
from ..models import ProjectManager
Expand Down Expand Up @@ -193,6 +194,9 @@ def test_join_user_twice(self):

project.join(user)

# django-permissionのキャッシュ対応
user = Persona.objects.get(pk=user.pk)

self.assertRaises(PermissionDenied, project.join, user)

def test_join_anonymous(self):
Expand Down
5 changes: 5 additions & 0 deletions src/kawaz/apps/projects/tests/test_perms.py
Expand Up @@ -2,6 +2,7 @@
from django.contrib.auth.models import AnonymousUser

from .factories import ProjectFactory, CategoryFactory
from kawaz.core.personas.models import Persona
from kawaz.core.personas.tests.factories import PersonaFactory

class ProjectEditPermissionTestCase(TestCase):
Expand Down Expand Up @@ -167,6 +168,10 @@ def test_member_cannot_join_project(self):
'''Tests already member user cannot join to projects'''
user = PersonaFactory()
self.project.join(user)

# django-permissionのキャッシュ対応
user = Persona.objects.get(pk=user.pk)

self.assertFalse(user.has_perm('projects.join_project', self.project))

def test_anyone_cannot_join_draft_project(self):
Expand Down

0 comments on commit a61ed53

Please sign in to comment.