Load site within tests.

stephenmcd · Feb 28, 2012 · ab2aace · ab2aace
1 parent 69555d3
commit ab2aace
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/forms_builder/forms/tests.py b/forms_builder/forms/tests.py
@@ -13,13 +13,11 @@
 from forms_builder.forms.signals import form_invalid, form_valid
 
 
-current_site = None
-if USE_SITES:
-    current_site = Site.objects.get_current()
-
-
 class Tests(TestCase):
 
+    def setUp(self):
+        self._site = Site.objects.get_current()
+
     def test_form_fields(self):
         """
         Simple 200 status check against rendering and posting to forms with
@@ -28,7 +26,7 @@ def test_form_fields(self):
         for required in (True, False):
             form = Form.objects.create(title="Test", status=STATUS_PUBLISHED)
             if USE_SITES:
-                form.sites.add(current_site)
+                form.sites.add(self._site)
                 form.save()
             for (field, _) in NAMES:
                 form.fields.create(label=field, field_type=field,
@@ -51,7 +49,7 @@ def test_draft_form(self):
         self.client.logout()
         draft = Form.objects.create(title="Draft", status=STATUS_DRAFT)
         if USE_SITES:
-            draft.sites.add(current_site)
+            draft.sites.add(self._site)
             draft.save()
         response = self.client.get(draft.get_absolute_url())
         self.assertEqual(response.status_code, 404)
@@ -70,7 +68,7 @@ def test_form_signals(self):
         form_valid.connect(valid)
         form = Form.objects.create(title="Signals", status=STATUS_PUBLISHED)
         if USE_SITES:
-            form.sites.add(current_site)
+            form.sites.add(self._site)
             form.save()
         form.fields.create(label="field", field_type=NAMES[0][0],
                            required=True, visible=True)