Inactive user profiles are 404s.

mozilla · Oct 28, 2011 · 4524ce8 · 4524ce8
1 parent 33d3c72
commit 4524ce8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/apps/users/tests/test_views.py b/apps/users/tests/test_views.py
@@ -395,4 +395,28 @@ def test_create_setting(self):
         res = self.client.post(url, {'forums_watch_new_thread': True},
                                follow=True)
         eq_(200, res.status_code)
-        eq_(Setting.get_for_user(self.user, 'forums_watch_new_thread'), True)
+        assert Setting.get_for_user(self.user, 'forums_watch_new_thread')
+
+
+class UserProfileTests(TestCase):
+    def setUp(self):
+        self.user = user()
+        self.user.save()
+        self.profile = profile(self.user)
+        self.url = reverse('users.profile', args=[self.user.pk],
+                           locale='en-US')
+
+    def test_profile(self):
+        res = self.client.get(self.url)
+        self.assertContains(res, self.user.username)
+
+    def test_profile_inactive(self):
+        """Inactive users don't have a public profile."""
+        self.user.is_active = False
+        self.user.save()
+        res = self.client.get(self.url)
+        eq_(404, res.status_code)
+
+    def test_profile_post(self):
+        res = self.client.post(self.url)
+        eq_(405, res.status_code)
diff --git a/apps/users/views.py b/apps/users/views.py
@@ -189,8 +189,10 @@ def confirm_change_email(request, activation_key):
                          'username': u.username, 'duplicate': duplicate})
 
 
+@require_GET
 def profile(request, user_id):
-    user_profile = get_object_or_404(Profile, user__id=user_id)
+    user_profile = get_object_or_404(Profile, user__id=user_id,
+                                     user__is_active=True)
     groups = user_profile.user.groups.all()
     return jingo.render(request, 'users/profile.html',
                         {'profile': user_profile, 'groups': groups})