Merge lp:~linaro-infrastructure/linaro-ci-dashboard/view-tests-extension into lp:linaro-ci-dashboard

[Stevan Radaković]

Add more view and client tests for the new frontend code.

[Deepti B. Kalakeri (deeptik)]

Thanks for working on them. Changes looks good, except for the following:

 63 class IntegrationLoopDetailViewTest(TestCase):
 64
 65 def setUp(self):
 66 self.mock_loop = Mock()
 67 self.mock_loop.loop_ptr = Mock()
 68 self.mock_loop.loop_ptr = Mock()

self.mock_loop.loop_ptr = Mock() has been defined twice, remove one of them and merge it.

review: Approve

[lp:~linaro-infrastructure/linaro-ci-dashboard/view-tests-extension]

18. By Stevan Radaković on 2012-07-28

Code review fixes.

=== modified file 'dashboard/frontend/tests/test_clientresponse.py'
--- dashboard/frontend/tests/test_clientresponse.py	2012-07-19 10:44:27 +0000
+++ dashboard/frontend/tests/test_clientresponse.py	2012-07-28 02:29:17 +0000
@@ -19,7 +19,7 @@
 from django.test import TestCase
 from django.contrib.auth.models import User, Group
 from django.test.client import Client
-
+import urllib
 
 class ClientResponseTests(TestCase):
 
@@ -32,6 +32,11 @@
         self.user = User.objects.create_user(self.user,
                     self.email, self.passwd)
         self.group = Group.objects.create(name=self.group)
+        self.integration_loop_data = {"name" : "testjob",
+                                      "branch" : "lp:linaro-ci-dashboard",
+                                      "precommand" : "make migrate",
+                                      "command" : "make test",
+                                      }
 
     def tearDown(self):
         user = User.objects.filter(username=self.user)
@@ -62,3 +67,42 @@
         self.assertIn(str(self.user), response.content)
         response = self.client.get('/home/')
         self.assertIn(str(self.user), response.content)
+
+    def test_integration_loop_create_get(self):
+        self.client.login(username=self.user, password=self.passwd)
+        response = self.client.get("/integration_loop/create/")
+        self.assertIn("/integration_loop/create/", response.content)
+        template_names = [template.name for template in
+                          response.templates]
+        self.assertEquals(template_names, ["integration_loop_create.html",
+                                           "header.html"])
+
+    def test_integration_loop_create_post_no_data(self):
+        self.client.login(username=self.user, password=self.passwd)
+        response = self.client.post("/integration_loop/create/", {})
+        self.assertEquals(response.status_code, 200)
+        self.assertIn("This field is required", response.content)
+
+    def test_integration_loop_create_post(self):
+        self.client.login(username=self.user, password=self.passwd)
+
+        # Follow redirect after save.
+        response = self.client.post("/integration_loop/create/",
+                                    self.integration_loop_data, follow=True)
+        # Assert response code.
+        self.assertEquals(response.status_code, 200)
+        # Assert redirect chain.
+        self.assertEquals(response.redirect_chain[0][1], 302)
+        self.assertIn(urllib.quote(self.integration_loop_data["name"]),
+                      response.redirect_chain[0][0])
+        # Assert template names for detail page.
+        template_names = [template.name for template in
+                          response.templates]
+        self.assertEquals(template_names, ["integration_loop_detail.html",
+                                           "header.html"])
+        # Assert if everything is present on detail page.
+        self.assertIn(self.integration_loop_data["name"], response.content)
+        self.assertIn(self.integration_loop_data["branch"], response.content)
+        self.assertIn(self.integration_loop_data["precommand"],
+                      response.content)
+        self.assertIn(self.integration_loop_data["command"], response.content)

=== modified file 'dashboard/frontend/tests/test_custom_commands.py'
--- dashboard/frontend/tests/test_custom_commands.py	2012-07-19 10:44:27 +0000
+++ dashboard/frontend/tests/test_custom_commands.py	2012-07-28 02:29:17 +0000
@@ -17,6 +17,8 @@
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
 import frontend.management.commands.jenkins as jenkins
+import frontend.management.commands.setsuperuser as setsuperuser
+from django.contrib.auth.models import User
 from django.core.management.base import CommandError
 from django.conf import settings
 from subprocess import  CalledProcessError
@@ -28,6 +30,25 @@
 import shutil
 
 
+class SetsuperuserCommandTest(TestCase):
+
+    def setUp(self):
+        self.command = setsuperuser.Command()
+
+    def test_find_and_update_user_non_existing(self):
+        self.assertRaises(CommandError,
+                          self.command.find_and_update_user,
+                          ("non_existing_user"))
+
+    def test_find_and_update_user(self):
+        user = User(username="existing_user")
+        user.save()
+        self.command.find_and_update_user("existing_user")
+        user = User.objects.get(username="existing_user")
+        self.assertEquals(user.is_staff, True)
+        self.assertEquals(user.is_superuser, True)
+
+
 class JenkinsCommandTest(TestCase):
 
     orig_dir = os.getcwd()

=== modified file 'dashboard/frontend/tests/test_views.py'
--- dashboard/frontend/tests/test_views.py	2012-07-09 19:27:50 +0000
+++ dashboard/frontend/tests/test_views.py	2012-07-28 02:29:17 +0000
@@ -15,14 +15,17 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
-from django.core.management.base import CommandError
-from django.contrib.auth.models import User
 from django.test import TestCase
 from mock import Mock, patch
 
-import frontend.management.commands.setsuperuser as setsuperuser
 from frontend.views.home_page_view import HomePageView
 from frontend.views.index_view import IndexView
+from frontend.views.integration_loop_create_view \
+  import IntegrationLoopCreateView
+from frontend.views.integration_loop_update_view \
+  import IntegrationLoopUpdateView
+from frontend.views.integration_loop_detail_view \
+  import IntegrationLoopDetailView
 
 
 class HomePageViewTest(TestCase):
@@ -43,20 +46,47 @@
         self.assertEqual(context['request'], "some request data")
 
 
-class SetsuperuserCommandTest(TestCase):
-
-    def setUp(self):
-        self.command = setsuperuser.Command()
-
-    def test_find_and_update_user_non_existing(self):
-        self.assertRaises(CommandError,
-                          self.command.find_and_update_user,
-                          ("non_existing_user"))
-
-    def test_find_and_update_user(self):
-        user = User(username="existing_user")
-        user.save()
-        self.command.find_and_update_user("existing_user")
-        user = User.objects.get(username="existing_user")
-        self.assertEquals(user.is_staff, True)
-        self.assertEquals(user.is_superuser, True)
+class IntegrationLoopCreateViewTest(TestCase):
+
+    def setUp(self):
+        self.mock_loop = Mock()
+
+    def test_get_context_data(self):
+        integration_loop_create_view = IntegrationLoopCreateView()
+        integration_loop_create_view.request = "some request data"
+        integration_loop_create_view.object = self.mock_loop
+        context = IntegrationLoopCreateView.get_context_data(
+            integration_loop_create_view)
+        self.assertEqual(context['request'], "some request data")
+
+
+class IntegrationLoopDetailViewTest(TestCase):
+
+    def setUp(self):
+        self.mock_loop = Mock()
+        self.mock_loop.loop_ptr = Mock()
+        self.mock_loop.loop_ptr.loopbuild_set = Mock()
+        self.mock_loop.loop_ptr.loopbuild_set.all = Mock()
+
+    def test_get_context_data(self):
+        integration_loop_detail_view = IntegrationLoopDetailView()
+        integration_loop_detail_view.request = "some request data"
+        integration_loop_detail_view.object = self.mock_loop
+        context = IntegrationLoopDetailView.get_context_data(
+            integration_loop_detail_view)
+        self.assertEqual(context['request'], "some request data")
+        self.assertEqual(context['builds'].__class__.__name__, "Mock")
+
+
+class IntegrationLoopUpdateViewTest(TestCase):
+
+    def setUp(self):
+        self.mock_loop = Mock()
+
+    def test_get_context_data(self):
+        integration_loop_update_view = IntegrationLoopUpdateView()
+        integration_loop_update_view.request = "some request data"
+        integration_loop_update_view.object = self.mock_loop
+        context = IntegrationLoopUpdateView.get_context_data(
+            integration_loop_update_view)
+        self.assertEqual(context['request'], "some request data")