aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_request.py
diff options
context:
space:
mode:
authorTom Christie2014-12-18 11:21:25 +0000
committerTom Christie2014-12-18 11:21:25 +0000
commitc8d88c8c8a594e3b66547a34462db4766292ea9e (patch)
tree09d1e53c9c019501b85ff8892dca4177c95a6e0b /tests/test_request.py
parent47fe6977077ae33dfe2f8b6d04d81083b9b9f4d7 (diff)
parentd8803a35bd2dc8cbf4c892f68b48c72f24e83916 (diff)
downloaddjango-rest-framework-c8d88c8c8a594e3b66547a34462db4766292ea9e.tar.bz2
Merge branch 'master' into version-3.1
Diffstat (limited to 'tests/test_request.py')
-rw-r--r--tests/test_request.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/test_request.py b/tests/test_request.py
index 7cf8c327..02a9b1e2 100644
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -224,7 +224,8 @@ class TestUserSetter(TestCase):
def setUp(self):
# Pass request object through session middleware so session is
# available to login and logout functions
- self.request = Request(factory.get('/'))
+ self.wrapped_request = factory.get('/')
+ self.request = Request(self.wrapped_request)
SessionMiddleware().process_request(self.request)
User.objects.create_user('ringo', 'starr@thebeatles.com', 'yellow')
@@ -244,6 +245,10 @@ class TestUserSetter(TestCase):
logout(self.request)
self.assertTrue(self.request.user.is_anonymous())
+ def test_logged_in_user_is_set_on_wrapped_request(self):
+ login(self.request, self.user)
+ self.assertEqual(self.wrapped_request.user, self.user)
+
class TestAuthSetter(TestCase):