mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'tests' into search-changes

pull/89/head
Karl Hobley 2014-02-23 20:46:40 +00:00
rodzic d53347abcd c981e33367
commit c8ae17b84c
11 zmienionych plików z 78 dodań i 54 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

34
.coveragerc 100644
Wyświetl plik

@ -0,0 +1,34 @@
# .coveragerc to control coverage.py
[run]
branch = True
source = wagtail
omit =
*/migrations/*
wagtail/vendor/*
[report]
# Regexes for lines to exclude from consideration
exclude_lines =
# Have to re-enable the standard pragma
pragma: no cover
# Don't complain about missing debug-only code:
def __repr__
if self\.debug
# Don't complain if tests don't hit defensive assertion code:
raise AssertionError
raise NotImplementedError
return NotImplemented
# Don't complain if non-runnable code isn't run:
if 0:
if __name__ == .__main__.:
ignore_errors = True
[html]
directory = coverage_html_report

2
.travis.yml
Wyświetl plik

@ -19,7 +19,7 @@ before_script:
- psql -c 'create database wagtaildemo;' -U postgres
# Run the tests
script:
coverage run --source=wagtail --omit=*/migrations/*,*/vendor/* runtests.py
coverage run runtests.py
after_success:
coveralls
# Who to notify about build results

5
wagtail/tests/utils.py
Wyświetl plik

@ -1,11 +1,6 @@
from wagtail.wagtailcore.models import Site
from django.contrib.auth.models import User
def get_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')

26
wagtail/wagtailadmin/tests.py
Wyświetl plik

@ -1,7 +1,7 @@
from django.test import TestCase
import unittest
from wagtail.tests.models import EventPage
from wagtail.tests.utils import login, get_host
from wagtail.tests.utils import login
from wagtail.wagtailcore.models import Page
from django.core.urlresolvers import reverse
@ -21,7 +21,7 @@ class TestPageExplorer(TestCase):
login(self.client)
def test_explore(self):
response = self.client.get(reverse('wagtailadmin_explore', args=(self.root_page.id, )), HTTP_HOST=get_host())
response = self.client.get(reverse('wagtailadmin_explore', args=(self.root_page.id, )))
self.assertEqual(response.status_code, 200)
self.assertEqual(self.root_page, response.context['parent_page'])
self.assertTrue(response.context['pages'].filter(id=self.child_page.id).exists())
@ -36,41 +36,41 @@ class TestPageCreation(TestCase):
login(self.client)
def test_select_type(self):
response = self.client.get(reverse('wagtailadmin_pages_select_type'), HTTP_HOST=get_host())
response = self.client.get(reverse('wagtailadmin_pages_select_type'))
self.assertEqual(response.status_code, 200)
@unittest.expectedFailure # For some reason, this returns a 302...
def test_select_location_testpage(self):
response = self.client.get(reverse('wagtailadmin_pages_select_location', args=('tests', 'eventpage')), HTTP_HOST=get_host())
response = self.client.get(reverse('wagtailadmin_pages_select_location', args=('tests', 'eventpage')))
self.assertEqual(response.status_code, 200)
def test_select_location_nonexistanttype(self):
response = self.client.get(reverse('wagtailadmin_pages_select_location', args=('notanapp', 'notamodel')), HTTP_HOST=get_host())
response = self.client.get(reverse('wagtailadmin_pages_select_location', args=('notanapp', 'notamodel')))
self.assertEqual(response.status_code, 404)
def test_select_location_nonpagetype(self):
response = self.client.get(reverse('wagtailadmin_pages_select_location', args=('wagtailimages', 'image')), HTTP_HOST=get_host())
response = self.client.get(reverse('wagtailadmin_pages_select_location', args=('wagtailimages', 'image')))
self.assertEqual(response.status_code, 404)
def test_add_subpage_root(self):
response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.root_page.id, )), HTTP_HOST=get_host())
response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.root_page.id, )))
self.assertEqual(response.status_code, 200)
def test_add_subpage_nonexistant(self):
response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(100000, )), HTTP_HOST=get_host())
response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(100000, )))
self.assertEqual(response.status_code, 404)
def test_create_testpage_root(self):
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'eventpage', self.root_page.id)), HTTP_HOST=get_host())
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'eventpage', self.root_page.id)))
self.assertEqual(response.status_code, 200)
def test_create_testpage_nonexistantparent(self):
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'testpage', 100000)), HTTP_HOST=get_host())
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'testpage', 100000)))
self.assertEqual(response.status_code, 404)
@unittest.expectedFailure # FIXME: Crashes!
def test_create_nonpagetype(self):
response = self.client.get(reverse('wagtailadmin_pages_create', args=('wagtailimages', 'image', self.root_page.id)), HTTP_HOST=get_host())
response = self.client.get(reverse('wagtailadmin_pages_create', args=('wagtailimages', 'image', self.root_page.id)))
self.assertEqual(response.status_code, 404)
@ -89,11 +89,11 @@ class TestPageEditDelete(TestCase):
login(self.client)
def test_edit(self):
response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), HTTP_HOST=get_host())
response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )))
self.assertEqual(response.status_code, 200)
def test_delete(self):
response = self.client.get(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )), HTTP_HOST=get_host())
response = self.client.get(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )))
self.assertEqual(response.status_code, 200)

16
wagtail/wagtaildocs/tests.py
Wyświetl plik

@ -1,6 +1,6 @@
from django.test import TestCase
from wagtail.wagtaildocs import models
from wagtail.tests.utils import login, get_host
from wagtail.tests.utils import login
from django.contrib.auth.models import User, Group, Permission
from django.core.urlresolvers import reverse
@ -43,7 +43,7 @@ class TestDocumentIndexView(TestCase):
login(self.client)
def get(self, params={}):
return self.client.get(reverse('wagtaildocs_index'), params, HTTP_HOST=get_host())
return self.client.get(reverse('wagtaildocs_index'), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)
@ -71,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_host())
return self.client.get(reverse('wagtaildocs_add_document'), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)
@ -85,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_host())
return self.client.get(reverse('wagtaildocs_edit_document', args=(self.document.id,)), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)
@ -99,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_host())
return self.client.get(reverse('wagtaildocs_delete_document', args=(self.document.id,)), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)
@ -110,7 +110,7 @@ class TestDocumentChooserView(TestCase):
login(self.client)
def get(self, params={}):
return self.client.get(reverse('wagtaildocs_chooser'), params, HTTP_HOST=get_host())
return self.client.get(reverse('wagtaildocs_chooser'), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)
@ -135,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_host())
return self.client.get(reverse('wagtaildocs_document_chosen', args=(self.document.id,)), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)
@ -146,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_host())
return self.client.get(reverse('wagtaildocs_chooser_upload'), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)

4
wagtail/wagtailembeds/tests.py
Wyświetl plik

@ -1,6 +1,6 @@
from django.test import TestCase
from django.test.client import Client
from wagtail.tests.utils import login, get_host
from wagtail.tests.utils import login
from wagtail.wagtailembeds import get_embed
@ -52,7 +52,7 @@ class TestChooser(TestCase):
login(self.client)
def test_chooser(self):
r = self.client.get('/admin/embeds/chooser/', HTTP_HOST=get_host())
r = self.client.get('/admin/embeds/chooser/')
self.assertEqual(r.status_code, 200)
# TODO: Test submitting

18
wagtail/wagtailimages/tests.py
Wyświetl plik

@ -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.tests.utils import login, get_host
from wagtail.tests.utils import login
from wagtail.wagtailimages.models import get_image_model
from wagtail.wagtailimages.templatetags import image_tags
@ -45,7 +45,7 @@ class TestImagePermissions(TestCase):
self.editor.groups.add(Group.objects.get(name='Editors'))
self.administrator = User.objects.create_superuser(username='administrator', email='administrator@email.com', password='password')
# Owner user must have the add_document permission
# Owner user must have the add_image permission
self.owner.user_permissions.add(Permission.objects.get(codename='add_image'))
# Create an image for running tests on
@ -136,7 +136,7 @@ class TestImageIndexView(TestCase):
login(self.client)
def get(self, params={}):
return self.client.get(reverse('wagtailimages_index'), params, HTTP_HOST=get_host())
return self.client.get(reverse('wagtailimages_index'), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)
@ -164,7 +164,7 @@ class TestImageAddView(TestCase):
login(self.client)
def get(self, params={}):
return self.client.get(reverse('wagtailimages_add_image'), params, HTTP_HOST=get_host())
return self.client.get(reverse('wagtailimages_add_image'), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)
@ -181,7 +181,7 @@ class TestImageEditView(TestCase):
)
def get(self, params={}):
return self.client.get(reverse('wagtailimages_edit_image', args=(self.image.id,)), params, HTTP_HOST=get_host())
return self.client.get(reverse('wagtailimages_edit_image', args=(self.image.id,)), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)
@ -198,7 +198,7 @@ class TestImageDeleteView(TestCase):
)
def get(self, params={}):
return self.client.get(reverse('wagtailimages_delete_image', args=(self.image.id,)), params, HTTP_HOST=get_host())
return self.client.get(reverse('wagtailimages_delete_image', args=(self.image.id,)), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)
@ -209,7 +209,7 @@ class TestImageChooserView(TestCase):
login(self.client)
def get(self, params={}):
return self.client.get(reverse('wagtailimages_chooser'), params, HTTP_HOST=get_host())
return self.client.get(reverse('wagtailimages_chooser'), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)
@ -237,7 +237,7 @@ class TestImageChooserChosenView(TestCase):
)
def get(self, params={}):
return self.client.get(reverse('wagtailimages_image_chosen', args=(self.image.id,)), params, HTTP_HOST=get_host())
return self.client.get(reverse('wagtailimages_image_chosen', args=(self.image.id,)), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)
@ -248,7 +248,7 @@ class TestImageChooserUploadView(TestCase):
login(self.client)
def get(self, params={}):
return self.client.get(reverse('wagtailimages_chooser_upload'), params, HTTP_HOST=get_host())
return self.client.get(reverse('wagtailimages_chooser_upload'), params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)

8
wagtail/wagtailredirects/tests.py
Wyświetl plik

@ -8,10 +8,6 @@ def get_default_site():
return Site.objects.filter(is_default_site=True).first()
def get_default_host():
return get_default_site().root_url.split('://')[1]
class TestRedirects(TestCase):
def test_path_normalisation(self):
# Shortcut to normalise function (to keep things tidy)
@ -51,7 +47,7 @@ class TestRedirects(TestCase):
redirect.save()
# Navigate to it
r = c.get('/redirectme/', HTTP_HOST=get_default_host())
r = c.get('/redirectme/')
# Check that we were redirected
self.assertEqual(r.status_code, 301)
@ -66,7 +62,7 @@ class TestRedirects(TestCase):
redirect.save()
# Navigate to it
r = c.get('/redirectme/', HTTP_HOST=get_default_host())
r = c.get('/redirectme/')
# Check that we were redirected temporarily
self.assertEqual(r.status_code, 302)

10
wagtail/wagtailsearch/tests/test_editorspicks.py
Wyświetl plik

@ -1,5 +1,5 @@
from django.test import TestCase
from wagtail.tests.utils import login, get_host
from wagtail.tests.utils import login
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_host())
return self.client.get('/admin/search/editorspicks/', params)
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_host())
return self.client.get('/admin/search/editorspicks/add/', params)
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_host())
return self.client.get('/admin/search/editorspicks/' + str(self.query.id) + '/', params)
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_host())
return self.client.get('/admin/search/editorspicks/' + str(self.query.id) + '/delete/', params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)

5
wagtail/wagtailsearch/tests/test_frontend.py
Wyświetl plik

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

4
wagtail/wagtailsearch/tests/test_queries.py
Wyświetl plik

@ -1,7 +1,7 @@
from django.test import TestCase
from django.core import management
from wagtail.wagtailsearch import models
from wagtail.tests.utils import login, get_host
from wagtail.tests.utils import login
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_host())
return self.client.get('/admin/search/queries/chooser/', params)
def test_status_code(self):
self.assertEqual(self.get().status_code, 200)