Added test utils

wagtail/tests/utils.py

@@ -2,7 +2,7 @@ from wagtail.wagtailcore.models import Site
 from django.contrib.auth.models import User
 
 
-def get_default_host():
+def get_host():
     return Site.objects.filter(is_default_site=True).first().root_url.split('://')[1]
 
 
@@ -11,4 +11,4 @@ def login(client):
     User.objects.create_superuser(username='test', email='test@email.com', password='password')
 
     # Login
-    client.login(username='test', password='password')
+    client.login(username='test', password='password')

wagtail/wagtaildocs/tests.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 from wagtail.wagtaildocs import models
-from wagtail.wagtailcore.models import Site
+from wagtail.tests.utils import login, get_host
 from django.contrib.auth.models import User, Group, Permission
 from django.core.urlresolvers import reverse
 
@@ -37,24 +37,13 @@ class TestDocumentPermissions(TestCase):
 
 ## ===== ADMIN VIEWS =====
 
-def get_default_host():
-    return Site.objects.filter(is_default_site=True).first().root_url.split('://')[1]
-
-
-def login(client):
-    # Create a user
-    User.objects.create_superuser(username='test', email='test@email.com', password='password')
-
-    # Login
-    client.login(username='test', password='password')
-
 
 class TestDocumentIndexView(TestCase):
     def setUp(self):
         login(self.client)
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_index'), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtaildocs_index'), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -82,7 +71,7 @@ class TestDocumentAddView(TestCase):
         login(self.client)
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_add_document'), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtaildocs_add_document'), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -96,7 +85,7 @@ class TestDocumentEditView(TestCase):
         self.document = models.Document.objects.create(title="Test document")
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_edit_document', args=(self.document.id,)), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtaildocs_edit_document', args=(self.document.id,)), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -110,7 +99,7 @@ class TestDocumentDeleteView(TestCase):
         self.document = models.Document.objects.create(title="Test document")
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_delete_document', args=(self.document.id,)), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtaildocs_delete_document', args=(self.document.id,)), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -121,7 +110,7 @@ class TestDocumentChooserView(TestCase):
         login(self.client)
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_chooser'), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtaildocs_chooser'), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -146,7 +135,7 @@ class TestDocumentChooserChosenView(TestCase):
         self.document = models.Document.objects.create(title="Test document")
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_document_chosen', args=(self.document.id,)), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtaildocs_document_chosen', args=(self.document.id,)), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -157,7 +146,7 @@ class TestDocumentChooserUploadView(TestCase):
         login(self.client)
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtaildocs_chooser_upload'), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtaildocs_chooser_upload'), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)

wagtail/wagtailembeds/tests.py

@@ -1,5 +1,6 @@
 from django.test import TestCase
 from django.test.client import Client
+from wagtail.tests.utils import login, get_host
 from wagtail.wagtailembeds import get_embed
 
 
@@ -45,24 +46,13 @@ class TestEmbeds(TestCase):
         }
 
 
-def get_default_host():
-    from wagtail.wagtailcore.models import Site
-    return Site.objects.filter(is_default_site=True).first().root_url.split('://')[1]
-
-
 class TestChooser(TestCase):
     def setUp(self):
-        # Create a user
+        # login
-        from django.contrib.auth.models import User
+        login(self.client)
-        User.objects.create_superuser(username='test', email='test@email.com', password='password')
-
-        # Setup client
-        self.c = Client()
-        login = self.c.login(username='test', password='password')
-        self.assertEqual(login, True)
 
     def test_chooser(self):
-        r = self.c.get('/admin/embeds/chooser/', HTTP_HOST=get_default_host())
+        r = self.client.get('/admin/embeds/chooser/', HTTP_HOST=get_host())
         self.assertEqual(r.status_code, 200)
 
         # TODO: Test submitting

wagtail/wagtailimages/tests.py

@@ -2,7 +2,7 @@ from django.test import TestCase
 from django import template
 from django.contrib.auth.models import User, Group, Permission
 from django.core.urlresolvers import reverse
-from wagtail.wagtailcore.models import Site
+from wagtail.tests.utils import login, get_host
 from wagtail.wagtailimages.models import get_image_model
 from wagtail.wagtailimages.templatetags import image_tags
 
@@ -123,24 +123,13 @@ class TestImageTag(TestCase):
 
 ## ===== ADMIN VIEWS =====
 
-def get_default_host():
-    return Site.objects.filter(is_default_site=True).first().root_url.split('://')[1]
-
-
-def login(client):
-    # Create a user
-    User.objects.create_superuser(username='test', email='test@email.com', password='password')
-
-    # Login
-    client.login(username='test', password='password')
-
 
 class TestImageIndexView(TestCase):
     def setUp(self):
         login(self.client)
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtailimages_index'), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtailimages_index'), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -168,7 +157,7 @@ class TestImageAddView(TestCase):
         login(self.client)
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtailimages_add_image'), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtailimages_add_image'), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -185,7 +174,7 @@ class TestImageEditView(TestCase):
         )
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtailimages_edit_image', args=(self.image.id,)), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtailimages_edit_image', args=(self.image.id,)), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -202,7 +191,7 @@ class TestImageDeleteView(TestCase):
         )
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtailimages_delete_image', args=(self.image.id,)), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtailimages_delete_image', args=(self.image.id,)), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -213,7 +202,7 @@ class TestImageChooserView(TestCase):
         login(self.client)
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtailimages_chooser'), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtailimages_chooser'), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -241,7 +230,7 @@ class TestImageChooserChosenView(TestCase):
         )
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtailimages_image_chosen', args=(self.image.id,)), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtailimages_image_chosen', args=(self.image.id,)), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -252,7 +241,7 @@ class TestImageChooserUploadView(TestCase):
         login(self.client)
 
     def get(self, params={}):
-        return self.client.get(reverse('wagtailimages_chooser_upload'), params, HTTP_HOST=get_default_host())
+        return self.client.get(reverse('wagtailimages_chooser_upload'), params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)

wagtail/wagtailsearch/tests/test_editorspicks.py

@@ -1,5 +1,5 @@
 from django.test import TestCase
-from .utils import get_default_host, login
+from wagtail.tests.utils import login, get_host
 from wagtail.wagtailsearch import models
 
 
@@ -50,7 +50,7 @@ class TestEditorsPicksIndexView(TestCase):
         login(self.client)
 
     def get(self, params={}):
-        return self.client.get('/admin/search/editorspicks/', params, HTTP_HOST=get_default_host())
+        return self.client.get('/admin/search/editorspicks/', params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -72,7 +72,7 @@ class TestEditorsPicksAddView(TestCase):
         login(self.client)
 
     def get(self, params={}):
-        return self.client.get('/admin/search/editorspicks/add/', params, HTTP_HOST=get_default_host())
+        return self.client.get('/admin/search/editorspicks/add/', params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -87,7 +87,7 @@ class TestEditorsPicksEditView(TestCase):
         self.query.editors_picks.create(page_id=1, description="Root page")
 
     def get(self, params={}):
-        return self.client.get('/admin/search/editorspicks/' + str(self.query.id) + '/', params, HTTP_HOST=get_default_host())
+        return self.client.get('/admin/search/editorspicks/' + str(self.query.id) + '/', params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -102,7 +102,7 @@ class TestEditorsPicksDeleteView(TestCase):
         self.query.editors_picks.create(page_id=1, description="Root page")
 
     def get(self, params={}):
-        return self.client.get('/admin/search/editorspicks/' + str(self.query.id) + '/delete/', params, HTTP_HOST=get_default_host())
+        return self.client.get('/admin/search/editorspicks/' + str(self.query.id) + '/delete/', params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)

wagtail/wagtailsearch/tests/test_frontend.py

@@ -1,10 +1,10 @@
 from django.test import TestCase
-from .utils import get_default_host
+from wagtail.tests.utils import get_host
 
 
 class TestSearchView(TestCase):
     def get(self, params={}):
-        return self.client.get('/search/', params, HTTP_HOST=get_default_host())
+        return self.client.get('/search/', params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)
@@ -23,7 +23,7 @@ class TestSearchView(TestCase):
 
 class TestSuggestionsView(TestCase):
     def get(self, params={}):
-        return self.client.get('/search/suggest/', params, HTTP_HOST=get_default_host())
+        return self.client.get('/search/suggest/', params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)

wagtail/wagtailsearch/tests/test_queries.py

@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.core import management
 from wagtail.wagtailsearch import models
-from .utils import get_default_host, login
+from wagtail.tests.utils import login, get_host
 from StringIO import StringIO
 import unittest
 
@@ -145,7 +145,7 @@ class TestQueryChooserView(TestCase):
         login(self.client)
 
     def get(self, params={}):
-        return self.client.get('/admin/search/queries/chooser/', params, HTTP_HOST=get_default_host())
+        return self.client.get('/admin/search/queries/chooser/', params, HTTP_HOST=get_host())
 
     def test_status_code(self):
         self.assertEqual(self.get().status_code, 200)