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

Update branch, resolve conflicts, clean up

pull/5673/head
timothy@bttrcode 2019-11-03 02:30:00 +01:00
rodzic 6188742cfe
commit cbb5575fd8
13 zmienionych plików z 24 dodań i 9596 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
Pipfile
Wyświetl plik

@ -1,11 +0,0 @@
[[source]]
url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"
[packages]
[dev-packages]
[requires]
python_version = "3.7"

20
Pipfile.lock wygenerowano
Wyświetl plik

@ -1,20 +0,0 @@
{
"_meta": {
"hash": {
"sha256": "9b158f59346fab13c200408cd833a6470dc93b1e3eb4a977d2153bc3325856fd"
},
"pipfile-spec": 6,
"requires": {
"python_version": "3.7"
},
"sources": [
{
"name": "pypi",
"url": "https://pypi.python.org/simple",
"verify_ssl": true
}
]
},
"default": {},
"develop": {}
}

2
wagtail/admin/tests/pages/test_edit_page.py
Wyświetl plik

@ -717,7 +717,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
# Check that the correct site object has been selected by the site middleware
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'tests/simple_page.html')
self.assertEqual(response.context['request'].site.hostname, 'childpage.example.com')
self.assertEqual(Site.find_for_request(response.context['request']).hostname, 'childpage.example.com')
def test_editor_picks_up_direct_model_edits(self):
# If a page has no draft edits, the editor should show the version from the live database

3
wagtail/admin/tests/test_jinja2.py
Wyświetl plik

@ -30,8 +30,7 @@ class TestCoreJinja(TestCase):
site = Site.objects.get(is_default_site=True)
request = HttpRequest()
request.META['HTTP_HOST'] = site.hostname
request.META['SERVER_PORT'] = site.port
request._wagtail_site = site
request.user = user or AnonymousUser()
return request

2
wagtail/admin/tests/test_userbar.py
Wyświetl plik

@ -12,7 +12,6 @@ from wagtail.tests.utils import WagtailTestUtils
class TestUserbarTag(TestCase):
def setUp(self):
self.user = get_user_model().objects.create_superuser(
username='test',
email='test@email.com',
@ -25,7 +24,6 @@ class TestUserbarTag(TestCase):
request.user = user or AnonymousUser()
return request
def test_userbar_tag(self):
template = Template("{% load wagtailuserbar %}{% wagtailuserbar %}")
content = template.render(Context({

14
wagtail/contrib/routable_page/tests.py
Wyświetl plik

@ -1,6 +1,6 @@
from unittest import mock
from django.test import RequestFactory, TestCase, override_settings
from django.test import RequestFactory, TestCase
from django.urls.exceptions import NoReverseMatch
from wagtail.contrib.routable_page.templatetags.wagtailroutablepage_tags import routablepageurl
@ -150,7 +150,6 @@ class TestRoutablePage(TestCase):
class TestRoutablePageTemplateTag(TestCase):
def setUp(self):
self.home_page = Page.objects.get(id=2)
self.routable_page = self.home_page.add_child(instance=RoutablePageTest(
@ -160,9 +159,6 @@ class TestRoutablePageTemplateTag(TestCase):
self.rf = RequestFactory()
self.request = self.rf.get(self.routable_page.url)
site = Site.find_for_request(self.request)
self.request.META['HTTP_HOST'] = site.hostname
self.request.META['SERVER_PORT'] = site.port
self.context = {'request': self.request}
def test_templatetag_reverse_index_route(self):
@ -218,10 +214,10 @@ class TestRoutablePageTemplateTagForSecondSiteAtSameRoot(TestCase):
self.rf = RequestFactory()
self.request = self.rf.get(self.routable_page.url)
self.request.site = Site.find_for_request(self.request)
self.request._wagtail_site = Site.find_for_request(self.request)
self.context = {'request': self.request}
self.request.site = second_site
self.request._wagtail_site = second_site
def test_templatetag_reverse_index_route(self):
url = routablepageurl(self.context, self.routable_page,
@ -255,7 +251,6 @@ class TestRoutablePageTemplateTagForSecondSiteAtSameRoot(TestCase):
self.assertEqual(url, expected)
@override_settings(ALLOWED_HOSTS=['events.local'])
class TestRoutablePageTemplateTagForSecondSiteAtDifferentRoot(TestCase):
"""
When multiple sites exist, relative URLs between such sites should include the domain portion
@ -280,8 +275,7 @@ class TestRoutablePageTemplateTagForSecondSiteAtDifferentRoot(TestCase):
self.request = self.rf.get(self.routable_page.url)
self.context = {'request': self.request}
self.request.META['HTTP_HOST'] = second_site.hostname
self.request.META['SERVER_PORT'] = second_site.port
self.request._wagtail_site = second_site
def test_templatetag_reverse_index_route(self):

16
wagtail/contrib/settings/tests/test_templates.py
Wyświetl plik

@ -1,6 +1,6 @@
from django.http import HttpRequest
from django.template import Context, RequestContext, Template, engines
from django.test import TestCase, override_settings
from django.test import TestCase
from wagtail.core.models import Page, Site
from wagtail.tests.testapp.models import TestSetting
@ -29,10 +29,8 @@ class TemplateTestCase(TestCase, WagtailTestUtils):
def get_request(self, site=None):
if site is None:
site = self.default_site
request = HttpRequest()
request.META['HTTP_HOST'] = site.hostname
request.META['SERVER_PORT'] = site.port
request._wagtail_site = site
return request
def render(self, request, string, context=None, site=None):
@ -50,7 +48,6 @@ class TestContextProcessor(TemplateTestCase):
self.render(request, '{{ settings.tests.TestSetting.title }}'),
self.test_setting.title)
@override_settings(ALLOWED_HOSTS=['localhost', 'other'])
def test_multisite(self):
""" Check that the correct setting for the current site is returned """
request = self.get_request(site=self.default_site)
@ -104,7 +101,6 @@ class TestTemplateTag(TemplateTestCase):
context = Context()
self.assertEqual(template.render(context), '')
@override_settings(ALLOWED_HOSTS=['localhost', 'other'])
def test_get_settings_request_context(self):
""" Check that the {% get_settings %} tag works """
request = self.get_request(site=self.other_site)
@ -177,10 +173,8 @@ class TestSettingsJinja(TemplateTestCase):
site = context['site']
else:
site = Site.objects.get(is_default_site=True)
request = HttpRequest()
request.META['HTTP_HOST'] = site.hostname
request.META['SERVER_PORT'] = site.port
request._wagtail_site = site
context['request'] = request
template = self.engine.from_string(string)
@ -192,7 +186,6 @@ class TestSettingsJinja(TemplateTestCase):
self.render('{{ settings("tests.TestSetting").title }}'),
self.test_setting.title)
@override_settings(ALLOWED_HOSTS=['localhost', 'other'])
def test_multisite(self):
""" Check that the correct setting for the current site is returned """
context = {'site': self.default_site}
@ -228,8 +221,7 @@ class TestSettingsJinja(TemplateTestCase):
# site, dummy request
site = Site.objects.get(is_default_site=True)
request = HttpRequest()
request.META['HTTP_HOST'] = site.hostname
request.META['SERVER_PORT'] = site.port
request._wagtail_site = site
# run extra query before hand
Site.find_for_request(request)

4
wagtail/contrib/sitemaps/tests.py
Wyświetl plik

@ -54,7 +54,7 @@ class TestSitemapGenerator(TestCase):
def get_request_and_django_site(self, url):
request = RequestFactory().get(url)
request.site = self.site
request._wagtail_site = self.site
return request, get_current_site(request)
def test_items(self):
@ -84,7 +84,7 @@ class TestSitemapGenerator(TestCase):
sitemap = Sitemap(request)
with self.assertNumQueries(17):
with self.assertNumQueries(16):
urls = [url['location'] for url in sitemap.get_urls(1, django_site, req_protocol)]
self.assertIn('http://localhost/', urls) # Homepage

4
wagtail/core/middleware.py
Wyświetl plik

@ -18,6 +18,6 @@ class SiteMiddleware(MiddlewareMixin):
)
try:
request.site = Site.find_for_request(request)
request._wagtail_site = Site.find_for_request(request)
except Site.DoesNotExist:
request.site = None
request._wagtail_site = None

15
wagtail/core/tests/test_page_model.py
Wyświetl plik

@ -255,7 +255,6 @@ class TestRouting(TestCase):
self.assertEqual(root.relative_url(default_site), None)
self.assertEqual(root.get_site(), None)
@override_settings(ALLOWED_HOSTS=['localhost', 'events.example.com', 'second-events.example.com'])
def test_urls_with_multiple_sites(self):
events_page = Page.objects.get(url_path='/home/events/')
events_site = Site.objects.create(hostname='events.example.com', root_page=events_page)
@ -292,8 +291,7 @@ class TestRouting(TestCase):
self.assertEqual(christmas_page.get_site(), events_site)
request = HttpRequest()
request.META['HTTP_HOST'] = events_site.hostname
request.META['SERVER_PORT'] = events_site.port
request._wagtail_site = events_site
self.assertEqual(
christmas_page.get_url_parts(request=request),
@ -301,8 +299,7 @@ class TestRouting(TestCase):
)
request2 = HttpRequest()
request2.META['HTTP_HOST'] = second_events_site.hostname
request2.META['SERVER_PORT'] = second_events_site.port
request2._wagtail_site = second_events_site
self.assertEqual(
christmas_page.get_url_parts(request=request2),
(second_events_site.id, 'http://second-events.example.com', '/christmas/')
@ -347,9 +344,7 @@ class TestRouting(TestCase):
request = HttpRequest()
request.user = AnonymousUser()
site = Site.objects.first()
request.META['HTTP_HOST'] = site.hostname
request.META['SERVER_PORT'] = site.port
request._wagtail_site = Site.objects.first()
response = christmas_page.serve(request)
self.assertEqual(response.status_code, 200)
@ -376,7 +371,7 @@ class TestRouting(TestCase):
# Override CACHES so we don't generate any cache-related SQL queries (tests use DatabaseCache
# otherwise) and so cache.get will always return None.
@override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}})
@override_settings(ALLOWED_HOSTS=['localhost', 'dummy'])
@override_settings(ALLOWED_HOSTS=['dummy'])
def test_request_scope_site_root_paths_cache(self):
homepage = Page.objects.get(url_path='/home/')
christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
@ -392,7 +387,6 @@ class TestRouting(TestCase):
self.assertEqual(christmas_page.get_url(), '/events/christmas/')
# with a request, the first call to get_url should issue 1 SQL query
request = HttpRequest()
request.META['HTTP_HOST'] = "dummy"
request.META['SERVER_PORT'] = "8888"
@ -1588,6 +1582,7 @@ class TestMakePreviewRequest(TestCase):
# validation won't reject
self.assertEqual(request.META['HTTP_HOST'], 'production.example.com')
@override_settings(ALLOWED_HOSTS=['*'])
def test_dummy_request_for_inaccessible_page_with_wildcard_allowed_hosts(self):
root_page = Page.objects.get(url_path='/')
response = root_page.make_preview_request()

14
wagtail/core/tests/tests.py
Wyświetl plik

@ -1,7 +1,7 @@
from django import template
from django.core.cache import cache
from django.http import HttpRequest
from django.test import TestCase, override_settings
from django.test import TestCase
from django.urls.exceptions import NoReverseMatch
from django.utils.safestring import SafeString
@ -54,7 +54,7 @@ class TestPageUrlTags(TestCase):
# 'request' object in context, but site is None
request = HttpRequest()
request.site = None
request._wagtail_site = None
result = tpl.render(template.Context({'page': page, 'request': request}))
self.assertIn('<a href="/events/">Events</a>', result)
@ -73,7 +73,6 @@ class TestPageUrlTags(TestCase):
result = slugurl(context=template.Context({'request': HttpRequest()}), slug='bad-slug-doesnt-exist')
self.assertEqual(result, None)
@override_settings(ALLOWED_HOSTS=['localhost', 'site2.example.com'])
def test_slugurl_tag_returns_url_for_current_site(self):
home_page = Page.objects.get(url_path='/home/')
new_home_page = home_page.copy(update_attrs={'title': "New home page", 'slug': 'new-home'})
@ -83,19 +82,16 @@ class TestPageUrlTags(TestCase):
new_christmas_page = Page(title='Christmas', slug='christmas')
new_home_page.add_child(instance=new_christmas_page)
request = HttpRequest()
request.META['HTTP_HOST'] = second_site.hostname
request.META['SERVER_PORT'] = second_site.port
request._wagtail_site = second_site
url = slugurl(context=template.Context({'request': request}), slug='christmas')
self.assertEqual(url, '/christmas/')
@override_settings(ALLOWED_HOSTS=['localhost', 'site2.example.com'])
def test_slugurl_tag_returns_url_for_other_site(self):
home_page = Page.objects.get(url_path='/home/')
new_home_page = home_page.copy(update_attrs={'title': "New home page", 'slug': 'new-home'})
second_site = Site.objects.create(hostname='site2.example.com', root_page=new_home_page)
request = HttpRequest()
request.META['HTTP_HOST'] = second_site.hostname
request.META['SERVER_PORT'] = second_site.port
request._wagtail_site = second_site
# There is no page with this slug on the current site, so this
# should return an absolute URL for the page on the first site.
url = slugurl(slug='christmas', context=template.Context({'request': request}))
@ -113,7 +109,7 @@ class TestPageUrlTags(TestCase):
def test_slugurl_with_null_site_in_request(self):
# 'request' object in context, but site is None
request = HttpRequest()
request.site = None
request._wagtail_site = None
result = slugurl(template.Context({'request': request}), 'events')
self.assertEqual(result, '/events/')

2
wagtail/tests/settings.py
Wyświetl plik

@ -8,8 +8,6 @@ MEDIA_URL = '/media/'
TIME_ZONE = 'Asia/Tokyo'
ALLOWED_HOSTS = ['localhost', ]
DATABASES = {
'default': {
'ENGINE': os.environ.get('DATABASE_ENGINE', 'django.db.backends.sqlite3'),

9513
yarn.lock
Wyświetl plik

Plik diff jest za duży Load Diff