Skip to content

Commit 797cae2

Browse files
committed
Splitted AuthorizedToken TestCase in two Test cases
1 parent 88f5d01 commit 797cae2

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

oauth2_provider/tests/test_application_views.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,3 @@ def test_application_detail_not_owner(self):
9999

100100
response = self.client.get(reverse('oauth2_provider:detail', args=(self.app_bar_1.pk,)))
101101
self.assertEqual(response.status_code, 404)
102-
103-
def test_delete_view_deletes(self):
104-
self.client.login(username="foo_user", password="123456")
105-
response = self.client.post(reverse('oauth2_provider:delete', args=(self.app_foo_1.pk,)))
106-
107-
self.assertFalse(Application.objects.filter(pk=self.app_foo_1.pk).exists())
108-
self.assertRedirects(response, reverse('oauth2_provider:list'))

oauth2_provider/tests/test_token_view.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515

1616
class TestAuthorizedTokenViews(TestCase):
17+
"""
18+
TestCase superclass for Authorized Token Views' Test Cases
19+
"""
1720
def setUp(self):
1821
self.foo_user = UserModel.objects.create_user("foo_user", "[email protected]", "123456")
1922
self.bar_user = UserModel.objects.create_user("bar_user", "[email protected]", "123456")
@@ -31,6 +34,11 @@ def tearDown(self):
3134
self.foo_user.delete()
3235
self.bar_user.delete()
3336

37+
38+
class TestAuthorizedTokenListView(TestAuthorizedTokenViews):
39+
"""
40+
Tests for the Authorized Token ListView
41+
"""
3442
def test_list_view_authorization_required(self):
3543
"""
3644
Test that the view redirects to login page if user is not logged-in.
@@ -97,6 +105,11 @@ def test_list_view_shows_correct_user_token(self):
97105
self.assertEqual(response.status_code, 200)
98106
self.assertIn(b'There are no authorized tokens yet.', response.content)
99107

108+
109+
class TestAuthorizedTokenDeleteView(TestAuthorizedTokenViews):
110+
"""
111+
Tests for the Authorized Token DeleteView
112+
"""
100113
def test_delete_view_authorization_required(self):
101114
"""
102115
Test that the view redirects to login page if user is not logged-in.

oauth2_provider/views/application.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.core.urlresolvers import reverse
1+
from django.core.urlresolvers import reverse_lazy
22
from django.forms.models import modelform_factory
33
from django.views.generic import CreateView, DetailView, DeleteView, ListView, UpdateView
44

@@ -59,11 +59,9 @@ class ApplicationDelete(ApplicationOwnerIsUserMixin, DeleteView):
5959
View used to delete an application owned by the request.user
6060
"""
6161
context_object_name = 'application'
62+
success_url = reverse_lazy('oauth2_provider:list')
6263
template_name = "oauth2_provider/application_confirm_delete.html"
6364

64-
def get_success_url(self):
65-
return reverse('oauth2_provider:list')
66-
6765

6866
class ApplicationUpdate(ApplicationOwnerIsUserMixin, UpdateView):
6967
"""

oauth2_provider/views/token.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from __future__ import absolute_import, unicode_literals
22

3-
from django.core.urlresolvers import reverse
3+
from django.core.urlresolvers import reverse_lazy
44
from django.views.generic import ListView, DeleteView
5+
56
from braces.views import LoginRequiredMixin
67

78
from ..models import AccessToken
@@ -28,10 +29,8 @@ class AuthorizedTokenDeleteView(LoginRequiredMixin, DeleteView):
2829
View for revoking a specific token
2930
"""
3031
template_name = 'oauth2_provider/authorized-token-delete.html'
32+
success_url = reverse_lazy('oauth2_provider:authorized-token-list')
3133
model = AccessToken
3234

33-
def get_success_url(self):
34-
return reverse('oauth2_provider:authorized-token-list')
35-
3635
def get_queryset(self):
3736
return super(AuthorizedTokenDeleteView, self).get_queryset().filter(user=self.request.user)

0 commit comments

Comments
 (0)