aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorTom Christie2013-06-29 22:53:15 +0100
committerTom Christie2013-06-29 22:53:15 +0100
commitc9485c783a555516e41068996258f4c5e383523b (patch)
treea4a29ab8ac2b03b7ee093525e5a63698ba78b4dc /rest_framework
parentab799ccc3ee473de61ec35c6f745c6952752c522 (diff)
downloaddjango-rest-framework-c9485c783a555516e41068996258f4c5e383523b.tar.bz2
Rename to force_authenticate
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/test.py2
-rw-r--r--rest_framework/tests/test_testing.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/rest_framework/test.py b/rest_framework/test.py
index 2e9cfe09..2f658a56 100644
--- a/rest_framework/test.py
+++ b/rest_framework/test.py
@@ -109,7 +109,7 @@ class APIClient(APIRequestFactory, DjangoClient):
"""
self._credentials = kwargs
- def authenticate(self, user=None, token=None):
+ def force_authenticate(self, user=None, token=None):
"""
Forcibly authenticates outgoing requests with the given
user and/or token.
diff --git a/rest_framework/tests/test_testing.py b/rest_framework/tests/test_testing.py
index a8398b9a..3706f38c 100644
--- a/rest_framework/tests/test_testing.py
+++ b/rest_framework/tests/test_testing.py
@@ -37,12 +37,12 @@ class CheckTestClient(TestCase):
response = self.client.get('/view/')
self.assertEqual(response.data['auth'], 'example')
- def test_authenticate(self):
+ def test_force_authenticate(self):
"""
- Setting `.authenticate()` forcibly authenticates each request.
+ Setting `.force_authenticate()` forcibly authenticates each request.
"""
user = User.objects.create_user('example', 'example@example.com')
- self.client.authenticate(user)
+ self.client.force_authenticate(user)
response = self.client.get('/view/')
self.assertEqual(response.data['user'], 'example')