7

Changes reference to rule models in adapter and tests

This commit is contained in:
Jasper Berghoef
2017-04-14 11:30:33 +02:00
committed by Boris Besemer
parent 6e566344df
commit d468c68970
4 changed files with 17 additions and 15 deletions

View File

@ -2,7 +2,8 @@ import time
from django.db.models import F
from personalisation.models import AbstractBaseRule, Segment
from personalisation.models import Segment
from personalisation.rules import AbstractBaseRule
class BaseSegmentsAdapter(object):

View File

@ -4,7 +4,7 @@ import datetime
import factory
from personalisation import models
from personalisation import models, rules
class SegmentFactory(factory.DjangoModelFactory):
@ -20,20 +20,20 @@ class TimeRuleFactory(factory.DjangoModelFactory):
end_time = datetime.time(23, 0, 0)
class Meta:
model = models.TimeRule
model = rules.TimeRule
class DayRuleFactory(factory.DjangoModelFactory):
class Meta:
model = models.DayRule
model = rules.DayRule
class ReferralRuleFactory(factory.DjangoModelFactory):
regex_string = "test.test"
class Meta:
model = models.ReferralRule
model = rules.ReferralRule
class VisitCountRuleFactory(factory.DjangoModelFactory):
@ -41,15 +41,15 @@ class VisitCountRuleFactory(factory.DjangoModelFactory):
count = 0
class Meta:
model = models.VisitCountRule
model = rules.VisitCountRule
class QueryRuleFactory(factory.DjangoModelFactory):
class Meta:
model = models.QueryRule
model = rules.QueryRule
class DeviceRuleFactory(factory.DjangoModelFactory):
class Meta:
model = models.DeviceRule
model = rules.DeviceRule

View File

@ -4,7 +4,8 @@ import datetime
import pytest
from personalisation.models import Segment, TimeRule
from personalisation.models import Segment
from personalisation.rules import TimeRule
from tests.factories.segment import (
ReferralRuleFactory, SegmentFactory, TimeRuleFactory, DayRuleFactory, DeviceRuleFactory)

View File

@ -8,37 +8,37 @@ from freezegun import freeze_time
from wagtail.wagtailcore.models import Site
from wagtail_factories import SiteFactory
from personalisation import models
from personalisation import rules
"""Time Rule tests"""
@freeze_time("10:00:00")
def test_create_time_rule():
time_rule = models.TimeRule(start_time=datetime.time(8, 0, 0), end_time=datetime.time(23, 0, 0))
time_rule = rules.TimeRule(start_time=datetime.time(8, 0, 0), end_time=datetime.time(23, 0, 0))
assert time_rule.test_user() is True
@freeze_time("10:00:00")
def test_time_rule_false():
time_rule = models.TimeRule(start_time=datetime.time(11, 0, 0), end_time=datetime.time(23, 0, 0))
time_rule = rules.TimeRule(start_time=datetime.time(11, 0, 0), end_time=datetime.time(23, 0, 0))
assert time_rule.test_user() is False
@freeze_time("10:00:00")
def test_time_rule_reverse():
time_rule = models.TimeRule(start_time=datetime.time(13, 0, 0), end_time=datetime.time(9, 0, 0))
time_rule = rules.TimeRule(start_time=datetime.time(13, 0, 0), end_time=datetime.time(9, 0, 0))
assert time_rule.test_user() is False
@freeze_time("10:00:00")
def test_time_rule_reverse_next_day():
time_rule = models.TimeRule(start_time=datetime.time(11, 0, 0), end_time=datetime.time(11, 0, 0))
time_rule = rules.TimeRule(start_time=datetime.time(11, 0, 0), end_time=datetime.time(11, 0, 0))
assert time_rule.test_user() is False
"""Visit Count Rule tests"""
def test_visit_count_rule():
visit_count_rule = models.VisitCountRule()
visit_count_rule = rules.VisitCountRule()
"""Test test"""