1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
Description: Add Django 1.10 support
In Django 1.10, urlpatterns must be a simple array.
.
In Django 1.10, the user.is_authenticated can act as a method or a
property. Django depricated its use as a method and will be removed
in Django 2.0. Django has internally changed its code to use it as a
property. This patch updates the mock setup of is_authenticated to
work like a property or a method.
Origin: other, https://github.com/mgrouchy/django-stronghold/pull/51
Bug: https://github.com/mgrouchy/django-stronghold/issues/50
Bug-Debian: https://bugs.debian.org/828658
Forwarded: https://github.com/mgrouchy/django-stronghold/pull/51
Forwarded: https://github.com/mgrouchy/django-stronghold/pull/55
Author: James Valleroy <jvalleroy@mailbox.org>
Author: Sunil Mohan Adapa <sunil@medhas.org>
Last-Update: 2016-08-24
--- a/test_project/test_project/urls.py
+++ b/test_project/test_project/urls.py
@@ -1,9 +1,8 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
from . import views
-urlpatterns = patterns(
- '',
+urlpatterns = [
url(r'^protected/$', views.ProtectedView.as_view(), name="protected_view"),
url(r'^public/$', views.PublicView.as_view(), name="public_view"),
-)
+]
--- a/stronghold/tests/testmiddleware.py
+++ b/stronghold/tests/testmiddleware.py
@@ -36,22 +36,31 @@
'request': self.request,
}
+ def set_authenticated(self, is_authenticated):
+ """Set whether user is authenticated in the request."""
+ user = self.request.user
+ user.is_authenticated.return_value = is_authenticated
+
+ # In Django >= 1.10, is_authenticated acts as property and method
+ user.is_authenticated.__bool__ = lambda self: is_authenticated
+ user.is_authenticated.__nonzero__ = lambda self: is_authenticated
+
def test_redirects_to_login_when_not_authenticated(self):
- self.request.user.is_authenticated.return_value = False
+ self.set_authenticated(False)
response = self.middleware.process_view(**self.kwargs)
self.assertEqual(response.status_code, 302)
def test_returns_none_when_authenticated(self):
- self.request.user.is_authenticated.return_value = True
+ self.set_authenticated(True)
response = self.middleware.process_view(**self.kwargs)
self.assertEqual(response, None)
def test_returns_none_when_url_is_in_public_urls(self):
- self.request.user.is_authenticated.return_value = False
+ self.set_authenticated(False)
self.middleware.public_view_urls = [re.compile(r'/test-protected-url/')]
response = self.middleware.process_view(**self.kwargs)
@@ -59,7 +68,7 @@
self.assertEqual(response, None)
def test_returns_none_when_url_is_decorated_public(self):
- self.request.user.is_authenticated.return_value = False
+ self.set_authenticated(False)
self.kwargs['view_func'].STRONGHOLD_IS_PUBLIC = True
response = self.middleware.process_view(**self.kwargs)
|
