fix: deterministic option sort

Author: czosel

caluma/caluma_form/factories.py

@@ -132,7 +132,7 @@ class Meta:
 class QuestionOptionFactory(DjangoModelFactory):
     option = SubFactory(OptionFactory)
     question = SubFactory(QuestionFactory, type=models.Question.TYPE_CHOICE)
-    sort = 0
+    sort = Faker("pyint")
 
     class Meta:
         model = models.QuestionOption

caluma/caluma_form/tests/__snapshots__/test_document.ambr

@@ -835,7 +835,7 @@
           }),
           dict({
             'node': dict({
-              'label': 'Mary White',
+              'label': 'Robert Skinner',
               'slug': 'anothervalue',
             }),
           }),

caluma/caluma_form/tests/__snapshots__/test_question.ambr

@@ -951,8 +951,8 @@
         '__typename': 'MultipleChoiceQuestion',
         'defaultAnswer': dict({
           'value': list([
+            'successful-job',
             'maybe-stock-capital',
-            'court-ask',
           ]),
         }),
         'hintText': 'test',
@@ -964,14 +964,14 @@
           'edges': list([
             dict({
               'node': dict({
-                'label': 'William Ramos',
-                'slug': 'maybe-stock-capital',
+                'label': 'Jennifer Lee',
+                'slug': 'successful-job',
               }),
             }),
             dict({
               'node': dict({
-                'label': 'Scott Powell',
-                'slug': 'court-ask',
+                'label': 'William Ramos',
+                'slug': 'maybe-stock-capital',
               }),
             }),
           ]),

caluma/caluma_form/tests/test_option.py

@@ -196,9 +196,10 @@ def test_option_is_hidden(
     options = result.data["allDocuments"]["edges"][0]["node"]["answers"]["edges"][0][
         "node"
     ]["question"]["options"]["edges"]
-    expected = [{"node": {"slug": "bar"}}, {"node": {"slug": "thing-piece"}}]
+
+    expected = [{"node": {"slug": "piece-training"}}, {"node": {"slug": "bar"}}]
     if is_hidden:
-        expected = [{"node": {"slug": "thing-piece"}}]
+        expected = [{"node": {"slug": "piece-training"}}]
     assert options == expected
 
 

caluma/caluma_form/tests/test_structure.py

@@ -266,7 +266,10 @@ def test_options(simple_form_structure, form_question_factory, question_option_f
         question__type="choice", form=simple_form_structure.form
     ).question
 
-    opts = question_option_factory.create_batch(4, question=choice_q)
+    opts = sorted(
+        question_option_factory.create_batch(4, question=choice_q),
+        key=lambda x: -x.sort,
+    )
     assert choice_q.options.exists()
 
     fieldset = structure.FieldSet(simple_form_structure)