encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-23 15:02:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2259 from tomchristie/testclient-logout-also-cancels-force-authenticate

Browse Source 
`Client.logout()` also clears any `force_authenticate`
This commit is contained in:
Tom Christie 2014-12-12 13:33:06 +00:00
commit fd473aa905
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/test.py
View File

@ -204,6 +204,11 @@ class APIClient(APIRequestFactory, DjangoClient):
def logout(self): def logout(self):
self._credentials = {} self._credentials = {}
# Also clear any `force_authenticate`
self.handler._force_user = None
self.handler._force_token = None
return super(APIClient, self).logout() return super(APIClient, self).logout()

20
tests/test_testing.py
View File

@ -1,15 +1,13 @@
# -- coding: utf-8 -- # encoding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf.urls import patterns, url from django.conf.urls import patterns, url
from io import BytesIO
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.shortcuts import redirect from django.shortcuts import redirect
from django.test import TestCase from django.test import TestCase
from rest_framework.decorators import api_view from rest_framework.decorators import api_view
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework.test import APIClient, APIRequestFactory, force_authenticate from rest_framework.test import APIClient, APIRequestFactory, force_authenticate
from io import BytesIO
@api_view(['GET', 'POST']) @api_view(['GET', 'POST'])
@ -109,7 +107,7 @@ class TestAPITestClient(TestCase):
def test_can_logout(self): def test_can_logout(self):
""" """
`logout()` reset stored credentials `logout()` resets stored credentials
""" """
self.client.credentials(HTTP_AUTHORIZATION='example') self.client.credentials(HTTP_AUTHORIZATION='example')
response = self.client.get('/view/') response = self.client.get('/view/')
@ -118,6 +116,18 @@ class TestAPITestClient(TestCase):
response = self.client.get('/view/') response = self.client.get('/view/')
self.assertEqual(response.data['auth'], b'') self.assertEqual(response.data['auth'], b'')
def test_logout_resets_force_authenticate(self):
"""
`logout()` resets any `force_authenticate`
"""
user = User.objects.create_user('example', 'example@example.com', 'password')
self.client.force_authenticate(user)
response = self.client.get('/view/')
self.assertEqual(response.data['user'], 'example')
self.client.logout()
response = self.client.get('/view/')
self.assertEqual(response.data['user'], '')
def test_follow_redirect(self): def test_follow_redirect(self):
""" """
Follow redirect by setting follow argument. Follow redirect by setting follow argument.