avoid lint errors
This commit is contained in:
@ -1,5 +1,5 @@
|
|||||||
from datetime import datetime
|
|
||||||
import functools
|
import functools
|
||||||
|
from datetime import datetime
|
||||||
from importlib import import_module
|
from importlib import import_module
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
@ -255,7 +255,7 @@ class VisitCountRule(AbstractBaseRule):
|
|||||||
def test_user(self, request, user=None):
|
def test_user(self, request, user=None):
|
||||||
# Local import for cyclic import
|
# Local import for cyclic import
|
||||||
from wagtail_personalisation.adapters import (
|
from wagtail_personalisation.adapters import (
|
||||||
get_segment_adapter, SessionSegmentsAdapter, SEGMENT_ADAPTER_CLASS)
|
SEGMENT_ADAPTER_CLASS, SessionSegmentsAdapter, get_segment_adapter)
|
||||||
|
|
||||||
# Django formsets don't honour 'required' fields so check rule is valid
|
# Django formsets don't honour 'required' fields so check rule is valid
|
||||||
try:
|
try:
|
||||||
@ -312,7 +312,7 @@ class VisitCountRule(AbstractBaseRule):
|
|||||||
def get_user_info_string(self, user):
|
def get_user_info_string(self, user):
|
||||||
# Local import for cyclic import
|
# Local import for cyclic import
|
||||||
from wagtail_personalisation.adapters import (
|
from wagtail_personalisation.adapters import (
|
||||||
get_segment_adapter, SessionSegmentsAdapter, SEGMENT_ADAPTER_CLASS)
|
SEGMENT_ADAPTER_CLASS, SessionSegmentsAdapter, get_segment_adapter)
|
||||||
|
|
||||||
# Create a fake request so we can use the adapter
|
# Create a fake request so we can use the adapter
|
||||||
request = RequestFactory().get('/')
|
request = RequestFactory().get('/')
|
||||||
|
@ -304,7 +304,7 @@ def add_personalisation_summary_panels(request, items):
|
|||||||
def delete_related_variants(request, page):
|
def delete_related_variants(request, page):
|
||||||
if (
|
if (
|
||||||
not isinstance(page, models.PersonalisablePageMixin)
|
not isinstance(page, models.PersonalisablePageMixin)
|
||||||
or not page.personalisation_metadata.is_canonical
|
or not page.personalisation_metadata.is_canonical # noqa
|
||||||
):
|
):
|
||||||
return
|
return
|
||||||
# Get a list of related personalisation metadata for all the related
|
# Get a list of related personalisation metadata for all the related
|
||||||
|
@ -18,6 +18,7 @@ try:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class ContentPageFactory(PageFactory):
|
class ContentPageFactory(PageFactory):
|
||||||
parent = None
|
parent = None
|
||||||
title = 'Test page'
|
title = 'Test page'
|
||||||
|
@ -2,16 +2,16 @@ import pytest
|
|||||||
from django.test import override_settings
|
from django.test import override_settings
|
||||||
from wagtail.core.models import Page as WagtailPage
|
from wagtail.core.models import Page as WagtailPage
|
||||||
|
|
||||||
from tests.factories.page import (ContentPageFactory, PersonalisablePageMetadataFactory)
|
from tests.factories.page import (
|
||||||
|
ContentPageFactory, PersonalisablePageMetadataFactory)
|
||||||
from wagtail_personalisation.utils import (
|
from wagtail_personalisation.utils import (
|
||||||
can_delete_pages, exclude_variants, get_client_ip, impersonate_other_page)
|
can_delete_pages, exclude_variants, get_client_ip, impersonate_other_page)
|
||||||
|
|
||||||
|
|
||||||
locale_factory = False
|
locale_factory = False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from tests.factories.page import LocaleFactory
|
from tests.factories.page import LocaleFactory # noqa
|
||||||
locale_factory = True
|
locale_factory = True # noqa
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ def test_segment_delete_view_delete_instance(rf, segmented_page, user):
|
|||||||
assert variants_metadata
|
assert variants_metadata
|
||||||
|
|
||||||
# Delete the segment via the method on the view.
|
# Delete the segment via the method on the view.
|
||||||
request = rf.get('/'.format(segment.pk))
|
request = rf.get('/'.format(segment.pk)) # noqa
|
||||||
request.user = user
|
request.user = user
|
||||||
view = SegmentModelDeleteView(
|
view = SegmentModelDeleteView(
|
||||||
instance_pk=str(segment.pk),
|
instance_pk=str(segment.pk),
|
||||||
@ -98,13 +98,13 @@ def test_segment_delete_view_delete_instance(rf, segmented_page, user):
|
|||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
def test_segment_delete_view_raises_permission_denied(rf, segmented_page, user):
|
def test_segment_delete_view_raises_permission_denied(rf, segmented_page, user):
|
||||||
segment = segmented_page.personalisation_metadata.segment
|
segment = segmented_page.personalisation_metadata.segment
|
||||||
request = rf.get('/'.format(segment.pk))
|
request = rf.get('/'.format(segment.pk)) # noqa
|
||||||
request.user = user
|
request.user = user
|
||||||
view = SegmentModelDeleteView(
|
view = SegmentModelDeleteView(
|
||||||
instance_pk=str(segment.pk),
|
instance_pk=str(segment.pk),
|
||||||
model_admin=SegmentModelAdmin()
|
model_admin=SegmentModelAdmin()
|
||||||
)
|
)
|
||||||
view.request = request
|
view.request = request
|
||||||
message = 'User have no permission to delete variant page objects.'
|
message = 'User have no permission to delete variant page objects.' # noqa
|
||||||
with pytest.raises(PermissionDenied):
|
with pytest.raises(PermissionDenied):
|
||||||
view.delete_instance()
|
view.delete_instance()
|
||||||
|
Reference in New Issue
Block a user