Adding more tests to groups

nathanborror · Jul 5, 2010 · 42ae506 · 42ae506
1 parent 1ef1117
commit 42ae506
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/basic/groups/tests.py b/basic/groups/tests.py
@@ -29,12 +29,33 @@ def test_groups(self):
         response = self.client.get(reverse('groups:group', args=group_args))
         self.assertEqual(response.status_code, 200)
 
+        response = self.client.get(reverse('groups:create'))
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.post(reverse('groups:create'), {
+            'title': 'My new group',
+            'slug': 'my-new-group'
+        })
+        self.assertEqual(response.status_code, 302)
+
+        group = Group.objects.get(pk=2)
+
         response = self.client.get(reverse('groups:edit', args=group_args))
         self.assertEqual(response.status_code, 200)
 
-        response = self.client.get(reverse('groups:remove', args=group_args))
+        response = self.client.post(reverse('groups:edit', args=[group.slug]), {
+            'title': 'My really new group',
+            'slug': 'my-new-group'
+        })
+        self.assertEqual(response.status_code, 302)
+
+        response = self.client.get(reverse('groups:remove', args=[group.slug]))
         self.assertEqual(response.status_code, 200)
 
+        response = self.client.post(reverse('groups:remove', args=[group.slug]))
+        self.assertEqual(response.status_code, 302)
+
+    def test_group_membership(self):
         response = self.client.get(reverse('groups:join', args=[self.group.slug]))
         self.assertEqual(response.status_code, 200)
 
@@ -53,12 +74,25 @@ def test_pages(self):
         response = self.client.get(reverse('groups:page_create', args=[self.group.slug]))
         self.assertEqual(response.status_code, 200)
 
+        response = self.client.post(reverse('groups:page_create', args=[self.group.slug]), {
+            'title': 'Contact us',
+            'slug': 'contact',
+            'body': 'Lorem ipsum dolor sit amet, consectetur adipisicing elit.'
+        })
+        self.assertEqual(response.status_code, 302)
+
         response = self.client.get(reverse('groups:page', args=page_args))
         self.assertEqual(response.status_code, 200)
 
         response = self.client.get(reverse('groups:page_edit', args=page_args))
         self.assertEqual(response.status_code, 200)
 
+        response = self.client.post(reverse('groups:page_edit', args=page_args), {
+            'title': 'About our group',
+            'slug': 'about'
+        })
+        self.assertEqual(response.status_code, 302)
+
         response = self.client.get(reverse('groups:page_remove', args=page_args))
         self.assertEqual(response.status_code, 200)
 

diff --git a/basic/groups/views/groups.py b/basic/groups/views/groups.py
@@ -76,13 +76,13 @@ def group_edit(request, slug, template_name='groups/group_form.html'):
             Group object
     """
     group = get_object_or_404(Group, slug=slug, creator=request.user)
+    form = GroupForm(instance=group)
+
     if request.method == 'POST':
         form = GroupForm(request.POST, request.FILES, instance=group)
         if form.is_valid():
             form.save()
             return redirect(request, group)
-    else:
-        form = GroupForm(instance=group)
     return render(request, template_name, {
         'form': form,
         'group': group