Fix url_name_args problems in user and group views. Add tests.
This commit is contained in:
parent
c399eea2dd
commit
273140007e
@ -95,6 +95,7 @@ class UserCreateView(CreateView):
|
|||||||
context_object_name = 'edit_user'
|
context_object_name = 'edit_user'
|
||||||
form_class = UserCreateForm
|
form_class = UserCreateForm
|
||||||
success_url_name = 'user_overview'
|
success_url_name = 'user_overview'
|
||||||
|
url_name_args = []
|
||||||
|
|
||||||
def manipulate_object(self, form):
|
def manipulate_object(self, form):
|
||||||
self.object.username = gen_username(
|
self.object.username = gen_username(
|
||||||
@ -125,6 +126,7 @@ class UserUpdateView(UpdateView):
|
|||||||
context_object_name = 'edit_user'
|
context_object_name = 'edit_user'
|
||||||
form_class = UserUpdateForm
|
form_class = UserUpdateForm
|
||||||
success_url_name = 'user_overview'
|
success_url_name = 'user_overview'
|
||||||
|
url_name_args = []
|
||||||
|
|
||||||
def get_form_kwargs(self, *args, **kwargs):
|
def get_form_kwargs(self, *args, **kwargs):
|
||||||
form_kwargs = super(UserUpdateView, self).get_form_kwargs(*args, **kwargs)
|
form_kwargs = super(UserUpdateView, self).get_form_kwargs(*args, **kwargs)
|
||||||
@ -397,6 +399,7 @@ class GroupCreateView(CreateView):
|
|||||||
model = Group
|
model = Group
|
||||||
form_class = GroupForm
|
form_class = GroupForm
|
||||||
success_url_name = 'user_group_overview'
|
success_url_name = 'user_group_overview'
|
||||||
|
url_name_args = []
|
||||||
|
|
||||||
def get(self, request, *args, **kwargs):
|
def get(self, request, *args, **kwargs):
|
||||||
delete_default_permissions()
|
delete_default_permissions()
|
||||||
@ -413,6 +416,7 @@ class GroupUpdateView(UpdateView):
|
|||||||
context_object_name = 'group'
|
context_object_name = 'group'
|
||||||
form_class = GroupForm
|
form_class = GroupForm
|
||||||
success_url_name = 'user_group_overview'
|
success_url_name = 'user_group_overview'
|
||||||
|
url_name_args = []
|
||||||
|
|
||||||
def get(self, request, *args, **kwargs):
|
def get(self, request, *args, **kwargs):
|
||||||
delete_default_permissions()
|
delete_default_permissions()
|
||||||
|
@ -17,6 +17,35 @@ from openslides.participant.models import get_protected_perm, Group, User
|
|||||||
from openslides.utils.test import TestCase
|
from openslides.utils.test import TestCase
|
||||||
|
|
||||||
|
|
||||||
|
class UserViews(TestCase):
|
||||||
|
"""
|
||||||
|
Tests some views for users.
|
||||||
|
"""
|
||||||
|
def setUp(self):
|
||||||
|
self.admin = User.objects.get(pk=1)
|
||||||
|
self.client = Client()
|
||||||
|
self.client.login(username='admin', password='admin')
|
||||||
|
|
||||||
|
def test_create(self):
|
||||||
|
response = self.client.get('/participant/new/')
|
||||||
|
self.assertTemplateUsed(response, 'participant/edit.html')
|
||||||
|
self.assertContains(response, 'New participant')
|
||||||
|
response = self.client.post('/participant/new/', {'first_name': 'test_name_ho8hui2niz4nohSupahb'})
|
||||||
|
self.assertRedirects(response, '/participant/')
|
||||||
|
|
||||||
|
def test_update(self):
|
||||||
|
response = self.client.get('/participant/1/edit/')
|
||||||
|
self.assertTemplateUsed(response, 'participant/edit.html')
|
||||||
|
self.assertContains(response, 'Edit participant')
|
||||||
|
response = self.client.post(
|
||||||
|
'/participant/1/edit/',
|
||||||
|
{'user_name': 'test_name_unaewae5Ir0saijeac2I',
|
||||||
|
'first_name': 'test_name_aJi5jaizaVingaeF3Ohj',
|
||||||
|
'groups': '4',
|
||||||
|
'is_active': 'yes'})
|
||||||
|
self.assertRedirects(response, '/participant/')
|
||||||
|
|
||||||
|
|
||||||
class GroupViews(TestCase):
|
class GroupViews(TestCase):
|
||||||
"""
|
"""
|
||||||
Tests the detail view for groups and later also the other views.
|
Tests the detail view for groups and later also the other views.
|
||||||
@ -54,6 +83,20 @@ class GroupViews(TestCase):
|
|||||||
self.assertEqual(match[1], 'admins_first_name Administrator')
|
self.assertEqual(match[1], 'admins_first_name Administrator')
|
||||||
self.assertEqual(match[0], 'aWei4ien6Se0vie0xeiv uquahx3Wohtieph9baer')
|
self.assertEqual(match[0], 'aWei4ien6Se0vie0xeiv uquahx3Wohtieph9baer')
|
||||||
|
|
||||||
|
def test_create(self):
|
||||||
|
response = self.client.get('/participant/group/new/')
|
||||||
|
self.assertTemplateUsed(response, 'participant/group_edit.html')
|
||||||
|
self.assertContains(response, 'New group')
|
||||||
|
response = self.client.post('/participant/group/new/', {'name': 'test_group_name_Oeli1aeXoobohv8eikai'})
|
||||||
|
self.assertRedirects(response, '/participant/group/')
|
||||||
|
|
||||||
|
def test_update(self):
|
||||||
|
response = self.client.get('/participant/group/1/edit/')
|
||||||
|
self.assertTemplateUsed(response, 'participant/group_edit.html')
|
||||||
|
self.assertContains(response, 'Edit group')
|
||||||
|
response = self.client.post('/participant/group/1/edit/', {'name': 'test_group_name_ahFeicoz5jedie4Fop0U'})
|
||||||
|
self.assertRedirects(response, '/participant/group/')
|
||||||
|
|
||||||
|
|
||||||
class LockoutProtection(TestCase):
|
class LockoutProtection(TestCase):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user