Merge branch 'release/6.7.5'

CHANGES.rst

@@ -1,5 +1,10 @@
 CHANGE LOG
 ==========
+6.7.5
+-----
+- Bugfix: Handle errors when testing invalid rules
+- Upgrade wagtail-personalisation-molo to 0.11.3
+
 6.7.4
 -----
 - Upgrade wagtail-personalisation-molo to 0.11.2

VERSION

@@ -1 +1 @@
-6.7.4
+6.7.5

molo/surveys/rules.py

@@ -4,7 +4,7 @@
 from django import forms
 from django.apps import apps
 from django.conf import settings
-from django.core.exceptions import ValidationError
+from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.db import models
 from django.test.client import RequestFactory
 from django.utils import six, timezone
@@ -297,7 +297,11 @@ def test_user(self, request, user=None):
         if not user:
             return False
 
-        submission_class = self.survey.get_submission_class()
+        # Django formsets don't honour 'required' fields so check rule is valid
+        try:
+            submission_class = self.survey.get_submission_class()
+        except ObjectDoesNotExist:
+            return False
 
         return submission_class.objects.filter(
             user=user,
@@ -463,6 +467,12 @@ def test_user(self, request, user=None):
             # Return false if we don't have a user or a request
             return False
 
+        # Django formsets don't honour 'required' fields so check rule is valid
+        try:
+            self.tag
+        except ObjectDoesNotExist:
+            return False
+
         from wagtail_personalisation.adapters import get_segment_adapter
         operator = self.OPERATORS[self.operator]
         adapter = get_segment_adapter(request)

molo/surveys/tests/test_rules.py

@@ -415,6 +415,11 @@ def test_other_user_submitted_fails(self):
         self.request.user = new_user
         self.assertTrue(rule.test_user(self.request))
 
+    def test_call_test_user_on_invalid_rule_fails(self):
+        self.submit_survey(self.survey, self.user)
+        rule = SurveyResponseRule()
+        self.assertFalse(rule.test_user(None, self.request.user))
+
     def test_call_test_user_without_request(self):
         self.submit_survey(self.survey, self.user)
         rule = SurveyResponseRule(survey=self.survey)
@@ -644,6 +649,11 @@ def test_visting_non_tagged_page_isnt_error(self):
         self.adapter.add_page_visit(self.main)
         self.assertFalse(self.request.session['tag_count'])
 
+    def test_call_test_user_on_invalid_rule_fails(self):
+        rule = ArticleTagRule()
+        self.adapter.add_page_visit(self.article)
+        self.assertFalse(rule.test_user(None, self.request.user))
+
     def test_call_test_user_without_request(self):
         rule = ArticleTagRule(
             tag=self.tag,

requirements.txt

@@ -3,7 +3,7 @@ celery<4.0
 dateparser>=0.7.0,<0.8.0
 django-celery
 wagtailsurveys==0.1.1
-wagtail-personalisation-molo==0.11.2
+wagtail-personalisation-molo==0.11.3
 psycopg2
 html5lib==0.9999999
 six==1.11.0