diff --git a/src/personalisation/migrations/0025_auto_20161115_1310.py b/src/personalisation/migrations/0025_auto_20161115_1310.py index 4851dcf..cd38b50 100644 --- a/src/personalisation/migrations/0025_auto_20161115_1310.py +++ b/src/personalisation/migrations/0025_auto_20161115_1310.py @@ -2,8 +2,8 @@ # Generated by Django 1.10.3 on 2016-11-15 13:10 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/personalisation/migrations/0026_auto_20161117_1201.py b/src/personalisation/migrations/0026_auto_20161117_1201.py index 639830d..c390bf2 100644 --- a/src/personalisation/migrations/0026_auto_20161117_1201.py +++ b/src/personalisation/migrations/0026_auto_20161117_1201.py @@ -2,9 +2,9 @@ # Generated by Django 1.10.3 on 2016-11-17 11:01 from __future__ import unicode_literals -from django.db import migrations import django.db.models.deletion import modelcluster.fields +from django.db import migrations class Migration(migrations.Migration): diff --git a/src/personalisation/migrations/0028_referralrule_timerule_visitcountrule.py b/src/personalisation/migrations/0028_referralrule_timerule_visitcountrule.py index 650d128..394db2a 100644 --- a/src/personalisation/migrations/0028_referralrule_timerule_visitcountrule.py +++ b/src/personalisation/migrations/0028_referralrule_timerule_visitcountrule.py @@ -2,9 +2,9 @@ # Generated by Django 1.10.3 on 2016-11-18 13:45 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion import modelcluster.fields +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/personalisation/migrations/0029_auto_20161118_1601.py b/src/personalisation/migrations/0029_auto_20161118_1601.py index 0a2bacb..ede6fc5 100644 --- a/src/personalisation/migrations/0029_auto_20161118_1601.py +++ b/src/personalisation/migrations/0029_auto_20161118_1601.py @@ -2,9 +2,9 @@ # Generated by Django 1.10.3 on 2016-11-18 15:01 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion import modelcluster.fields +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/personalisation/migrations/0031_auto_20161130_1224.py b/src/personalisation/migrations/0031_auto_20161130_1224.py index 4773d40..8efebc7 100644 --- a/src/personalisation/migrations/0031_auto_20161130_1224.py +++ b/src/personalisation/migrations/0031_auto_20161130_1224.py @@ -2,9 +2,9 @@ # Generated by Django 1.10.3 on 2016-11-30 11:24 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion import modelcluster.fields +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/personalisation/views.py b/src/personalisation/views.py index fb21a34..4a44b49 100644 --- a/src/personalisation/views.py +++ b/src/personalisation/views.py @@ -5,7 +5,6 @@ from django.shortcuts import get_object_or_404, render from django.utils.translation import ugettext_lazy as _ from wagtail.contrib.modeladmin.views import CreateView - from personalisation.forms import SegmentForm from personalisation.models import Segment @@ -39,5 +38,3 @@ class CreateSegmentView(CreateView): form_class = SegmentForm template_name = 'modeladmin/personalisation/segment/create.html' header_icon = 'folder-open-1' - - diff --git a/src/personalisation/wagtail_hooks.py b/src/personalisation/wagtail_hooks.py index dc6ef0d..d36636c 100644 --- a/src/personalisation/wagtail_hooks.py +++ b/src/personalisation/wagtail_hooks.py @@ -6,7 +6,7 @@ from wagtail.contrib.modeladmin.views import IndexView from wagtail.wagtailcore import hooks from personalisation import admin_urls -from personalisation.models import Segment, PersonalisablePage +from personalisation.models import PersonalisablePage, Segment from personalisation.utils import impersonate_other_page diff --git a/tests/conftest.py b/tests/conftest.py index 974b998..5cc1570 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -11,4 +11,3 @@ def django_db_setup(django_db_setup, django_db_blocker): # Remove some initial data that is brought by the sandbox module Site.objects.all().delete() Page.objects.all().exclude(depth=1).delete() - diff --git a/tests/factories/page.py b/tests/factories/page.py index 4c8f0e1..51c182b 100644 --- a/tests/factories/page.py +++ b/tests/factories/page.py @@ -1,9 +1,10 @@ import factory from wagtail.wagtailcore.models import Page -from personalisation.models import PersonalisablePage +from personalisation.models import PersonalisablePage from tests.sandbox.pages.models import HomePage + class PersonalisablePageFactory(factory.DjangoModelFactory): class Meta: model = PersonalisablePage diff --git a/tests/factories/segment.py b/tests/factories/segment.py index 1219b29..2c30df1 100644 --- a/tests/factories/segment.py +++ b/tests/factories/segment.py @@ -1,8 +1,10 @@ import datetime import factory + from personalisation import models + class SegmentFactory(factory.DjangoModelFactory): name = 'TestSegment' status = 'enabled' diff --git a/tests/factories/site.py b/tests/factories/site.py index 03c6fc9..9004ee6 100644 --- a/tests/factories/site.py +++ b/tests/factories/site.py @@ -3,6 +3,7 @@ from wagtail.wagtailcore.models import Site from tests.factories.page import SiteRootFactory + class SiteFactory(factory.DjangoModelFactory): hostname = 'localhost' port = 8000 diff --git a/tests/sandbox/pages/models.py b/tests/sandbox/pages/models.py index 6da83aa..6fc00fb 100644 --- a/tests/sandbox/pages/models.py +++ b/tests/sandbox/pages/models.py @@ -1,6 +1,7 @@ from django.db import models from wagtail.wagtailadmin.edit_handlers import FieldPanel from wagtail.wagtailcore.fields import RichTextField + from personalisation.models import PersonalisablePage diff --git a/tests/sandbox/settings/base.py b/tests/sandbox/settings/base.py index bd44f9c..7d158d4 100644 --- a/tests/sandbox/settings/base.py +++ b/tests/sandbox/settings/base.py @@ -1,6 +1,7 @@ from __future__ import absolute_import, unicode_literals import os + import django DATABASES = { diff --git a/tests/sandbox/urls.py b/tests/sandbox/urls.py index ee6af0b..5d204b6 100644 --- a/tests/sandbox/urls.py +++ b/tests/sandbox/urls.py @@ -7,7 +7,6 @@ from wagtail.wagtailadmin import urls as wagtailadmin_urls from wagtail.wagtailcore import urls as wagtail_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls - urlpatterns = [ url(r'^django-admin/', include(admin.site.urls)), diff --git a/tests/unit/test_factories.py b/tests/unit/test_factories.py index b8d7fd4..5cbd2fd 100644 --- a/tests/unit/test_factories.py +++ b/tests/unit/test_factories.py @@ -3,7 +3,8 @@ import datetime import pytest from personalisation.models import Segment, TimeRule -from tests.factories.segment import SegmentFactory, TimeRuleFactory, ReferralRuleFactory +from tests.factories.segment import ( + ReferralRuleFactory, SegmentFactory, TimeRuleFactory) """Factory tests""" @pytest.mark.django_db @@ -38,4 +39,3 @@ def test_create_segment_with_new_referral_rule(): segment.referral_rule = ReferralRuleFactory(regex_string='test.notest', segment=segment) assert segment.referral_rule.regex_string == 'test.notest' - diff --git a/tests/unit/test_middleware.py b/tests/unit/test_middleware.py index ce065b8..ace5d29 100644 --- a/tests/unit/test_middleware.py +++ b/tests/unit/test_middleware.py @@ -1,11 +1,13 @@ import datetime import pytest +from django.test.client import Client from freezegun import freeze_time -from django.test.client import Client +from tests.factories.segment import ( + ReferralRuleFactory, SegmentFactory, TimeRuleFactory) from tests.factories.site import SiteFactory -from tests.factories.segment import SegmentFactory, TimeRuleFactory, ReferralRuleFactory + @pytest.mark.django_db class TestUserSegmenting(object): diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py index 449ec30..7605f17 100644 --- a/tests/unit/test_models.py +++ b/tests/unit/test_models.py @@ -1,14 +1,13 @@ import datetime import pytest -from freezegun import freeze_time from django.http import HttpRequest +from freezegun import freeze_time from wagtail.wagtailcore.models import Site from personalisation import models from tests.factories.site import SiteFactory - """Time Rule tests""" @freeze_time("10:00:00") def test_create_time_rule(): @@ -51,4 +50,3 @@ def test_test(rf): request.META['SERVER_PORT'] = 8000 assert Site.find_for_request(request) == site -