nautobot 2.4.0__py3-none-any.whl → 2.4.1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of nautobot might be problematic. Click here for more details.

Files changed (40) hide show
  1. nautobot/core/celery/schedulers.py +1 -1
  2. nautobot/core/filters.py +48 -21
  3. nautobot/core/jobs/bulk_actions.py +56 -19
  4. nautobot/core/models/__init__.py +2 -0
  5. nautobot/core/tables.py +5 -1
  6. nautobot/core/testing/filters.py +25 -13
  7. nautobot/core/testing/integration.py +86 -4
  8. nautobot/core/tests/test_filters.py +209 -246
  9. nautobot/core/tests/test_jobs.py +250 -93
  10. nautobot/core/tests/test_models.py +9 -0
  11. nautobot/core/views/generic.py +80 -48
  12. nautobot/core/views/mixins.py +34 -6
  13. nautobot/dcim/api/serializers.py +2 -2
  14. nautobot/dcim/constants.py +6 -13
  15. nautobot/dcim/factory.py +6 -1
  16. nautobot/dcim/tests/integration/test_device_bulk_delete.py +189 -0
  17. nautobot/dcim/tests/integration/test_device_bulk_edit.py +181 -0
  18. nautobot/dcim/tests/test_api.py +0 -2
  19. nautobot/dcim/tests/test_models.py +42 -28
  20. nautobot/extras/forms/mixins.py +1 -1
  21. nautobot/extras/jobs.py +15 -6
  22. nautobot/extras/templatetags/job_buttons.py +4 -4
  23. nautobot/extras/tests/test_forms.py +13 -0
  24. nautobot/extras/tests/test_jobs.py +18 -13
  25. nautobot/extras/tests/test_models.py +6 -0
  26. nautobot/extras/tests/test_views.py +4 -3
  27. nautobot/ipam/tests/test_api.py +20 -0
  28. nautobot/project-static/docs/code-reference/nautobot/apps/testing.html +36 -1
  29. nautobot/project-static/docs/objects.inv +0 -0
  30. nautobot/project-static/docs/release-notes/version-2.4.html +108 -0
  31. nautobot/project-static/docs/search/search_index.json +1 -1
  32. nautobot/project-static/docs/sitemap.xml +288 -288
  33. nautobot/project-static/docs/sitemap.xml.gz +0 -0
  34. nautobot/wireless/tests/test_views.py +22 -1
  35. {nautobot-2.4.0.dist-info → nautobot-2.4.1.dist-info}/METADATA +2 -2
  36. {nautobot-2.4.0.dist-info → nautobot-2.4.1.dist-info}/RECORD +40 -38
  37. {nautobot-2.4.0.dist-info → nautobot-2.4.1.dist-info}/LICENSE.txt +0 -0
  38. {nautobot-2.4.0.dist-info → nautobot-2.4.1.dist-info}/NOTICE +0 -0
  39. {nautobot-2.4.0.dist-info → nautobot-2.4.1.dist-info}/WHEEL +0 -0
  40. {nautobot-2.4.0.dist-info → nautobot-2.4.1.dist-info}/entry_points.txt +0 -0
@@ -482,6 +482,14 @@ class BaseFilterSetTest(TestCase):
482
482
  def setUpTestData(cls):
483
483
  cls.filters = cls.TestFilterSet().filters
484
484
 
485
+ def _test_lookups(self, filter_name, lookups_map, expected_type):
486
+ for key, (exclude, lookup_expr) in lookups_map.items():
487
+ with self.subTest(field=key):
488
+ filter_key = f"{filter_name}__{key}" if key else filter_name
489
+ self.assertIsInstance(self.filters[filter_key], expected_type)
490
+ self.assertEqual(self.filters[filter_key].lookup_expr, lookup_expr)
491
+ self.assertEqual(self.filters[filter_key].exclude, exclude)
492
+
485
493
  def test_generated_lookup_expression_filters(self):
486
494
  """
487
495
  Tests to ensure the internal helper method expands a CharFilter out to all natural lookup expressions.
@@ -542,281 +550,236 @@ class BaseFilterSetTest(TestCase):
542
550
  self.TestFilterSet.add_filter(new_filter_name="charfield", new_filter_field=new_filter_set_field)
543
551
 
544
552
  def test_char_filter(self):
545
- self.assertIsInstance(self.filters["charfield"], django_filters.CharFilter)
546
- self.assertEqual(self.filters["charfield"].lookup_expr, "exact")
547
- self.assertEqual(self.filters["charfield"].exclude, False)
548
- self.assertEqual(self.filters["charfield__n"].lookup_expr, "exact")
549
- self.assertEqual(self.filters["charfield__n"].exclude, True)
550
- self.assertEqual(self.filters["charfield__ie"].lookup_expr, "iexact")
551
- self.assertEqual(self.filters["charfield__ie"].exclude, False)
552
- self.assertEqual(self.filters["charfield__nie"].lookup_expr, "iexact")
553
- self.assertEqual(self.filters["charfield__nie"].exclude, True)
554
- self.assertEqual(self.filters["charfield__ic"].lookup_expr, "icontains")
555
- self.assertEqual(self.filters["charfield__ic"].exclude, False)
556
- self.assertEqual(self.filters["charfield__nic"].lookup_expr, "icontains")
557
- self.assertEqual(self.filters["charfield__nic"].exclude, True)
558
- self.assertEqual(self.filters["charfield__isw"].lookup_expr, "istartswith")
559
- self.assertEqual(self.filters["charfield__isw"].exclude, False)
560
- self.assertEqual(self.filters["charfield__nisw"].lookup_expr, "istartswith")
561
- self.assertEqual(self.filters["charfield__nisw"].exclude, True)
562
- self.assertEqual(self.filters["charfield__iew"].lookup_expr, "iendswith")
563
- self.assertEqual(self.filters["charfield__iew"].exclude, False)
564
- self.assertEqual(self.filters["charfield__niew"].lookup_expr, "iendswith")
565
- self.assertEqual(self.filters["charfield__niew"].exclude, True)
566
- self.assertEqual(self.filters["charfield__re"].lookup_expr, "regex")
567
- self.assertEqual(self.filters["charfield__re"].exclude, False)
568
- self.assertEqual(self.filters["charfield__nre"].lookup_expr, "regex")
569
- self.assertEqual(self.filters["charfield__nre"].exclude, True)
570
- self.assertEqual(self.filters["charfield__ire"].lookup_expr, "iregex")
571
- self.assertEqual(self.filters["charfield__ire"].exclude, False)
572
- self.assertEqual(self.filters["charfield__nire"].lookup_expr, "iregex")
573
- self.assertEqual(self.filters["charfield__nire"].exclude, True)
553
+ char_field_lookups = {
554
+ "": (False, "exact"),
555
+ "n": (True, "exact"),
556
+ "ie": (False, "iexact"),
557
+ "nie": (True, "iexact"),
558
+ "ic": (False, "icontains"),
559
+ "nic": (True, "icontains"),
560
+ "isw": (False, "istartswith"),
561
+ "nisw": (True, "istartswith"),
562
+ "iew": (False, "iendswith"),
563
+ "niew": (True, "iendswith"),
564
+ "re": (False, "regex"),
565
+ "nre": (True, "regex"),
566
+ "ire": (False, "iregex"),
567
+ "nire": (True, "iregex"),
568
+ }
569
+
570
+ self._test_lookups("charfield", char_field_lookups, django_filters.CharFilter)
574
571
 
575
572
  def test_mac_address_filter(self):
576
- self.assertIsInstance(self.filters["macaddressfield"], filters.MACAddressFilter)
577
- self.assertEqual(self.filters["macaddressfield"].lookup_expr, "exact")
578
- self.assertEqual(self.filters["macaddressfield"].exclude, False)
579
- self.assertEqual(self.filters["macaddressfield__n"].lookup_expr, "exact")
580
- self.assertEqual(self.filters["macaddressfield__n"].exclude, True)
581
- self.assertEqual(self.filters["macaddressfield__ie"].lookup_expr, "iexact")
582
- self.assertEqual(self.filters["macaddressfield__ie"].exclude, False)
583
- self.assertEqual(self.filters["macaddressfield__nie"].lookup_expr, "iexact")
584
- self.assertEqual(self.filters["macaddressfield__nie"].exclude, True)
585
- self.assertEqual(self.filters["macaddressfield__ic"].lookup_expr, "icontains")
586
- self.assertEqual(self.filters["macaddressfield__ic"].exclude, False)
587
- self.assertEqual(self.filters["macaddressfield__nic"].lookup_expr, "icontains")
588
- self.assertEqual(self.filters["macaddressfield__nic"].exclude, True)
589
- self.assertEqual(self.filters["macaddressfield__isw"].lookup_expr, "istartswith")
590
- self.assertEqual(self.filters["macaddressfield__isw"].exclude, False)
591
- self.assertEqual(self.filters["macaddressfield__nisw"].lookup_expr, "istartswith")
592
- self.assertEqual(self.filters["macaddressfield__nisw"].exclude, True)
593
- self.assertEqual(self.filters["macaddressfield__iew"].lookup_expr, "iendswith")
594
- self.assertEqual(self.filters["macaddressfield__iew"].exclude, False)
595
- self.assertEqual(self.filters["macaddressfield__niew"].lookup_expr, "iendswith")
596
- self.assertEqual(self.filters["macaddressfield__niew"].exclude, True)
597
- self.assertEqual(self.filters["macaddressfield__re"].lookup_expr, "regex")
598
- self.assertEqual(self.filters["macaddressfield__re"].exclude, False)
599
- self.assertEqual(self.filters["macaddressfield__nre"].lookup_expr, "regex")
600
- self.assertEqual(self.filters["macaddressfield__nre"].exclude, True)
601
- self.assertEqual(self.filters["macaddressfield__ire"].lookup_expr, "iregex")
602
- self.assertEqual(self.filters["macaddressfield__ire"].exclude, False)
603
- self.assertEqual(self.filters["macaddressfield__nire"].lookup_expr, "iregex")
604
- self.assertEqual(self.filters["macaddressfield__nire"].exclude, True)
573
+ mac_address_field_lookups = {
574
+ "": (False, "exact"),
575
+ "n": (True, "exact"),
576
+ "ie": (False, "iexact"),
577
+ "nie": (True, "iexact"),
578
+ "ic": (False, "icontains"),
579
+ "nic": (True, "icontains"),
580
+ "isw": (False, "istartswith"),
581
+ "nisw": (True, "istartswith"),
582
+ "iew": (False, "iendswith"),
583
+ "niew": (True, "iendswith"),
584
+ "re": (False, "regex"),
585
+ "nre": (True, "regex"),
586
+ "ire": (False, "iregex"),
587
+ "nire": (True, "iregex"),
588
+ }
589
+
590
+ self._test_lookups("macaddressfield", mac_address_field_lookups, filters.MACAddressFilter)
605
591
 
606
592
  def test_model_choice_filter(self):
607
- self.assertIsInstance(self.filters["modelchoicefield"], django_filters.ModelChoiceFilter)
608
- self.assertEqual(self.filters["modelchoicefield"].lookup_expr, "exact")
609
- self.assertEqual(self.filters["modelchoicefield"].exclude, False)
610
- self.assertEqual(self.filters["modelchoicefield__n"].lookup_expr, "exact")
611
- self.assertEqual(self.filters["modelchoicefield__n"].exclude, True)
593
+ model_choice_field_lookups = {
594
+ "": (False, "exact"),
595
+ "n": (True, "exact"),
596
+ }
597
+
598
+ self._test_lookups("modelchoicefield", model_choice_field_lookups, django_filters.ModelChoiceFilter)
612
599
 
613
600
  def test_model_multiple_choice_filter(self):
614
- self.assertIsInstance(
615
- self.filters["modelmultiplechoicefield"],
616
- django_filters.ModelMultipleChoiceFilter,
601
+ model_multiple_choice_field_lookups = {
602
+ "": (False, "exact"),
603
+ "n": (True, "exact"),
604
+ }
605
+
606
+ self._test_lookups(
607
+ "modelmultiplechoicefield", model_multiple_choice_field_lookups, django_filters.ModelMultipleChoiceFilter
617
608
  )
618
- self.assertEqual(self.filters["modelmultiplechoicefield"].lookup_expr, "exact")
619
- self.assertEqual(self.filters["modelmultiplechoicefield"].exclude, False)
620
- self.assertEqual(self.filters["modelmultiplechoicefield__n"].lookup_expr, "exact")
621
- self.assertEqual(self.filters["modelmultiplechoicefield__n"].exclude, True)
622
609
 
623
610
  def test_multi_value_char_filter(self):
624
- self.assertIsInstance(self.filters["multivaluecharfield"], filters.MultiValueCharFilter)
625
- self.assertEqual(self.filters["multivaluecharfield"].lookup_expr, "exact")
626
- self.assertEqual(self.filters["multivaluecharfield"].exclude, False)
627
- self.assertEqual(self.filters["multivaluecharfield__n"].lookup_expr, "exact")
628
- self.assertEqual(self.filters["multivaluecharfield__n"].exclude, True)
629
- self.assertEqual(self.filters["multivaluecharfield__ie"].lookup_expr, "iexact")
630
- self.assertEqual(self.filters["multivaluecharfield__ie"].exclude, False)
631
- self.assertEqual(self.filters["multivaluecharfield__nie"].lookup_expr, "iexact")
632
- self.assertEqual(self.filters["multivaluecharfield__nie"].exclude, True)
633
- self.assertEqual(self.filters["multivaluecharfield__ic"].lookup_expr, "icontains")
634
- self.assertEqual(self.filters["multivaluecharfield__ic"].exclude, False)
635
- self.assertEqual(self.filters["multivaluecharfield__nic"].lookup_expr, "icontains")
636
- self.assertEqual(self.filters["multivaluecharfield__nic"].exclude, True)
637
- self.assertEqual(self.filters["multivaluecharfield__isw"].lookup_expr, "istartswith")
638
- self.assertEqual(self.filters["multivaluecharfield__isw"].exclude, False)
639
- self.assertEqual(self.filters["multivaluecharfield__nisw"].lookup_expr, "istartswith")
640
- self.assertEqual(self.filters["multivaluecharfield__nisw"].exclude, True)
641
- self.assertEqual(self.filters["multivaluecharfield__iew"].lookup_expr, "iendswith")
642
- self.assertEqual(self.filters["multivaluecharfield__iew"].exclude, False)
643
- self.assertEqual(self.filters["multivaluecharfield__niew"].lookup_expr, "iendswith")
644
- self.assertEqual(self.filters["multivaluecharfield__niew"].exclude, True)
645
- self.assertEqual(self.filters["multivaluecharfield__re"].lookup_expr, "regex")
646
- self.assertEqual(self.filters["multivaluecharfield__re"].exclude, False)
647
- self.assertEqual(self.filters["multivaluecharfield__nre"].lookup_expr, "regex")
648
- self.assertEqual(self.filters["multivaluecharfield__nre"].exclude, True)
649
- self.assertEqual(self.filters["multivaluecharfield__ire"].lookup_expr, "iregex")
650
- self.assertEqual(self.filters["multivaluecharfield__ire"].exclude, False)
651
- self.assertEqual(self.filters["multivaluecharfield__nire"].lookup_expr, "iregex")
652
- self.assertEqual(self.filters["multivaluecharfield__nire"].exclude, True)
611
+ multi_value_char_field_lookups = {
612
+ "": (False, "exact"),
613
+ "n": (True, "exact"),
614
+ "ie": (False, "iexact"),
615
+ "nie": (True, "iexact"),
616
+ "ic": (False, "icontains"),
617
+ "nic": (True, "icontains"),
618
+ "isw": (False, "istartswith"),
619
+ "nisw": (True, "istartswith"),
620
+ "iew": (False, "iendswith"),
621
+ "niew": (True, "iendswith"),
622
+ "re": (False, "regex"),
623
+ "nre": (True, "regex"),
624
+ "ire": (False, "iregex"),
625
+ "nire": (True, "iregex"),
626
+ }
627
+
628
+ self._test_lookups("multivaluecharfield", multi_value_char_field_lookups, filters.MultiValueCharFilter)
653
629
 
654
630
  def test_textfield_multi_value_char_filter(self):
655
- self.assertIsInstance(self.filters["textfield"], filters.MultiValueCharFilter)
656
- self.assertEqual(self.filters["textfield"].lookup_expr, "exact")
657
- self.assertEqual(self.filters["textfield"].exclude, False)
658
- self.assertEqual(self.filters["textfield__n"].lookup_expr, "exact")
659
- self.assertEqual(self.filters["textfield__n"].exclude, True)
660
- self.assertEqual(self.filters["textfield__ie"].lookup_expr, "iexact")
661
- self.assertEqual(self.filters["textfield__ie"].exclude, False)
662
- self.assertEqual(self.filters["textfield__nie"].lookup_expr, "iexact")
663
- self.assertEqual(self.filters["textfield__nie"].exclude, True)
664
- self.assertEqual(self.filters["textfield__ic"].lookup_expr, "icontains")
665
- self.assertEqual(self.filters["textfield__ic"].exclude, False)
666
- self.assertEqual(self.filters["textfield__nic"].lookup_expr, "icontains")
667
- self.assertEqual(self.filters["textfield__nic"].exclude, True)
668
- self.assertEqual(self.filters["textfield__isw"].lookup_expr, "istartswith")
669
- self.assertEqual(self.filters["textfield__isw"].exclude, False)
670
- self.assertEqual(self.filters["textfield__nisw"].lookup_expr, "istartswith")
671
- self.assertEqual(self.filters["textfield__nisw"].exclude, True)
672
- self.assertEqual(self.filters["textfield__iew"].lookup_expr, "iendswith")
673
- self.assertEqual(self.filters["textfield__iew"].exclude, False)
674
- self.assertEqual(self.filters["textfield__niew"].lookup_expr, "iendswith")
675
- self.assertEqual(self.filters["textfield__niew"].exclude, True)
676
- self.assertEqual(self.filters["textfield__re"].lookup_expr, "regex")
677
- self.assertEqual(self.filters["textfield__re"].exclude, False)
678
- self.assertEqual(self.filters["textfield__nre"].lookup_expr, "regex")
679
- self.assertEqual(self.filters["textfield__nre"].exclude, True)
680
- self.assertEqual(self.filters["textfield__ire"].lookup_expr, "iregex")
681
- self.assertEqual(self.filters["textfield__ire"].exclude, False)
682
- self.assertEqual(self.filters["textfield__nire"].lookup_expr, "iregex")
683
- self.assertEqual(self.filters["textfield__nire"].exclude, True)
631
+ text_field_lookups = {
632
+ "": (False, "exact"),
633
+ "n": (True, "exact"),
634
+ "ie": (False, "iexact"),
635
+ "nie": (True, "iexact"),
636
+ "ic": (False, "icontains"),
637
+ "nic": (True, "icontains"),
638
+ "isw": (False, "istartswith"),
639
+ "nisw": (True, "istartswith"),
640
+ "iew": (False, "iendswith"),
641
+ "niew": (True, "iendswith"),
642
+ "re": (False, "regex"),
643
+ "nre": (True, "regex"),
644
+ "ire": (False, "iregex"),
645
+ "nire": (True, "iregex"),
646
+ }
647
+
648
+ self._test_lookups("textfield", text_field_lookups, filters.MultiValueCharFilter)
684
649
 
685
650
  def test_multi_value_date_filter(self):
686
- self.assertIsInstance(self.filters["datefield"], filters.MultiValueDateFilter)
687
- self.assertEqual(self.filters["datefield"].lookup_expr, "exact")
688
- self.assertEqual(self.filters["datefield"].exclude, False)
689
- self.assertEqual(self.filters["datefield__n"].lookup_expr, "exact")
690
- self.assertEqual(self.filters["datefield__n"].exclude, True)
691
- self.assertEqual(self.filters["datefield__lt"].lookup_expr, "lt")
692
- self.assertEqual(self.filters["datefield__lt"].exclude, False)
693
- self.assertEqual(self.filters["datefield__lte"].lookup_expr, "lte")
694
- self.assertEqual(self.filters["datefield__lte"].exclude, False)
695
- self.assertEqual(self.filters["datefield__gt"].lookup_expr, "gt")
696
- self.assertEqual(self.filters["datefield__gt"].exclude, False)
697
- self.assertEqual(self.filters["datefield__gte"].lookup_expr, "gte")
698
- self.assertEqual(self.filters["datefield__gte"].exclude, False)
651
+ date_field_lookups = {
652
+ "": (False, "exact"),
653
+ "n": (True, "exact"),
654
+ "lt": (False, "lt"),
655
+ "lte": (False, "lte"),
656
+ "gt": (False, "gt"),
657
+ "gte": (False, "gte"),
658
+ }
659
+
660
+ self._test_lookups("datefield", date_field_lookups, filters.MultiValueDateFilter)
699
661
 
700
662
  def test_multi_value_datetime_filter(self):
701
- self.assertIsInstance(self.filters["datetimefield"], filters.MultiValueDateTimeFilter)
702
- self.assertEqual(self.filters["datetimefield"].lookup_expr, "exact")
703
- self.assertEqual(self.filters["datetimefield"].exclude, False)
704
- self.assertEqual(self.filters["datetimefield__n"].lookup_expr, "exact")
705
- self.assertEqual(self.filters["datetimefield__n"].exclude, True)
706
- self.assertEqual(self.filters["datetimefield__lt"].lookup_expr, "lt")
707
- self.assertEqual(self.filters["datetimefield__lt"].exclude, False)
708
- self.assertEqual(self.filters["datetimefield__lte"].lookup_expr, "lte")
709
- self.assertEqual(self.filters["datetimefield__lte"].exclude, False)
710
- self.assertEqual(self.filters["datetimefield__gt"].lookup_expr, "gt")
711
- self.assertEqual(self.filters["datetimefield__gt"].exclude, False)
712
- self.assertEqual(self.filters["datetimefield__gte"].lookup_expr, "gte")
713
- self.assertEqual(self.filters["datetimefield__gte"].exclude, False)
663
+ datetime_field_lookups = {
664
+ "": (False, "exact"),
665
+ "n": (True, "exact"),
666
+ "lt": (False, "lt"),
667
+ "lte": (False, "lte"),
668
+ "gt": (False, "gt"),
669
+ "gte": (False, "gte"),
670
+ }
671
+
672
+ self._test_lookups("datetimefield", datetime_field_lookups, filters.MultiValueDateTimeFilter)
714
673
 
715
674
  def test_multi_value_number_filter(self):
716
- self.assertIsInstance(self.filters["integerfield"], filters.MultiValueNumberFilter)
717
- self.assertEqual(self.filters["integerfield"].lookup_expr, "exact")
718
- self.assertEqual(self.filters["integerfield"].exclude, False)
719
- self.assertEqual(self.filters["integerfield__n"].lookup_expr, "exact")
720
- self.assertEqual(self.filters["integerfield__n"].exclude, True)
721
- self.assertEqual(self.filters["integerfield__lt"].lookup_expr, "lt")
722
- self.assertEqual(self.filters["integerfield__lt"].exclude, False)
723
- self.assertEqual(self.filters["integerfield__lte"].lookup_expr, "lte")
724
- self.assertEqual(self.filters["integerfield__lte"].exclude, False)
725
- self.assertEqual(self.filters["integerfield__gt"].lookup_expr, "gt")
726
- self.assertEqual(self.filters["integerfield__gt"].exclude, False)
727
- self.assertEqual(self.filters["integerfield__gte"].lookup_expr, "gte")
728
- self.assertEqual(self.filters["integerfield__gte"].exclude, False)
675
+ integer_field_lookups = {
676
+ "": (False, "exact"),
677
+ "n": (True, "exact"),
678
+ "lt": (False, "lt"),
679
+ "lte": (False, "lte"),
680
+ "gt": (False, "gt"),
681
+ "gte": (False, "gte"),
682
+ }
683
+
684
+ self._test_lookups("integerfield", integer_field_lookups, filters.MultiValueNumberFilter)
729
685
 
730
686
  def test_multi_value_decimal_filter(self):
731
- self.assertIsInstance(self.filters["decimalfield"], filters.MultiValueDecimalFilter)
732
- self.assertEqual(self.filters["decimalfield"].lookup_expr, "exact")
733
- self.assertEqual(self.filters["decimalfield"].exclude, False)
734
- self.assertEqual(self.filters["decimalfield__n"].lookup_expr, "exact")
735
- self.assertEqual(self.filters["decimalfield__n"].exclude, True)
736
- self.assertEqual(self.filters["decimalfield__lt"].lookup_expr, "lt")
737
- self.assertEqual(self.filters["decimalfield__lt"].exclude, False)
738
- self.assertEqual(self.filters["decimalfield__lte"].lookup_expr, "lte")
739
- self.assertEqual(self.filters["decimalfield__lte"].exclude, False)
740
- self.assertEqual(self.filters["decimalfield__gt"].lookup_expr, "gt")
741
- self.assertEqual(self.filters["decimalfield__gt"].exclude, False)
742
- self.assertEqual(self.filters["decimalfield__gte"].lookup_expr, "gte")
743
- self.assertEqual(self.filters["decimalfield__gte"].exclude, False)
687
+ decimal_field_lookups = {
688
+ "": (False, "exact"),
689
+ "n": (True, "exact"),
690
+ "lt": (False, "lt"),
691
+ "lte": (False, "lte"),
692
+ "gt": (False, "gt"),
693
+ "gte": (False, "gte"),
694
+ }
695
+
696
+ self._test_lookups("decimalfield", decimal_field_lookups, filters.MultiValueDecimalFilter)
744
697
 
745
698
  def test_multi_value_float_filter(self):
746
- self.assertIsInstance(self.filters["floatfield"], filters.MultiValueFloatFilter)
747
- self.assertEqual(self.filters["floatfield"].lookup_expr, "exact")
748
- self.assertEqual(self.filters["floatfield"].exclude, False)
749
- self.assertEqual(self.filters["floatfield__n"].lookup_expr, "exact")
750
- self.assertEqual(self.filters["floatfield__n"].exclude, True)
751
- self.assertEqual(self.filters["floatfield__lt"].lookup_expr, "lt")
752
- self.assertEqual(self.filters["floatfield__lt"].exclude, False)
753
- self.assertEqual(self.filters["floatfield__lte"].lookup_expr, "lte")
754
- self.assertEqual(self.filters["floatfield__lte"].exclude, False)
755
- self.assertEqual(self.filters["floatfield__gt"].lookup_expr, "gt")
756
- self.assertEqual(self.filters["floatfield__gt"].exclude, False)
757
- self.assertEqual(self.filters["floatfield__gte"].lookup_expr, "gte")
758
- self.assertEqual(self.filters["floatfield__gte"].exclude, False)
699
+ float_field_lookups = {
700
+ "": (False, "exact"),
701
+ "n": (True, "exact"),
702
+ "lt": (False, "lt"),
703
+ "lte": (False, "lte"),
704
+ "gt": (False, "gt"),
705
+ "gte": (False, "gte"),
706
+ }
707
+
708
+ self._test_lookups("floatfield", float_field_lookups, filters.MultiValueFloatFilter)
759
709
 
760
710
  def test_multi_value_time_filter(self):
761
- self.assertIsInstance(self.filters["timefield"], filters.MultiValueTimeFilter)
762
- self.assertEqual(self.filters["timefield"].lookup_expr, "exact")
763
- self.assertEqual(self.filters["timefield"].exclude, False)
764
- self.assertEqual(self.filters["timefield__n"].lookup_expr, "exact")
765
- self.assertEqual(self.filters["timefield__n"].exclude, True)
766
- self.assertEqual(self.filters["timefield__lt"].lookup_expr, "lt")
767
- self.assertEqual(self.filters["timefield__lt"].exclude, False)
768
- self.assertEqual(self.filters["timefield__lte"].lookup_expr, "lte")
769
- self.assertEqual(self.filters["timefield__lte"].exclude, False)
770
- self.assertEqual(self.filters["timefield__gt"].lookup_expr, "gt")
771
- self.assertEqual(self.filters["timefield__gt"].exclude, False)
772
- self.assertEqual(self.filters["timefield__gte"].lookup_expr, "gte")
773
- self.assertEqual(self.filters["timefield__gte"].exclude, False)
711
+ time_field_lookups = {
712
+ "": (False, "exact"),
713
+ "n": (True, "exact"),
714
+ "lt": (False, "lt"),
715
+ "lte": (False, "lte"),
716
+ "gt": (False, "gt"),
717
+ "gte": (False, "gte"),
718
+ }
719
+
720
+ self._test_lookups("timefield", time_field_lookups, filters.MultiValueTimeFilter)
774
721
 
775
722
  def test_multiple_choice_filter(self):
776
- for field in ["multiplechoicefield", "charchoicefield", "choicefield"]:
777
- self.assertIsInstance(self.filters[field], django_filters.MultipleChoiceFilter)
778
- self.assertEqual(self.filters[field].lookup_expr, "exact")
779
- self.assertEqual(self.filters[field].exclude, False)
780
- self.assertEqual(self.filters[f"{field}__n"].lookup_expr, "exact")
781
- self.assertEqual(self.filters[f"{field}__n"].exclude, True)
782
- self.assertEqual(self.filters[f"{field}__ie"].lookup_expr, "iexact")
783
- self.assertEqual(self.filters[f"{field}__ie"].exclude, False)
784
- self.assertEqual(self.filters[f"{field}__nie"].lookup_expr, "iexact")
785
- self.assertEqual(self.filters[f"{field}__nie"].exclude, True)
786
- self.assertEqual(self.filters[f"{field}__ic"].lookup_expr, "icontains")
787
- self.assertEqual(self.filters[f"{field}__ic"].exclude, False)
788
- self.assertEqual(self.filters[f"{field}__nic"].lookup_expr, "icontains")
789
- self.assertEqual(self.filters[f"{field}__nic"].exclude, True)
790
- self.assertEqual(self.filters[f"{field}__isw"].lookup_expr, "istartswith")
791
- self.assertEqual(self.filters[f"{field}__isw"].exclude, False)
792
- self.assertEqual(self.filters[f"{field}__nisw"].lookup_expr, "istartswith")
793
- self.assertEqual(self.filters[f"{field}__nisw"].exclude, True)
794
- self.assertEqual(self.filters[f"{field}__iew"].lookup_expr, "iendswith")
795
- self.assertEqual(self.filters[f"{field}__iew"].exclude, False)
796
- self.assertEqual(self.filters[f"{field}__niew"].lookup_expr, "iendswith")
797
- self.assertEqual(self.filters[f"{field}__niew"].exclude, True)
798
- self.assertEqual(self.filters[f"{field}__re"].lookup_expr, "regex")
799
- self.assertEqual(self.filters[f"{field}__re"].exclude, False)
800
- self.assertEqual(self.filters[f"{field}__nre"].lookup_expr, "regex")
801
- self.assertEqual(self.filters[f"{field}__nre"].exclude, True)
802
- self.assertEqual(self.filters[f"{field}__ire"].lookup_expr, "iregex")
803
- self.assertEqual(self.filters[f"{field}__ire"].exclude, False)
804
- self.assertEqual(self.filters[f"{field}__nire"].lookup_expr, "iregex")
805
- self.assertEqual(self.filters[f"{field}__nire"].exclude, True)
723
+ choice_field_lookups = {
724
+ "": (False, "exact"),
725
+ "n": (True, "exact"),
726
+ "ie": (False, "iexact"),
727
+ "nie": (True, "iexact"),
728
+ "ic": (False, "icontains"),
729
+ "nic": (True, "icontains"),
730
+ "isw": (False, "istartswith"),
731
+ "nisw": (True, "istartswith"),
732
+ "iew": (False, "iendswith"),
733
+ "niew": (True, "iendswith"),
734
+ "re": (False, "regex"),
735
+ "nre": (True, "regex"),
736
+ "ire": (False, "iregex"),
737
+ "nire": (True, "iregex"),
738
+ }
739
+
740
+ for field in ["charchoicefield", "choicefield"]:
741
+ self._test_lookups(field, choice_field_lookups, django_filters.MultipleChoiceFilter)
742
+
743
+ def test_multiple_choice_filter_has_different_type_for_lookups(self):
744
+ choice_field_lookups = {
745
+ "": (False, "exact"),
746
+ "n": (True, "exact"),
747
+ }
748
+
749
+ self._test_lookups("multiplechoicefield", choice_field_lookups, django_filters.MultipleChoiceFilter)
750
+
751
+ string_type_lookups = {
752
+ "ie": (False, "iexact"),
753
+ "nie": (True, "iexact"),
754
+ "ic": (False, "icontains"),
755
+ "nic": (True, "icontains"),
756
+ "isw": (False, "istartswith"),
757
+ "nisw": (True, "istartswith"),
758
+ "iew": (False, "iendswith"),
759
+ "niew": (True, "iendswith"),
760
+ "re": (False, "regex"),
761
+ "nre": (True, "regex"),
762
+ "ire": (False, "iregex"),
763
+ "nire": (True, "iregex"),
764
+ }
765
+
766
+ self._test_lookups("multiplechoicefield", string_type_lookups, filters.MultiValueCharFilter)
806
767
 
807
768
  def test_tag_filter(self):
808
- self.assertIsInstance(self.filters["tags"], filters.TagFilter)
809
- self.assertEqual(self.filters["tags"].lookup_expr, "exact")
810
- self.assertEqual(self.filters["tags"].exclude, False)
811
- self.assertEqual(self.filters["tags__n"].lookup_expr, "exact")
812
- self.assertEqual(self.filters["tags__n"].exclude, True)
769
+ tags_lookups = {
770
+ "": (False, "exact"),
771
+ "n": (True, "exact"),
772
+ }
773
+
774
+ self._test_lookups("tags", tags_lookups, filters.TagFilter)
813
775
 
814
776
  def test_tree_node_multiple_choice_filter(self):
815
- self.assertIsInstance(self.filters["treeforeignkeyfield"], filters.TreeNodeMultipleChoiceFilter)
816
- self.assertEqual(self.filters["treeforeignkeyfield"].lookup_expr, "exact")
817
- self.assertEqual(self.filters["treeforeignkeyfield"].exclude, False)
818
- self.assertEqual(self.filters["treeforeignkeyfield__n"].lookup_expr, "exact")
819
- self.assertEqual(self.filters["treeforeignkeyfield__n"].exclude, True)
777
+ tree_foreign_key_lookups = {
778
+ "": (False, "exact"),
779
+ "n": (True, "exact"),
780
+ }
781
+
782
+ self._test_lookups("treeforeignkeyfield", tree_foreign_key_lookups, filters.TreeNodeMultipleChoiceFilter)
820
783
 
821
784
 
822
785
  class DynamicFilterLookupExpressionTest(TestCase):