Merge "Drop mox3 from TemplateVersionsTests"

heat_dashboard/test/helpers.py

@@ -44,6 +44,7 @@ from horizon.test import helpers as horizon_helpers
 
 from openstack_dashboard import api as project_api
 from openstack_dashboard import context_processors
+from openstack_dashboard.test import helpers
 
 from heat_dashboard import api
 from heat_dashboard.test.test_data import utils as test_utils
@@ -51,6 +52,12 @@ from heat_dashboard.test.test_data import utils as test_utils
 # Makes output of failing mox tests much easier to read.
 wsgi.WSGIRequest.__repr__ = lambda self: "<class 'django.http.HttpRequest'>"
 
+# Shortcuts to avoid importing openstack_dashboard.test.helper and
+# for backwards compatibility.
+create_mocks = helpers.create_mocks
+IsA = helpers.IsA
+IsHttpRequest = helpers.IsHttpRequest
+
 
 def create_stubs(stubs_to_create=None):
     """decorator to simplify setting up multiple stubs at once via mox

heat_dashboard/test/settings.py

@@ -15,6 +15,7 @@
 import heat_dashboard.enabled
 import openstack_dashboard.enabled
 
+import openstack_dashboard.enabled  # noqa: F811
 from openstack_dashboard.test.settings import *  # noqa: F403,H303
 
 from openstack_dashboard.utils import settings

heat_dashboard/test/tests/content/test_template_versions.py

@@ -12,70 +12,70 @@
 # limitations under the License.
 
 from django.core.urlresolvers import reverse
-from django import http
-
-from mox3.mox import IsA
 
 from heat_dashboard import api
 from heat_dashboard.test import helpers as test
+from heat_dashboard.test.helpers import IsHttpRequest
 
 
 class TemplateVersionsTests(test.TestCase):
 
     INDEX_URL = reverse('horizon:project:template_versions:index')
 
-    @test.create_stubs({api.heat: ('template_version_list',)})
+    @test.create_mocks({api.heat: ('template_version_list',)})
     def test_index(self):
-        api.heat.template_version_list(
+        self.mock_template_version_list.return_value = \
-            IsA(http.HttpRequest)).AndReturn(self.template_versions.list())
+            self.template_versions.list()
-        self.mox.ReplayAll()
 
         res = self.client.get(self.INDEX_URL)
+        self.mock_template_version_list.assert_called_once_with(
+            IsHttpRequest())
         self.assertTemplateUsed(
             res, 'project/template_versions/index.html')
         self.assertContains(res, 'HeatTemplateFormatVersion.2012-12-12')
 
-    @test.create_stubs({api.heat: ('template_version_list',)})
+    @test.create_mocks({api.heat: ('template_version_list',)})
     def test_index_exception(self):
-        api.heat.template_version_list(
+        self.mock_template_version_list.side_effect = \
-            IsA(http.HttpRequest)).AndRaise(self.exceptions.heat)
+            self.exceptions.heat
-        self.mox.ReplayAll()
 
         res = self.client.get(self.INDEX_URL)
+        self.mock_template_version_list.assert_called_once_with(
+            IsHttpRequest())
         self.assertTemplateUsed(
             res, 'project/template_versions/index.html')
         self.assertEqual(len(res.context['table'].data), 0)
         self.assertMessageCount(res, error=1)
 
-    @test.create_stubs({api.heat: ('template_function_list',)})
+    @test.create_mocks({api.heat: ('template_function_list',)})
     def test_detail_view(self):
         t_version = self.template_versions.first().version
         t_functions = self.template_functions.list()
 
-        api.heat.template_function_list(
+        self.mock_template_function_list.return_value = t_functions
-            IsA(http.HttpRequest), t_version).AndReturn(t_functions)
-        self.mox.ReplayAll()
 
         url = reverse('horizon:project:template_versions:details',
                       args=[t_version])
         res = self.client.get(url)
 
+        self.mock_template_function_list.assert_called_once_with(
+            IsHttpRequest(), t_version)
         self.assertTemplateUsed(res, 'horizon/common/_detail.html')
         self.assertNoMessages()
 
-    @test.create_stubs({api.heat: ('template_function_list',)})
+    @test.create_mocks({api.heat: ('template_function_list',)})
     def test_detail_view_with_exception(self):
         t_version = self.template_versions.first().version
 
-        api.heat.template_function_list(
+        self.mock_template_function_list.side_effect = \
-            IsA(http.HttpRequest), t_version).\
+            self.exceptions.heat
-            AndRaise(self.exceptions.heat)
-        self.mox.ReplayAll()
 
         url = reverse('horizon:project:template_versions:details',
                       args=[t_version])
         res = self.client.get(url)
 
+        self.mock_template_function_list.assert_called_once_with(
+            IsHttpRequest(), t_version)
         self.assertTemplateUsed(res, 'horizon/common/_detail.html')
         self.assertEqual(len(res.context['table'].data), 0)
         self.assertMessageCount(res, error=1)