If no schedule is selected, raise a non-field error.

Author: arnau126

django_celery_beat/models.py

@@ -536,11 +536,10 @@ def validate_unique(self, *args, **kwargs):
                                    if getattr(self, s)]
 
         if len(selected_schedule_types) == 0:
-            raise ValidationError({
-                'interval': [
-                    'One of clocked, interval, crontab, or solar must be set.'
-                ]
-            })
+            raise ValidationError(
+                'One of clocked, interval, crontab, or solar '
+                'must be set.'
+            )
 
         err_msg = 'Only one of clocked, interval, crontab, '\
             'or solar must be set'

t/unit/test_admin.py

@@ -75,20 +75,37 @@ def test_toggle_action_all_disabled(self):
         self.assertTrue(e2)
         self.assertTrue(e3)
 
-    def test_validate_unique_raises_if_schedule_not_set(self):
-        with self.assertRaises(ValidationError):
-            PeriodicTask().validate_unique()
 
-    def test_save_raises_for_multiple_schedules(self):
+class ValidateUniqueTests(TestCase):
+
+    def test_validate_unique_raises_if_schedule_not_set(self):
+        with self.assertRaises(ValidationError) as cm:
+            PeriodicTask(name='task0').validate_unique()
+        self.assertEquals(
+            cm.exception.args[0],
+            'One of clocked, interval, crontab, or solar must be set.',
+        )
+
+    def test_validate_unique_raises_for_multiple_schedules(self):
         schedules = [
             ('crontab', CrontabSchedule()),
             ('interval', IntervalSchedule()),
             ('solar', SolarSchedule()),
             ('clocked', ClockedSchedule())
         ]
+        expected_error_msg = (
+            'Only one of clocked, interval, crontab, or solar '
+            'must be set'
+        )
         for i, options in enumerate(combinations(schedules, 2)):
-            with self.assertRaises(ValidationError):
-                PeriodicTask(name='task{}'.format(i), **dict(options)).save()
+            name = 'task{}'.format(i)
+            options_dict = dict(options)
+            with self.assertRaises(ValidationError) as cm:
+                PeriodicTask(name=name, **options_dict).validate_unique()
+            errors = cm.exception.args[0]
+            self.assertEquals(errors.keys(), options_dict.keys())
+            for error_msg in errors.values():
+                self.assertEquals(error_msg, [expected_error_msg])
 
     def test_validate_unique_not_raises(self):
         PeriodicTask(crontab=CrontabSchedule()).validate_unique()