Add review changes and more tests

2 files changed, 72 insertions, 1 deletions

diff --git a/yaksh/decorators.py b/yaksh/decorators.py
index 8e5f879..9e9bc6d 100644
--- a/yaksh/decorators.py
+++ b/yaksh/decorators.py
@@ -21,7 +21,10 @@ def has_profile(func):
         if user_has_profile(request.user):
             return func(request, *args, **kwargs)
         ci = RequestContext(request)
-        template = 'manage.html' if 'moderator' in request.user.groups.all() else 'user.html'
+        if request.user.groups.filter(name='moderator').exists():
+            template = 'manage.html'
+        else:
+            template = 'user.html'
         form = ProfileForm(user=request.user, instance=None)
         context = {'template': template, 'form': form}
         return render_to_response('yaksh/editprofile.html', context,
diff --git a/yaksh/test_views.py b/yaksh/test_views.py
index fefe9bc..8025ecf 100644
--- a/yaksh/test_views.py
+++ b/yaksh/test_views.py
@@ -274,6 +274,16 @@ class TestStudentDashboard(TestCase):
             timezone='UTC'
         )
 
+        # student without profile
+        self.student_no_profile_plaintext_pass = 'student2'
+        self.student_no_profile = User.objects.create_user(
+            username='student_no_profile',
+            password=self.student_no_profile_plaintext_pass,
+            first_name='first_name',
+            last_name='last_name',
+            email='student_no_profile@test.com'
+        )
+
         # moderator
         self.user_plaintext_pass = 'demo'
         self.user = User.objects.create_user(
@@ -316,6 +326,30 @@ class TestStudentDashboard(TestCase):
         redirection_url = '/exam/login/?next=/exam/quizzes/'
         self.assertRedirects(response, redirection_url)
 
+    def test_student_dashboard_get_for_user_without_profile(self):
+        """
+        If no profile exists a blank profile form will be displayed
+        """
+        self.client.login(
+            username=self.student_no_profile.username,
+            password=self.student_no_profile_plaintext_pass
+        )
+        response = self.client.get(reverse('yaksh:quizlist_user'))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'yaksh/editprofile.html')
+
+    def test_student_dashboard_get_for_user_with_profile(self):
+        """
+        If profile exists a editprofile.html template will be rendered
+        """
+        self.client.login(
+            username=self.student.username,
+            password=self.student_plaintext_pass
+        )
+        response = self.client.get(reverse('yaksh:quizlist_user'))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'yaksh/quizzes_user.html')
+
     def test_student_dashboard_all_courses_get(self):
         """
             Check student dashboard for all non hidden courses 
@@ -2586,6 +2620,16 @@ class TestModeratorDashboard(TestCase):
             position='Moderator',
             timezone='UTC'
         )
+
+        self.mod_no_profile_plaintext_pass = 'demo2'
+        self.mod_no_profile = User.objects.create_user(
+            username='demo_user2',
+            password=self.mod_no_profile_plaintext_pass,
+            first_name='user_first_name22',
+            last_name='user_last_name',
+            email='demo2@test.com'
+        )
+
         self.mod_group.user_set.add(self.user)
         self.course = Course.objects.create(name="Python Course",
             enrollment="Enroll Request", creator=self.user)
@@ -2679,6 +2723,30 @@ class TestModeratorDashboard(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertRedirects(response, '/exam/quizzes/')
 
+    def test_moderator_dashboard_get_for_user_without_profile(self):
+        """
+        If no profile exists a blank profile form will be displayed
+        """
+        self.client.login(
+            username=self.mod_no_profile.username,
+            password=self.mod_no_profile_plaintext_pass
+        )
+        response = self.client.get(reverse('yaksh:quizlist_user'))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'yaksh/editprofile.html')
+
+    def test_moderator_dashboard_get_for_user_with_profile(self):
+        """
+        If profile exists a editprofile.html template will be rendered
+        """
+        self.client.login(
+            username=self.user.username,
+            password=self.user_plaintext_pass
+        )
+        response = self.client.get(reverse('yaksh:quizlist_user'))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'yaksh/quizzes_user.html')
+
     def test_moderator_dashboard_get_all_quizzes(self):
         """
             Check moderator dashboard to get all the moderator created quizzes