+
@@ -271,18 +252,11 @@
{% if show_left %}
-
+
{{ _('Document Tags and Contributors') }}
- {% if not is_zone_root %}
-
- {{ crumbs }}
- {% endif %}
-
- {% if zone_subnav_html %}
-
- {{ get_document_subnav(zone_subnav_html) }}
- {% endif %}
+
+ {{ crumbs }}
{% if quick_links_html %}
diff --git a/kuma/wiki/jinja2/wiki/includes/buttons.html b/kuma/wiki/jinja2/wiki/includes/buttons.html
index 551ae5a4b63..4ab5b150d46 100644
--- a/kuma/wiki/jinja2/wiki/includes/buttons.html
+++ b/kuma/wiki/jinja2/wiki/includes/buttons.html
@@ -101,13 +101,6 @@
{{ _('Delete this article') }}
{% endif %}
- {% set zone_links = document_zone_management_links(request.user, document) %}
- {% if zone_links['change'] %}
- {{ _('Manage content zone') }}
- {% endif %}
- {% if zone_links['add'] %}
- {{ _('Convert to content zone') }}
- {% endif %}
{{ _('Print this article') }}
diff --git a/kuma/wiki/jinja2/wiki/includes/document_macros.html b/kuma/wiki/jinja2/wiki/includes/document_macros.html
index 1926896a0cc..62eae355824 100644
--- a/kuma/wiki/jinja2/wiki/includes/document_macros.html
+++ b/kuma/wiki/jinja2/wiki/includes/document_macros.html
@@ -18,14 +18,6 @@
{% endif %}
{%- endmacro %}
-{% macro get_document_subnav(html) %}
-
-{%- endmacro %}
-
{% macro get_document_quick_links(html) %}
{{ _('Related Topics') }}
diff --git a/kuma/wiki/jobs.py b/kuma/wiki/jobs.py
index 36905cc2c54..b59567672f9 100644
--- a/kuma/wiki/jobs.py
+++ b/kuma/wiki/jobs.py
@@ -1,6 +1,5 @@
import collections
import random
-import time
from django.conf import settings
from django.contrib.auth import get_user_model
@@ -9,57 +8,6 @@
from kuma.users.templatetags.jinja_helpers import gravatar_url
-class DocumentNearestZoneJob(KumaJob):
- # Allow up to three minutes to refresh the cache before assuming
- # the task has failed and allowing another to be enqueued.
- refresh_timeout = 180
-
- def expiry(self, *args, **kwargs):
- # Spread the cache expiration times across a random
- # number of days from 1 to 10 (in units of seconds).
- seconds_per_day = 24 * 60 * 60
- return time.time() + random.randint(1 * seconds_per_day,
- 10 * seconds_per_day)
-
- def fetch(self, pk):
- """
- Find the nearest DocumentZone, if there is one, starting from this
- document and going upwards via topic parents.
- """
- from .models import Document, DocumentZone
-
- # Using "admin_objects" here to get around the
- # filter that excludes deleted documents.
- get_parent_id = (Document.admin_objects
- .values_list('parent_topic', flat=True)
- .get)
- while pk:
- try:
- return DocumentZone.objects.select_related('document').get(document=pk)
- except DocumentZone.DoesNotExist:
- pk = get_parent_id(pk=pk)
-
- return self.empty()
-
-
-class DocumentZoneURLRemapsJob(KumaJob):
- lifetime = 60 * 60 * 3
- refresh_timeout = 60
-
- def fetch(self, locale):
- from .models import DocumentZone
- zones = (DocumentZone.objects.filter(document__locale=locale,
- url_root__isnull=False)
- .exclude(url_root=''))
- remaps = [('/docs/%s' % zone.document.slug, '/%s' % zone.url_root)
- for zone in zones]
- return remaps
-
- def empty(self):
- # the empty result needs to be an empty list instead of None
- return []
-
-
class DocumentContributorsJob(KumaJob):
"""
Given a wiki document returns a list of contributors that have recently
diff --git a/kuma/wiki/middleware.py b/kuma/wiki/middleware.py
index 1bb819bca83..8060e3459a3 100644
--- a/kuma/wiki/middleware.py
+++ b/kuma/wiki/middleware.py
@@ -1,14 +1,9 @@
-from django.conf import settings
-from django.http import HttpResponseRedirect
from django.shortcuts import render
from django.views.decorators.cache import never_cache
-from kuma.core.i18n import get_kuma_languages
from kuma.core.middleware import MiddlewareBase
-from kuma.core.utils import urlparams
from .exceptions import ReadOnlyException
-from .jobs import DocumentZoneURLRemapsJob
class ReadOnlyMiddleware(MiddlewareBase):
@@ -25,68 +20,3 @@ def process_exception(self, request, exception):
return never_cache(render)(request, '403.html', context,
status=403)
return None
-
-
-class DocumentZoneMiddleware(MiddlewareBase):
- """
- For document zones with specified URL roots, this middleware modifies the
- incoming path_info to point at the internal wiki path
- """
-
- def __call__(self, request):
- # https://bugzil.la/1189222
- # Don't redirect POST $subscribe requests to GET zone url
- if (request.method == 'POST' and
- ('$subscribe' in request.path or '$files' in request.path)):
- return self.get_response(request)
-
- # Skip slugs that don't have locales, and won't be in a zone
- path = request.path_info
- request_slug = path.lstrip('/')
- if any(request_slug.startswith(slug)
- for slug in settings.LANGUAGE_URL_IGNORED_PATHS):
- return self.get_response(request)
-
- # Convert the request path to zamboni/amo style
- maybe_lang = request_slug.split(u'/')[0]
- if maybe_lang in get_kuma_languages():
- path = u'/' + u'/'.join(request_slug.split(u'/')[1:])
- else:
- path = u'/' + request_slug
-
- remaps = DocumentZoneURLRemapsJob().get(request.LANGUAGE_CODE)
- for original_path, new_path in remaps:
-
- if (
- path == original_path or
- path.startswith(u''.join([original_path, '/']))
- ):
- # Is this a request for the "original" wiki path? Redirect to
- # new URL root, if so.
- new_path = path.replace(original_path, new_path, 1)
- new_path = '/%s%s' % (request.LANGUAGE_CODE, new_path)
-
- query = request.GET.copy()
- new_path = urlparams(new_path, query_dict=query)
-
- return HttpResponseRedirect(new_path)
-
- elif path == u'/docs{}'.format(new_path):
- # Is this a request for a DocumentZone, but with /docs/ wedged
- # in the url path between the language code and the zone's
- # url_root?
- new_path = u'/{}{}'.format(request.LANGUAGE_CODE, new_path)
- query = request.GET.copy()
- new_path = urlparams(new_path, query_dict=query)
-
- return HttpResponseRedirect(new_path)
-
- elif path.startswith(new_path):
- # Is this a request for the relocated wiki path? If so,
- # rewrite the path as a request for the proper wiki view.
- request.path_info = request.path_info.replace(new_path,
- original_path,
- 1)
- break
-
- return self.get_response(request)
diff --git a/kuma/wiki/models.py b/kuma/wiki/models.py
index a2e3e24bf92..11bcb46af49 100644
--- a/kuma/wiki/models.py
+++ b/kuma/wiki/models.py
@@ -35,7 +35,7 @@
from .exceptions import (DocumentRenderedContentNotAvailable,
DocumentRenderingInProgress, NotDocumentView,
PageMoveError, SlugCollision, UniqueCollision)
-from .jobs import DocumentContributorsJob, DocumentNearestZoneJob, DocumentTagsJob
+from .jobs import DocumentContributorsJob, DocumentTagsJob
from .managers import (DeletedDocumentManager, DocumentAdminManager,
DocumentManager, RevisionIPManager,
TaggedDocumentManager)
@@ -336,10 +336,6 @@ def get_body_html(self, *args, **kwargs):
def get_quick_links_html(self, *args, **kwargs):
return self.get_section_content('Quick_Links', annotate_links=True)
- @cache_with_field('zone_subnav_local_html')
- def get_zone_subnav_local_html(self, *args, **kwargs):
- return self.get_section_content('Subnav', annotate_links=True)
-
@cache_with_field('toc_html')
def get_toc_html(self, *args, **kwargs):
if not self.current_revision_id:
@@ -404,22 +400,10 @@ def regenerate_cache_with_fields(self):
# method can iterate?
self.get_body_html(force_fresh=True)
self.get_quick_links_html(force_fresh=True)
- self.get_zone_subnav_local_html(force_fresh=True)
self.get_toc_html(force_fresh=True)
self.get_summary_html(force_fresh=True)
self.get_summary_text(force_fresh=True)
- def get_zone_subnav_html(self):
- """
- Search this document and, if nothing is found, the document directly
- associated with its nearest zone, returning the first zone nav HTML
- found.
- """
- src = self.get_zone_subnav_local_html()
- if (not src) and self.nearest_zone:
- src = self.nearest_zone.document.get_zone_subnav_local_html()
- return src
-
def get_section_content(self, section_id, ignore_heading=True,
annotate_links=False):
"""
@@ -1435,26 +1419,6 @@ def contributors(self):
def all_tags_name(self):
return DocumentTagsJob().get(pk=self.pk)
- @cached_property
- def nearest_zone(self):
- """
- The nearest zone for this document, starting from this document and
- moving upwards via "parent_topic". For a non-default-language document
- that does not have its own nearest zone, returns the nearest zone of
- its parent (the document it was translated from).
- """
- job = DocumentNearestZoneJob()
- result = job.get(self.pk)
- if ((not result) and self.parent and
- (self.locale != settings.WIKI_DEFAULT_LANGUAGE)):
- return job.get(self.parent.pk)
- return result
-
- @cached_property
- def is_zone_root(self):
- zone = self.nearest_zone
- return bool(zone) and (zone.document_id in (self.id, self.parent_id))
-
def get_full_url(self):
return absolutify(self.get_absolute_url())
diff --git a/kuma/wiki/signal_handlers.py b/kuma/wiki/signal_handlers.py
index b51afefbd37..41fa1af13fa 100644
--- a/kuma/wiki/signal_handlers.py
+++ b/kuma/wiki/signal_handlers.py
@@ -1,50 +1,14 @@
-from django.db.models.signals import post_delete, post_save, pre_save
+from django.db.models.signals import post_save
from django.dispatch import receiver
from .events import spam_attempt_email
from .jobs import (DocumentCodeSampleJob, DocumentContributorsJob,
- DocumentNearestZoneJob, DocumentTagsJob,
- DocumentZoneURLRemapsJob)
-from .models import Document, DocumentSpamAttempt, DocumentZone, Revision
+ DocumentTagsJob)
+from .models import Document, DocumentSpamAttempt, Revision
from .signals import render_done
from .tasks import build_json_data_for_document, tidy_revision_content
-def invalidate_nearest_zone_cache(document_pk, async=False):
- """
- Reset the nearest-zone cache for this document and its descendants.
- """
- job = DocumentNearestZoneJob()
- do_invalidate = job.invalidate if async else job.refresh
-
- def invalidate(pk):
- do_invalidate(pk)
- # Since the descendants of this document search upwards for their
- # nearest zone, recursively invalidate their caches. Note that the
- # branches of this tree of decendants can stop at (and exclude) any
- # descendants that have their own zones.
- children = (Document.objects
- .filter(parent_topic=pk)
- .values_list('pk', 'zone__id'))
- for child_pk, child_zone_pk in children:
- if child_zone_pk is None:
- invalidate(child_pk)
-
- invalidate(document_pk)
-
-
-def invalidate_zone_urls_cache(locale, async=False):
- """
- Reset the URL remap list cache for the given document, assuming it
- even has a zone.
- """
- job = DocumentZoneURLRemapsJob()
- if async:
- job.invalidate(locale)
- else:
- job.refresh(locale)
-
-
@receiver(post_save, sender=Document, dispatch_uid='wiki.document.post_save')
def on_document_save(sender, instance, **kwargs):
"""
@@ -56,12 +20,6 @@ def on_document_save(sender, instance, **kwargs):
document
- trigger the renewal of the code sample job generation
"""
- async = kwargs.get('async', True)
-
- if hasattr(instance, 'zone'):
- invalidate_zone_urls_cache(instance.locale, async=async)
- invalidate_nearest_zone_cache(instance.pk, async=async)
-
DocumentContributorsJob().invalidate(instance.pk)
DocumentTagsJob().invalidate(pk=instance.pk)
@@ -87,47 +45,6 @@ def on_revision_save(sender, instance, **kwargs):
tidy_revision_content.delay(instance.pk)
-@receiver(pre_save, sender=DocumentZone, dispatch_uid='wiki.zone.pre_save')
-def on_zone_pre_save(sender, instance, **kwargs):
- """
- A signal handler to capture the previous state of the zone
- (from the DB) before it is lost.
- """
- # Temporarily save the previous state on the instance itself.
- dz_objs = DocumentZone.objects.values('document_id', 'document__locale')
- try:
- instance.previous = dz_objs.get(pk=instance.pk)
- except DocumentZone.DoesNotExist:
- # This will happen for newly-created zones.
- instance.previous = None
-
-
-@receiver(post_save, sender=DocumentZone, dispatch_uid='wiki.zone.post_save')
-def on_zone_post_save(sender, instance, **kwargs):
- """
- A signal handler to trigger cache invalidation for this zone.
- """
- if instance.previous:
- if instance.document.pk != instance.previous['document_id']:
- invalidate_nearest_zone_cache(instance.previous['document_id'])
- invalidate_zone_urls_cache(instance.previous['document__locale'])
- # Now that we've used the previous state of the zone, clear it.
- instance.previous = None
-
- invalidate_nearest_zone_cache(instance.document.pk)
- invalidate_zone_urls_cache(instance.document.locale)
-
-
-@receiver(post_delete, sender=DocumentZone,
- dispatch_uid='wiki.zone.post_delete')
-def on_zone_delete(sender, instance, **kwargs):
- """
- A signal handler to trigger cache invalidation for this zone.
- """
- invalidate_nearest_zone_cache(instance.document.pk)
- invalidate_zone_urls_cache(instance.document.locale)
-
-
@receiver(post_save, sender=DocumentSpamAttempt,
dispatch_uid='wiki.spam_attempt.post_save')
def on_document_spam_attempt_save(sender, instance, created, raw, **kwargs):
diff --git a/kuma/wiki/templatetags/jinja_helpers.py b/kuma/wiki/templatetags/jinja_helpers.py
index ba89c0d7dd6..b2898c8d257 100644
--- a/kuma/wiki/templatetags/jinja_helpers.py
+++ b/kuma/wiki/templatetags/jinja_helpers.py
@@ -202,26 +202,6 @@ def tojson(value):
return jinja2.Markup(result)
-@library.global_function
-def document_zone_management_links(user, document):
- links = {'add': None, 'change': None}
- zone = document.nearest_zone
-
- # Enable "add" link if there is no zone for this document, or if there's a
- # zone but the document is not itself the root (ie. to add sub-zones).
- if ((not zone or zone.document_id != document.id) and
- user.has_perm('wiki.add_documentzone')):
- links['add'] = '%s?document=%s' % (
- reverse('admin:wiki_documentzone_add'), document.id)
-
- # Enable "change" link if there's a zone, and the user has permission.
- if zone and user.has_perm('wiki.change_documentzone'):
- links['change'] = reverse('admin:wiki_documentzone_change',
- args=(zone.id,))
-
- return links
-
-
@library.filter
def absolutify(url, site=None):
"""
diff --git a/kuma/wiki/tests/conftest.py b/kuma/wiki/tests/conftest.py
index f33cd9319aa..2f598e4ae88 100644
--- a/kuma/wiki/tests/conftest.py
+++ b/kuma/wiki/tests/conftest.py
@@ -10,7 +10,7 @@
from kuma.core.urlresolvers import reverse
from ..constants import REDIRECT_CONTENT
-from ..models import Document, DocumentZone, Revision
+from ..models import Document, Revision
BannedUser = namedtuple('BannedUser', 'user ban')
@@ -119,7 +119,7 @@ def redirect_doc(wiki_user, root_doc):
@pytest.fixture
-def doc_hierarchy_with_zones(settings, wiki_user, wiki_user_2, wiki_user_3):
+def doc_hierarchy(wiki_user, wiki_user_2, wiki_user_3):
top_doc = Document.objects.create(
locale='en-US',
slug='top',
@@ -217,51 +217,6 @@ def doc_hierarchy_with_zones(settings, wiki_user, wiki_user_2, wiki_user_3):
title='Bottom Document',
created=datetime(2017, 4, 24, 13, 52)
)
- DocumentZone.objects.create(
- document=top_doc,
- css_slug='lindsey',
- url_root='fleetwood-mac'
- )
- DocumentZone.objects.create(
- document=middle_top_doc,
- css_slug='bobby',
- url_root='spinners'
- )
- DocumentZone.objects.create(
- document=top_de_doc,
- css_slug='berlin',
- url_root='berlin'
- )
- DocumentZone.objects.create(
- document=top_it_doc,
- url_root='florence'
- )
- settings.PIPELINE_CSS.update({
- 'zone-lindsey': {
- 'source_filenames': (
- 'styles/zone-lindsey.scss',
- ),
- 'output_filename': 'build/styles/zone-lindsey.css',
- },
- 'zone-bobby': {
- 'source_filenames': (
- 'styles/zone-bobby.scss',
- ),
- 'output_filename': 'build/styles/zone-bobby.css',
- },
- 'zone-berlin': {
- 'source_filenames': (
- 'styles/zone-berlin.scss',
- ),
- 'output_filename': 'build/styles/zone-berlin.css',
- },
- 'zones': {
- 'source_filenames': (
- 'styles/zones.scss',
- ),
- 'output_filename': 'build/styles/zones.css',
- }
- })
return DocHierarchy(
top=top_doc,
middle_top=middle_top_doc,
diff --git a/kuma/wiki/tests/test_jobs.py b/kuma/wiki/tests/test_jobs.py
index 0581123df88..ce65c5668d7 100644
--- a/kuma/wiki/tests/test_jobs.py
+++ b/kuma/wiki/tests/test_jobs.py
@@ -1,208 +1,11 @@
from datetime import datetime
-import mock
import pytest
-from ..jobs import DocumentContributorsJob, DocumentNearestZoneJob
+from ..jobs import DocumentContributorsJob
from ..models import Revision
-def test_document_zone_unicode(doc_hierarchy_with_zones):
- top_doc = doc_hierarchy_with_zones.top
- assert unicode(top_doc.zone) == u'DocumentZone {} ({})'.format(
- top_doc.get_absolute_url(), top_doc.title)
-
-
-def test_nearest_zone_expiry():
- """
- Ensure that the expiry is not constant.
- """
- job = DocumentNearestZoneJob()
- with mock.patch('time.time', return_value=0):
- assert len(set(job.expiry() for _ in range(0, 1000))) > 1
-
-
-@pytest.mark.parametrize('doc_name,expected_zone_name', [
- ('top', 'top'),
- ('middle_top', 'middle_top'),
- ('middle_bottom', 'middle_top'),
- ('bottom', 'middle_top'),
- ('root', None),
-])
-def test_nearest_zone(doc_hierarchy_with_zones, root_doc,
- cleared_cacheback_cache, doc_name, expected_zone_name):
- """
- Test the nearest zone job.
- """
- doc = (root_doc
- if doc_name == 'root' else
- getattr(doc_hierarchy_with_zones, doc_name))
- zone = (None
- if expected_zone_name is None else
- getattr(doc_hierarchy_with_zones, expected_zone_name).zone)
- assert DocumentNearestZoneJob().get(doc.pk) == zone
-
-
-def test_nearest_zone_when_deleted_parent_topic(doc_hierarchy_with_zones,
- cleared_cacheback_cache):
- """
- Make sure we handle the case where we try to get the nearest
- zone for a document whose parent-topic has been deleted.
- """
- bottom_doc = doc_hierarchy_with_zones.bottom
- middle_top_zone = doc_hierarchy_with_zones.middle_top.zone
- # Delete the parent-topic of the bottom doc.
- doc_hierarchy_with_zones.middle_bottom.delete()
- # We should still successfully get the nearest zone for the bottom doc.
- assert DocumentNearestZoneJob().get(bottom_doc.pk) == middle_top_zone
-
-
-def test_nearest_zone_cache_invalidation_on_save_shallow(doc_hierarchy_with_zones,
- cleared_cacheback_cache):
- job = DocumentNearestZoneJob()
-
- top_doc = doc_hierarchy_with_zones.top
- middle_top_doc = doc_hierarchy_with_zones.middle_top
- middle_bottom_doc = doc_hierarchy_with_zones.middle_bottom
- bottom_doc = doc_hierarchy_with_zones.bottom
-
- top_zone = top_doc.zone
- middle_top_zone = middle_top_doc.zone
-
- # Load the cache for each of the docs.
- assert job.get(top_doc.pk) == top_zone
- assert job.get(middle_top_doc.pk) == middle_top_zone
- assert job.get(middle_bottom_doc.pk) == middle_top_zone
- assert job.get(bottom_doc.pk) == middle_top_zone
-
- # Change and save a field (other than the document id) on the top zone.
- assert top_zone.css_slug == 'lindsey'
- with mock.patch('kuma.wiki.jobs.DocumentNearestZoneJob.refresh',
- wraps=job.refresh) as mock_refresh:
- top_zone.css_slug = 'christine'
- top_zone.save()
-
- # Only the cache for the top doc should have been invalidated.
- assert job.get(top_doc.pk).css_slug == 'christine'
- mock_refresh.assert_called_once_with(top_doc.pk)
-
-
-def test_nearest_zone_cache_invalidation_on_save_deep(doc_hierarchy_with_zones,
- cleared_cacheback_cache):
- job = DocumentNearestZoneJob()
-
- top_doc = doc_hierarchy_with_zones.top
- middle_top_doc = doc_hierarchy_with_zones.middle_top
- middle_bottom_doc = doc_hierarchy_with_zones.middle_bottom
- bottom_doc = doc_hierarchy_with_zones.bottom
-
- top_zone = top_doc.zone
- middle_top_zone = middle_top_doc.zone
-
- # Load the cache for each of the docs.
- assert job.get(top_doc.pk) == top_zone
- assert job.get(middle_top_doc.pk) == middle_top_zone
- assert job.get(middle_bottom_doc.pk) == middle_top_zone
- assert job.get(bottom_doc.pk) == middle_top_zone
-
- # Change and save a field (other than the document id) on a zone,
- # but this time the invalidation process should descend to the bottom.
- assert middle_top_zone.css_slug == 'bobby'
- with mock.patch('kuma.wiki.jobs.DocumentNearestZoneJob.refresh',
- wraps=job.refresh) as mock_refresh:
- middle_top_zone.css_slug = 'henry'
- middle_top_zone.save()
-
- # The cache for the middle-top doc and its descendants should have been
- # invalidated.
- assert job.get(middle_top_doc.pk).css_slug == 'henry'
- assert job.get(middle_bottom_doc.pk).css_slug == 'henry'
- assert job.get(bottom_doc.pk).css_slug == 'henry'
-
- assert mock_refresh.call_count == 3
- mock_refresh.assert_has_calls([
- mock.call(middle_top_doc.pk),
- mock.call(middle_bottom_doc.pk),
- mock.call(bottom_doc.pk)
- ], any_order=True)
-
-
-def test_nearest_zone_cache_invalidation_on_save_doc_id(doc_hierarchy_with_zones,
- cleared_cacheback_cache):
- job = DocumentNearestZoneJob()
-
- top_doc = doc_hierarchy_with_zones.top
- middle_top_doc = doc_hierarchy_with_zones.middle_top
- middle_bottom_doc = doc_hierarchy_with_zones.middle_bottom
- bottom_doc = doc_hierarchy_with_zones.bottom
-
- top_zone = top_doc.zone
- middle_top_zone = middle_top_doc.zone
-
- # Load the cache for each of the docs.
- assert job.get(top_doc.pk) == top_zone
- assert job.get(middle_top_doc.pk) == middle_top_zone
- assert job.get(middle_bottom_doc.pk) == middle_top_zone
- assert job.get(bottom_doc.pk) == middle_top_zone
-
- # Change and save the document id field on a zone.
- assert middle_top_zone.document == middle_top_doc
- with mock.patch('kuma.wiki.jobs.DocumentNearestZoneJob.refresh',
- wraps=job.refresh) as mock_refresh:
- middle_top_zone.document = bottom_doc
- middle_top_zone.save()
-
- # The cache for the middle-top doc and its descendants should have been
- # invalidated.
- assert job.get(middle_top_doc.pk) == top_zone
- assert job.get(middle_bottom_doc.pk) == top_zone
- assert job.get(bottom_doc.pk) == middle_top_zone
-
- assert mock_refresh.call_count == 3
- mock_refresh.assert_has_calls([
- mock.call(middle_top_doc.pk),
- mock.call(middle_bottom_doc.pk),
- mock.call(bottom_doc.pk)
- ], any_order=True)
-
-
-def test_nearest_zone_cache_invalidation_on_zone_delete(doc_hierarchy_with_zones,
- cleared_cacheback_cache):
- job = DocumentNearestZoneJob()
-
- top_doc = doc_hierarchy_with_zones.top
- middle_top_doc = doc_hierarchy_with_zones.middle_top
- middle_bottom_doc = doc_hierarchy_with_zones.middle_bottom
- bottom_doc = doc_hierarchy_with_zones.bottom
-
- top_zone = top_doc.zone
- middle_top_zone = middle_top_doc.zone
-
- # Load the cache for each of the docs.
- assert job.get(top_doc.pk) == top_zone
- assert job.get(middle_top_doc.pk) == middle_top_zone
- assert job.get(middle_bottom_doc.pk) == middle_top_zone
- assert job.get(bottom_doc.pk) == middle_top_zone
-
- # Delete a zone.
- with mock.patch('kuma.wiki.jobs.DocumentNearestZoneJob.refresh',
- wraps=job.refresh) as mock_refresh:
- middle_top_zone.delete()
-
- # The cache for the top doc and its descendants should have been invalidated.
- assert job.get(top_doc.pk) == top_zone
- assert job.get(middle_top_doc.pk) == top_zone
- assert job.get(middle_bottom_doc.pk) == top_zone
- assert job.get(bottom_doc.pk) == top_zone
-
- assert mock_refresh.call_count == 3
- mock_refresh.assert_has_calls([
- mock.call(middle_top_doc.pk),
- mock.call(middle_bottom_doc.pk),
- mock.call(bottom_doc.pk),
- ], any_order=True)
-
-
@pytest.mark.parametrize("mode", ["maintenance-mode", "normal-mode"])
def test_contributors(db, cleared_cacheback_cache, settings, wiki_user_3,
root_doc_with_mixed_contributors, mode):
diff --git a/kuma/wiki/tests/test_middleware.py b/kuma/wiki/tests/test_middleware.py
deleted file mode 100644
index 7e3cd21284e..00000000000
--- a/kuma/wiki/tests/test_middleware.py
+++ /dev/null
@@ -1,263 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.conf import settings
-from django.test import RequestFactory
-
-from kuma.core.cache import memcache
-from kuma.users.tests import UserTestCase
-
-from . import document, revision, WikiTestCase
-from ..middleware import DocumentZoneMiddleware
-from ..models import DocumentZone
-
-
-class DocumentZoneMiddlewareTestCase(UserTestCase, WikiTestCase):
-
- def setUp(self):
- super(DocumentZoneMiddlewareTestCase, self).setUp()
- self.rf = RequestFactory()
- memcache.clear()
-
- self.zone_root = 'ExtraWiki'
- self.zone_root_content = 'This is the Zone Root'
-
- root_rev = revision(title='ZoneRoot', slug='Zones/Root',
- content=self.zone_root_content,
- is_approved=True, save=True)
- self.root_doc = root_rev.document
-
- middle_rev = revision(title='middlePage', slug='Zones/Root/Middle',
- content='This is a middlepage',
- is_approved=True, save=True)
- self.middle_doc = middle_rev.document
- self.middle_doc.parent_topic = self.root_doc
- self.middle_doc.save()
-
- sub_rev = revision(title='SubPage', slug='Zones/Root/Middle/SubPage',
- content='This is a subpage',
- is_approved=True, save=True)
- self.sub_doc = sub_rev.document
- self.sub_doc.parent_topic = self.middle_doc
- self.sub_doc.save()
-
- self.root_zone = DocumentZone(document=self.root_doc)
- self.root_zone.url_root = self.zone_root
- self.root_zone.save()
-
- self.middle_zone = DocumentZone(document=self.middle_doc)
- self.middle_zone.save()
-
- other_rev = revision(title='otherPage', slug='otherPage',
- content='This is an otherpage',
- is_approved=True, save=True)
- self.other_doc = other_rev.document
- self.other_doc.save()
-
- self.other_zone = DocumentZone(document=self.other_doc)
- self.other_zone.url_root = ''
- self.other_zone.save()
-
- # One more doc, just to be sure we can have multiple blank url_roots
- onemore_rev = revision(title='onemorePage', slug='onemorePage',
- content='This is an onemorepage',
- is_approved=True, save=True)
- self.onemore_doc = onemore_rev.document
- self.onemore_doc.save()
-
- self.onemore_zone = DocumentZone(document=self.onemore_doc)
- self.onemore_zone.url_root = ''
- self.onemore_zone.save()
-
- def test_url_root_internal_redirect(self):
- """Ensure document zone with URL root results in internal redirect"""
-
- url = '/en-US/%s?raw' % self.zone_root
- response = self.client.get(url, follow=False)
- assert 200 == response.status_code
- assert self.zone_root_content == response.content
-
- url = '/en-US/%s/Middle/SubPage?raw' % self.zone_root
- response = self.client.get(url, follow=False)
- assert 200 == response.status_code
- assert self.sub_doc.html == response.content
-
- self.root_zone.url_root = 'NewRoot'
- self.root_zone.save()
-
- url = '/en-US/%s/Middle/SubPage?raw' % 'NewRoot'
- response = self.client.get(url, follow=False)
- assert 200 == response.status_code
- assert self.sub_doc.html == response.content
-
- def test_actual_wiki_url_redirect(self):
- """
- Ensure a request for the 'real' path to a document results in a
- redirect to the internal redirect path
- """
- url = '/en-US/docs/%s?raw=1' % self.middle_doc.slug
- response = self.client.get(url, follow=False)
- assert 302 == response.status_code
- assert response['Location'] == '/en-US/ExtraWiki/Middle?raw=1'
-
- self.root_zone.url_root = 'NewRoot'
- self.root_zone.save()
-
- url = '/en-US/docs/%s?raw=1' % self.middle_doc.slug
- response = self.client.get(url, follow=False)
- assert 302 == response.status_code
- assert response['Location'] == '/en-US/NewRoot/Middle?raw=1'
-
- def test_blank_url_root(self):
- """Ensure a blank url_root does not trigger URL remap"""
- url = '/en-US/docs/%s?raw=1' % self.other_doc.slug
- response = self.client.get(url, follow=False)
- assert 200 == response.status_code
-
- def test_no_redirect(self):
- middleware = DocumentZoneMiddleware(lambda req: None)
- for endpoint in ['$subscribe', '$files']:
- request = self.rf.post('/en-US/docs/%s%s?raw' %
- (self.other_doc.slug, endpoint))
- assert middleware(request) is None
-
- def test_skip_no_language_urls(self):
- middleware = DocumentZoneMiddleware(lambda req: None)
- for path in settings.LANGUAGE_URL_IGNORED_PATHS:
- request = self.rf.get('/' + path)
- assert middleware(request) is None
-
- def test_zone_url_ends_with_slash(self):
- """Ensure urls only rewrite with a '/' at the end of url_root
-
- bug 1189596
- """
- zone_url_root = 'Firéfox'
- zone_root_content = 'This is the Firéfox zone'
-
- root_rev = revision(title='Firéfox', slug='Mozilla/Firéfox',
- content=zone_root_content,
- is_approved=True, save=True)
- root_doc = root_rev.document
-
- root_zone = DocumentZone(document=root_doc)
- root_zone.url_root = zone_url_root
- root_zone.save()
-
- none_zone_rev = revision(title='Firéfox for iOS',
- slug='Mozilla/Firéfox_for_iOS',
- content='Page outside zone with same prefix',
- is_approved=True, save=True)
- non_zone_doc = none_zone_rev.document
- non_zone_doc.save()
-
- url = '/en-US/docs/%s' % non_zone_doc.slug
- response = self.client.get(url, follow=False)
- assert 200 == response.status_code
-
-
-class DocumentZoneWithLocaleTestCase(UserTestCase, WikiTestCase):
- """
- Locales and DocumentZones do not always play nicely together, particularly
- with the middleware that attempts to redirect requests to the right
- location. See bug 1267197 for some of the past analysis and discussion.
- """
-
- def setUp(self):
- super(DocumentZoneWithLocaleTestCase, self).setUp()
- memcache.clear()
-
- root_rev = revision(title='Firefox', slug='Mozilla/Firefox',
- is_approved=True, save=True)
- self.en_doc = root_rev.document
- self.en_doc.locale = 'en-US'
- self.en_doc.save()
-
- self.en_root_zone = DocumentZone(document=self.en_doc, url_root='Firefox')
- self.en_root_zone.save()
-
- self.fr_doc = document(title='Firefox', slug='Mozilla/Firefox',
- parent=self.en_doc, locale='fr', save=True)
- revision(document=self.fr_doc, is_approved=True, save=True)
-
- self.fr_root_zone = DocumentZone(document=self.fr_doc, url_root='Firefox')
- self.fr_root_zone.save()
-
- def test_zone_with_implied_default_locale(self):
- # This url lacks a locale, so the locale middleware will redirect to the
- # canonical one for the default language.
- url = '/Firefox'
- response = self.client.get(url, follow=False)
- self.assertRedirects(response, '/en-US/Firefox', status_code=302)
-
- def test_zone_with_default_locale(self):
- # This url is the canonical one for the English zone for this document,
- # so just load it.
- url = '/en-US/Firefox'
- response = self.client.get(url, follow=False)
- self.assertEqual(response.status_code, 200)
-
- def test_zone_with_non_default_locale(self):
- # This url is the canonical one for the French zone for this document,
- # so just load it.
- url = '/fr/Firefox'
- response = self.client.get(url, follow=False)
- self.assertEqual(response.status_code, 200)
-
- def test_docs_zone_with_implied_default_locale(self):
- # This url has no locale and a wiki path, and gets redirected to the
- # zoned url with locale in a single redirect.
- url = '/docs/Firefox'
- response = self.client.get(url, follow=True)
- assert len(response.redirect_chain) == 1
- redirect_url, status_code = response.redirect_chain[0]
- assert redirect_url == '/en-US/Firefox'
- assert status_code == 302
-
- def test_docs_zone_with_default_locale(self):
- # This url has a locale and a wiki path, and gets redirected to the
- # zoned url.
- url = '/en-US/docs/Firefox'
- response = self.client.get(url, follow=False)
- self.assertRedirects(response, '/en-US/Firefox', status_code=302)
-
- def test_docs_zone_with_non_default_locale(self):
- # This url has a non-default locale and a wiki path, and gets
- # redirected to the correct zoned url.
- url = '/fr/docs/Firefox'
- response = self.client.get(url, follow=False)
- self.assertRedirects(response, '/fr/Firefox', status_code=302)
-
- def test_docs_zone_with_get_param_locale(self):
- # This url has no locale and a wiki path, and gets redirected first to
- # the zoned url and then as requested by the ?lang parameter.
- url = '/docs/Firefox'
- response = self.client.get(url, {'lang': 'fr'}, follow=True)
- assert len(response.redirect_chain) == 2
- url1, status_code_1 = response.redirect_chain[0]
- url2, status_code_2 = response.redirect_chain[1]
- assert url1 == '/fr/docs/Firefox'
- assert url2 == '/fr/Firefox'
- assert status_code_1 == status_code_2 == 302
-
- def test_zone_document_with_implied_default_locale(self):
- # This url has no locale and a wiki path, and gets redirected to the
- # zoned url with locale in a single step.
- url = '/docs/Mozilla/Firefox'
- response = self.client.get(url, follow=True)
- assert len(response.redirect_chain) == 1
- redirect_url, status_code = response.redirect_chain[0]
- assert redirect_url == '/en-US/Firefox'
- assert status_code == 302
-
- def test_zone_document_with_default_locale(self):
- # This url is the canonical one for our English document, so it should
- # get a single, non-permanent redirect to the zone url.
- url = '/en-US/docs/Mozilla/Firefox'
- response = self.client.get(url, follow=False)
- self.assertRedirects(response, '/en-US/Firefox', status_code=302)
-
- def test_zone_document_with_non_default_locale(self):
- # This url is the canonical one for our French document, so it should
- # get a single, non-permanent redirect to the zone url.
- url = '/fr/docs/Mozilla/Firefox'
- response = self.client.get(url, follow=False)
- self.assertRedirects(response, '/fr/Firefox', status_code=302)
diff --git a/kuma/wiki/tests/test_models_document.py b/kuma/wiki/tests/test_models_document.py
index 38ede115f68..78b1ba88d81 100644
--- a/kuma/wiki/tests/test_models_document.py
+++ b/kuma/wiki/tests/test_models_document.py
@@ -29,13 +29,6 @@ def doc_with_sections(root_doc, wiki_user):
- Subnav
-Subnav:
--
-
- Existing link -
- New link -
Second
Another section, with an existing link and a @@ -280,62 +273,6 @@ def test_build_json_data_uses_rendered_html(root_doc): assert json_data['sections'] == expected_sections -def test_nearest_zone(doc_hierarchy_with_zones, cleared_cacheback_cache): - """ - Test the nearest zone property of English and non-English documents. - """ - top_doc = doc_hierarchy_with_zones.top - top_zone = top_doc.zone - - fr_top_doc = top_doc.translations.get(locale='fr') - de_top_doc = top_doc.translations.get(locale='de') - - assert fr_top_doc.parent == top_doc - assert de_top_doc.parent == top_doc - assert top_doc.nearest_zone == top_zone - # The French translation of the top doc doesn't have its own locale- - # specific nearest zone, so it'll return the nearest zone of its parent. - assert fr_top_doc.nearest_zone == top_doc.nearest_zone - # The German translation of the top doc does have its own - # locale-specific nearest zone. - assert de_top_doc.nearest_zone == de_top_doc.zone - - -def test_nearest_zone_when_no_parent(doc_hierarchy_with_zones, - cleared_cacheback_cache): - """ - Silly end-case test of the nearest-zone property of a non-English document - without a parent. - """ - top_doc = doc_hierarchy_with_zones.top - fr_top_doc = top_doc.translations.get(locale='fr') - fr_top_doc.parent = None - fr_top_doc.save() - - assert not fr_top_doc.nearest_zone - - -@pytest.mark.parametrize('doc_name,expected_result', [ - ('top', True), - ('bottom', False), - ('de', True), - ('fr', True), - ('root', False), -]) -def test_is_zone_root(doc_hierarchy_with_zones, root_doc, - cleared_cacheback_cache, doc_name, expected_result): - """ - Test is_zone_root. - """ - if doc_name == 'root': - doc = root_doc - elif doc_name in ('de', 'fr'): - doc = doc_hierarchy_with_zones.top.translations.get(locale=doc_name) - else: - doc = getattr(doc_hierarchy_with_zones, doc_name) - assert doc.is_zone_root is expected_result - - def test_get_section_content(doc_with_sections): """A section can be extracted by ID.""" result = doc_with_sections.get_section_content('Short') @@ -344,7 +281,7 @@ def test_get_section_content(doc_with_sections): def test_get_body_html(doc_with_sections): - """The quick_links and subnav are removed from the body HTML.""" + """The quick_links are removed from the body HTML.""" result = doc_with_sections.get_body_html() expected = """
First
@@ -370,16 +307,3 @@ def test_get_quick_links_html(doc_with_sections): """ assert normalize_html(result) == normalize_html(expected) - - -def test_get_zone_subnav_local_html(doc_with_sections): - """The zone subnav local HTML can be extracted from the revision.""" - result = doc_with_sections.get_zone_subnav_local_html() - expected = """ -Subnav:
--
-
- Existing link -
- New link -