Merge lp:~milo/linaro-ci-dashboard/simple-mock into lp:linaro-ci-dashboard

[Milo Casagrande]

In this branch I worked out a little issue we had when running the tests. Basically, with the new refactoring of the views, we are looking for objects with the query 'Loop.objects.get' that accepts parameters (in our case the primary key). The problem is that during the test we mock the other objects present in the view, so the primary key during the test is not a valid primary key for the query set.

Here I introduced a couple of very simple mocks, Python classes that inherits from MagicMock, that mimicks a Loop instance, the 'Loop.objects' query, the '_meta' field and a generic 'field'.

I refactored the tests in order to use the new mocks, and also moved the integration_loop tests under the integration_loop sub-app (before they were under the frontend main app).

[Stevan Radaković (stevanr)]

Thanks Milo, it looks great!
Approve +1.

review: Approve

=== modified file 'Makefile'
--- Makefile	2012-09-10 16:49:11 +0000
+++ Makefile	2012-09-14 08:22:19 +0000
@@ -33,7 +33,7 @@
 
 test:
 	python dashboard/manage.py jenkins start
-	python dashboard/manage.py test frontend android_build kernel_build \
-		android_textfield_loop jenkinsserver
+	python dashboard/manage.py test frontend android_build integration_loop \
+		kernel_build android_textfield_loop jenkinsserver
 
 .PHONY: help migration test
 
=== modified file 'dashboard/frontend/android_build/tests/test_android_build_views.py'
--- dashboard/frontend/android_build/tests/test_android_build_views.py	2012-09-12 14:31:41 +0000
+++ dashboard/frontend/android_build/tests/test_android_build_views.py	2012-09-14 08:22:19 +0000
@@ -14,8 +14,6 @@
 #
 # 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.test import TestCase
-from mock import MagicMock
 
 from frontend.android_build.views.android_loop_create_view \
     import AndroidLoopCreateView
@@ -23,18 +21,13 @@
     import AndroidLoopDetailView
 from frontend.android_build.views.android_loop_update_view\
     import AndroidLoopUpdateView
-
-
-class AndroidBuildViewsTest(TestCase):
-
-    def setUp(self):
-        self.mock_loop = MagicMock()
-        self.mock_loop.loop_ptr = MagicMock()
-        self.mock_loop.loop_ptr.id = 0
-        self.mock_loop.loop_ptr.loopbuild_set = MagicMock()
-        self.mock_loop.loop_ptr.loopbuild_set.all = MagicMock()
-        self.mock_loop.next_loop = MagicMock()
-        self.mock_loop.next_loop.id = 1
+from frontend.tests.test_views import (
+    ViewsTestsGeneral,
+    LoopMock
+)
+
+
+class AndroidBuildViewsTest(ViewsTestsGeneral):
 
     def test_create_view_get_context_data(self):
         android_loop_create_view = AndroidLoopCreateView()
@@ -51,7 +44,8 @@
         context = AndroidLoopDetailView.get_context_data(
             android_loop_detail_view)
         self.assertEqual(context['request'], "some request data")
-        self.assertEqual(context['builds'].__class__.__name__, "MagicMock")
+        self.assertEqual(context['builds'].__class__.__name__,
+                         LoopMock.__name__)
 
     def test_update_view_get_context_data(self):
         android_loop_update_view = AndroidLoopUpdateView()
 
=== modified file 'dashboard/frontend/android_textfield_loop/tests/test_android_textfield_views.py'
--- dashboard/frontend/android_textfield_loop/tests/test_android_textfield_views.py	2012-09-10 07:45:21 +0000
+++ dashboard/frontend/android_textfield_loop/tests/test_android_textfield_views.py	2012-09-14 08:22:19 +0000
@@ -14,8 +14,6 @@
 #
 # 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.test import TestCase
-from mock import MagicMock
 
 from frontend.android_textfield_loop.views.android_textfield_loop_create_view \
     import AndroidTextFieldLoopCreateView
@@ -23,12 +21,13 @@
     import AndroidTextFieldLoopDetailView
 from frontend.android_textfield_loop.views.android_textfield_loop_update_view \
     import AndroidTextFieldLoopUpdateView
-
-
-class AndroidTextFieldViewsTest(TestCase):
-
-    def setUp(self):
-        self.mock_loop = MagicMock()
+from frontend.tests.test_views import (
+    ViewsTestsGeneral,
+    LoopMock,
+)
+
+
+class AndroidTextFieldViewsTest(ViewsTestsGeneral):
 
     def test_create_view_get_context_data(self):
         android_textfield_create_view = AndroidTextFieldLoopCreateView()
@@ -45,7 +44,8 @@
         context = AndroidTextFieldLoopDetailView.get_context_data(
             android_textfield_detail_view)
         self.assertEqual(context['request'], "some request data")
-        self.assertEqual(context['builds'].__class__.__name__, "MagicMock")
+        self.assertEqual(context['builds'].__class__.__name__,
+                         LoopMock.__name__)
 
     def test_update_view_get_context_data(self):
         android_textfield_update_view = AndroidTextFieldLoopUpdateView()
 
=== added directory 'dashboard/frontend/integration_loop/tests'
=== added file 'dashboard/frontend/integration_loop/tests/__init__.py'
--- dashboard/frontend/integration_loop/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/integration_loop/tests/__init__.py	2012-09-14 08:22:19 +0000
@@ -0,0 +1,27 @@
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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 dashboard.frontend.integration_loop.tests.test_integration_loop_views \
+    import *
+from dashboard.frontend.integration_loop.tests.\
+    test_integration_loop_clientresponse import *
+
+
+__test__ = {
+    'IntegrationLoopViewsTest': IntegrationLoopViewsTest,
+    'IntegrationLoopClientresponseTest': IntegrationLoopClientresponseTest,
+}
 \ No newline at end of file
 
=== added file 'dashboard/frontend/integration_loop/tests/test_integration_loop_clientresponse.py'
--- dashboard/frontend/integration_loop/tests/test_integration_loop_clientresponse.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/integration_loop/tests/test_integration_loop_clientresponse.py	2012-09-14 08:22:19 +0000
@@ -0,0 +1,75 @@
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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/>.
+
+import urllib
+from frontend.tests.test_clientresponse import ClientResponseTestsGeneral
+
+
+class IntegrationLoopClientresponseTest(ClientResponseTestsGeneral):
+
+    def setUp(self):
+        super(IntegrationLoopClientresponseTest, self).setUp()
+        self.integration_loop_data = {"name": "testjob",
+                                      "branch": "lp:linaro-ci-dashboard",
+                                      "precommand": "make migrate",
+                                      "command": "make test",
+                                      "next_loop_0": "",
+                                      }
+
+    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",
+                                           "loop_create.html",
+                                           "base.html",
+                                           "login.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, ["loop_detail.html",
+                                           "base.html",
+                                           "login.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)
 \ No newline at end of file
 
=== added file 'dashboard/frontend/integration_loop/tests/test_integration_loop_views.py'
--- dashboard/frontend/integration_loop/tests/test_integration_loop_views.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/integration_loop/tests/test_integration_loop_views.py	2012-09-14 08:22:19 +0000
@@ -0,0 +1,56 @@
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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 frontend.integration_loop.views.integration_loop_create_view \
+    import IntegrationLoopCreateView
+from frontend.integration_loop.views.integration_loop_update_view \
+    import IntegrationLoopUpdateView
+from frontend.integration_loop.views.integration_loop_detail_view \
+    import IntegrationLoopDetailView
+from frontend.tests.test_views import (
+    ViewsTestsGeneral,
+    LoopMock,
+)
+
+
+class IntegrationLoopViewsTest(ViewsTestsGeneral):
+
+    def test_create_view_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")
+
+    def test_detail_view_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__,
+                         LoopMock.__name__)
+
+    def test_update_view_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")
 
=== modified file 'dashboard/frontend/kernel_build/tests/test_kernel_build_views.py'
--- dashboard/frontend/kernel_build/tests/test_kernel_build_views.py	2012-08-23 11:22:21 +0000
+++ dashboard/frontend/kernel_build/tests/test_kernel_build_views.py	2012-09-14 08:22:19 +0000
@@ -14,8 +14,6 @@
 #
 # 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.test import TestCase
-from mock import MagicMock
 
 from frontend.kernel_build.views.kernel_loop_create_view \
     import KernelLoopCreateView
@@ -23,16 +21,13 @@
     import KernelLoopDetailView
 from frontend.kernel_build.views.kernel_loop_update_view\
     import KernelLoopUpdateView
-
-
-class KernelBuildViewsTest(TestCase):
-
-    def setUp(self):
-        self.mock_loop = MagicMock()
-        self.mock_loop.loop_ptr = MagicMock()
-        self.mock_loop.loop_ptr.id = 0
-        self.mock_loop.loop_ptr.loopbuild_set = MagicMock()
-        self.mock_loop.loop_ptr.loopbuild_set.all = MagicMock()
+from frontend.tests.test_views import (
+    ViewsTestsGeneral,
+    LoopMock,
+)
+
+
+class KernelBuildViewsTest(ViewsTestsGeneral):
 
     def test_create_view_get_context_data(self):
         kernel_loop_create_view = KernelLoopCreateView()
@@ -49,7 +44,8 @@
         context = KernelLoopDetailView.get_context_data(
             kernel_loop_detail_view)
         self.assertEqual(context['request'], "some request data")
-        self.assertEqual(context['builds'].__class__.__name__, "MagicMock")
+        self.assertEqual(context['builds'].__class__.__name__,
+                         LoopMock.__name__)
 
     def test_update_view_get_context_data(self):
         kernel_loop_update_view = KernelLoopUpdateView()
 
=== modified file 'dashboard/frontend/tests/__init__.py'
--- dashboard/frontend/tests/__init__.py	2012-09-05 17:32:44 +0000
+++ dashboard/frontend/tests/__init__.py	2012-09-14 08:22:19 +0000
@@ -9,9 +9,6 @@
 __test__ = {
            'HomePageViewTests': HomePageViewTest,
            'IndexViewTests': IndexViewTest,
-           'IntegrationLoopCreateViewTests': IntegrationLoopCreateViewTest,
-           'IntegrationLoopDetailViewTests': IntegrationLoopDetailViewTest,
-           'IntegrationLoopUpdateViewTests': IntegrationLoopUpdateViewTest,
            'LoopTests': LoopTest,
            'ClientResponseTests': ClientResponseTests,
            'JenkinsCommandTest': JenkinsCommandTest,
 
=== added file 'dashboard/frontend/tests/loop_mock.py'
--- dashboard/frontend/tests/loop_mock.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/tests/loop_mock.py	2012-09-14 08:22:19 +0000
@@ -0,0 +1,125 @@
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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 mock import MagicMock
+
+
+class ObjectsMock(MagicMock):
+    """
+    This mock represents the 'objects' queryset of a Django model. It is
+    basically used to mock access like 'MODEL.objects' when looking up
+    a specific model.
+    """
+    def __init__(self, *args, **kwargs):
+        super(ObjectsMock, self).__init__(*args, **kwargs)
+
+    def get(self, *args, **kwargs):
+        return LoopMock()
+
+    def all(self):
+        return [LoopMock()]
+
+
+class LoopMock(MagicMock):
+    """
+    Class that mocks a generic Loop object. This class should be used when it
+    is necessary to pass an actual object.
+    """
+    def __init__(self, *args, **kwargs):
+        super(LoopMock, self).__init__(*args, **kwargs)
+
+    @property
+    def name(self):
+        return self.__class__.__name__
+
+    @property
+    def type(self):
+        return self.__class__.__name__
+
+    @property
+    def is_restricted(self):
+        return False
+
+    @property
+    def is_protected(self):
+        return False
+
+    @property
+    def _meta(self):
+        return MetaMock()
+
+
+class MetaMock(MagicMock):
+    """
+    Mock class that represents the Meta class of a Django model, accessed via
+    the _meta attribute of a model instance.
+    """
+    def __init__(self, *args, **kwargs):
+        super(MetaMock, self).__init__(*args, **kwargs)
+
+    @property
+    def app_label(self):
+        return "label"
+
+    def get_field(self, name=None):
+        """
+        Mocks the get_field method of _meta.
+
+        :param name: The name of the field to get back.
+        :type name str
+        :return A FieldMock object mocking a field.
+        """
+        return FieldMock(name=name)
+
+
+class FieldMock(MagicMock):
+    """
+    Mock class that represents a field in a class model.
+    """
+    def __init__(self, name=None, verbose_name=None, *args, **kwargs):
+        """
+        Initialized the field mock. By default, if passed with no arguments,
+        the field name and verbose name will be set to the class name.
+
+        :param name: The name associated with this field.
+        :type name str
+        :param verbose_name: The verbose name associated with this field.
+        :type verbose_name str
+        """
+        super(FieldMock, self).__init__(*args, **kwargs)
+        if name is not None:
+            self._name = name
+        else:
+            self._name = self.__class__.__name__
+        if verbose_name is not None:
+            self._verbose_name = verbose_name
+        else:
+            self._verbose_name = self.__class__.__name__
+
+    @property
+    def name(self):
+        """
+        :return The name of the field.
+        """
+        return self._name
+
+    @property
+    def verbose_name(self):
+        """
+        :return The verbose name associated with the field.
+        """
+        return self._verbose_name
 
=== modified file 'dashboard/frontend/tests/test_clientresponse.py'
--- dashboard/frontend/tests/test_clientresponse.py	2012-09-12 13:15:13 +0000
+++ dashboard/frontend/tests/test_clientresponse.py	2012-09-14 08:22:19 +0000
@@ -19,7 +19,6 @@
 from django.test import TestCase
 from django.contrib.auth.models import User, Group
 from django.test.client import Client
-import urllib
 
 
 class ClientResponseTestsGeneral(TestCase):
@@ -44,15 +43,6 @@
 
 class ClientResponseTests(ClientResponseTestsGeneral):
 
-    def setUp(self):
-        super(ClientResponseTests, self).setUp()
-        self.integration_loop_data = {"name": "testjob",
-                                      "branch": "lp:linaro-ci-dashboard",
-                                      "precommand": "make migrate",
-                                      "command": "make test",
-                                      "next_loop_0": "",
-                                      }
-
     # Test case should fail if the login_required decorator source code
     # in index_view.py is removed.
     def test_response_index_when_user_not_auth_by_login_required(self):
@@ -74,47 +64,3 @@
         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",
-                                           "loop_create.html",
-                                           "base.html",
-                                           "login.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, ["loop_detail.html",
-                                           "base.html",
-                                           "login.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_views.py'
--- dashboard/frontend/tests/test_views.py	2012-08-16 15:38:48 +0000
+++ dashboard/frontend/tests/test_views.py	2012-09-14 08:22:19 +0000
@@ -15,17 +15,25 @@
 #
 # 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.test import TestCase
-from mock import Mock, patch
 
 from frontend.views.home_page_view import HomePageView
 from frontend.views.index_view import IndexView
-from frontend.integration_loop.views.integration_loop_create_view \
-    import IntegrationLoopCreateView
-from frontend.integration_loop.views.integration_loop_update_view \
-    import IntegrationLoopUpdateView
-from frontend.integration_loop.views.integration_loop_detail_view \
-    import IntegrationLoopDetailView
+from frontend.tests.loop_mock import (
+    ObjectsMock,
+    LoopMock,
+)
+from frontend.models.loop import Loop
+
+
+class ViewsTestsGeneral(TestCase):
+    def setUp(self):
+        self.mock_loop = LoopMock()
+        Loop.objects = ObjectsMock()
+
+    def tearDown(self):
+        super(ViewsTestsGeneral, self).tearDown()
 
 
 class HomePageViewTest(TestCase):
@@ -44,49 +52,3 @@
         index_view.request = "some request data"
         context = IndexView.get_context_data(index_view)
         self.assertEqual(context['request'], "some request data")
-
-
-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")
 
=== modified file 'dashboard/frontend/views/loop_detail_view.py'
--- dashboard/frontend/views/loop_detail_view.py	2012-09-12 14:31:41 +0000
+++ dashboard/frontend/views/loop_detail_view.py	2012-09-14 08:22:19 +0000
@@ -55,9 +55,7 @@
         field = self.object._meta.get_field('next_loop')
         pk = self.object.next_loop_id
         verbose_name = field.verbose_name.capitalize()
-        # XXX changed to isinstance, since tests were failing: we need to
-        # mock Loop, not the model variable, in a better way in our tests.
-        if isinstance(pk, int):
+        if pk is not None:
             # Get the pointer to the object we want to retrieve, and retrieve
             # the actual instance. We can do this since all our loops inherits
             # from the same base class (Loop), and we have the information