updates tests

Author: saxix

tests/conftest.py

@@ -33,12 +33,8 @@ def pytest_configure(config):
     if not config.option.enable_selenium:
         setattr(config.option, "markexpr", "not selenium")
 
-    config.addinivalue_line(
-        "markers", "skip_if_ci: this mark skips the tests on GitlabCI"
-    )
-    config.addinivalue_line(
-        "markers", "skip_test_if_env(env): this mark skips the tests for the given env"
-    )
+    config.addinivalue_line("markers", "skip_if_ci: this mark skips the tests on GitlabCI")
+    config.addinivalue_line("markers", "skip_test_if_env(env): this mark skips the tests for the given env")
 
     sys.path.insert(0, os.path.join(os.path.dirname(__file__), "demoapp"))
     os.environ["DJANGO_SETTINGS_MODULE"] = "demo.settings"

tests/demoapp/demo/admin.py

@@ -6,20 +6,23 @@
 from adminfilters.combo import ChoicesFieldComboFilter
 from adminfilters.depot.widget import DepotManager
 from adminfilters.filters import (
+    AdminAutoCompleteSearchMixin,
+    AdminFiltersMixin,
     BooleanRadioFilter,
     DjangoLookupFilter,
     IntersectionFieldListFilter,
+    JsonFieldFilter,
+    MultiValueFilter,
     NumberFilter,
     QueryStringFilter,
     RelatedFieldCheckBoxFilter,
     RelatedFieldRadioFilter,
     UnionFieldListFilter,
     ValueFilter,
 )
-from adminfilters.filters import JsonFieldFilter, AdminAutoCompleteSearchMixin, AdminFiltersMixin, MultiValueFilter
+
 # from adminfilters.mixin import AdminAutoCompleteSearchMixin, AdminFiltersMixin
 # from adminfilters.value import MultiValueFilter
-
 from .models import Artist, Band, City, Country, Region
 
 
@@ -100,20 +103,23 @@ class CityModelAdmin(AdminAutoCompleteSearchMixin, DebugMixin, ModelAdmin):
 class BandModelAdmin(DebugMixin, ModelAdmin):
     list_display = [f.name for f in Band._meta.fields]
     search_fields = ("name",)
-    list_filter = ("genre", ChoicesFieldComboFilter), ("active", BooleanRadioFilter),
+    list_filter = (
+        ("genre", ChoicesFieldComboFilter),
+        ("active", BooleanRadioFilter),
+    )
 
 
 class ArtistModelAdmin(DebugMixin, AdminFiltersMixin, ModelAdmin):
     list_display = [f.name for f in Artist._meta.fields]
     list_filter = (
         DepotManager,
         ("country", AutoCompleteFilter),
-        ('favourite_city__region__country',
-         LinkedAutoCompleteFilter.factory(title='Favourite Country')),
-        ("favourite_city__region",
-         LinkedAutoCompleteFilter.factory(title="Favourite Region", parent='favourite_city__region__country')),
-        ("favourite_city",
-         LinkedAutoCompleteFilter.factory(title="Favourite City", parent='favourite_city__region')),
+        ("favourite_city__region__country", LinkedAutoCompleteFilter.factory(title="Favourite Country")),
+        (
+            "favourite_city__region",
+            LinkedAutoCompleteFilter.factory(title="Favourite Region", parent="favourite_city__region__country"),
+        ),
+        ("favourite_city", LinkedAutoCompleteFilter.factory(title="Favourite City", parent="favourite_city__region")),
         ("year_of_birth", NumberFilter),
         ("bands__name", MultiValueFilter),
         QueryStringFilter,

tests/demoapp/demo/backends.py

@@ -7,18 +7,10 @@ class AnonymousAccessUserBackend(ModelBackend):
     supports_anonymous_user = True
 
     def get_all_permissions(self, user_obj, obj=None):
-        return (
-            Permission.objects.all()
-            .values_list("content_type__app_label", "codename")
-            .order_by()
-        )
+        return Permission.objects.all().values_list("content_type__app_label", "codename").order_by()
 
     def get_group_permissions(self, user_obj, obj=None):
-        return (
-            Permission.objects.all()
-            .values_list("content_type__app_label", "codename")
-            .order_by()
-        )
+        return Permission.objects.all().values_list("content_type__app_label", "codename").order_by()
 
     def has_perm(self, user_obj, perm, obj=None):
         return True

tests/demoapp/demo/factories.py

@@ -17,25 +17,21 @@ def __new__(mcs, class_name, bases, attrs):
         return new_class
 
 
-class ModelFactory(
-    factory.django.DjangoModelFactory, metaclass=AutoRegisterFactoryMetaClass
-):
+class ModelFactory(factory.django.DjangoModelFactory, metaclass=AutoRegisterFactoryMetaClass):
     pass
 
 
 def get_flags():
     # Convert to plain ascii text
-    f = lambda: random.choice(
-        [
-            ("int", random.randint(1, 100)),
-            ("chr", chr(random.randrange(65, 90))),
-            ("int", "__"),
-            ("chr", ""),
-            ("chr", None),
-            ("int", None),
-            ("chr", "__"),
-        ]
-    )
+    f = lambda: random.choice([
+        ("int", random.randint(1, 100)),
+        ("chr", chr(random.randrange(65, 90))),
+        ("int", "__"),
+        ("chr", ""),
+        ("chr", None),
+        ("int", None),
+        ("chr", "__"),
+    ])
     value = f()
     if value[1] == "__":
         base = {}
@@ -86,7 +82,7 @@ class Meta:
 
 
 class RegionFactory(ModelFactory):
-    name = factory.fuzzy.FuzzyChoice(['North', 'South', 'East', 'West'])
+    name = factory.fuzzy.FuzzyChoice(["North", "South", "East", "West"])
     country = factory.SubFactory(CountryFactory)
 
     class Meta:
@@ -114,7 +110,7 @@ class Meta:
 
 class ArtistFactory(ModelFactory):
     name = factory.Faker("first_name")
-    last_name = factory.Sequence(lambda n: f'Dummy{faker.Faker().unique.last_name()}{n}')
+    last_name = factory.Sequence(lambda n: f"Dummy{faker.Faker().unique.last_name()}{n}")
     full_name = factory.LazyAttribute(lambda o: f"{o.last_name}, {o.name}")
     favourite_city = factory.SubFactory(CityFactory)
 

tests/demoapp/demo/management/commands/init_demo.py

@@ -1,16 +1,17 @@
 from urllib.parse import urlencode
 
-from demo.factories import CityFactory, RegionFactory
 from django.core.management import BaseCommand, call_command
 from django.db import IntegrityError
 
 from adminfilters.depot.models import StoredFilter
+from demo.factories import CityFactory, RegionFactory
 
 
 def sample_data():
+    from django.contrib.contenttypes.models import ContentType
+
     from demo.factories import ArtistFactory, BandFactory, CountryFactory, UserFactory
     from demo.models import Artist
-    from django.contrib.contenttypes.models import ContentType
 
     user = UserFactory(username="user")
 
@@ -110,24 +111,20 @@ def sample_data():
         owner=user,
         defaults=dict(
             query_string="?%s"
-            % urlencode(
-                {
-                    "qs": """country__name__istartswith=australia
+            % urlencode({
+                "qs": """country__name__istartswith=australia
 name=Phil
 year_of_birth__gt=1950
 Aactive=true""",
-                    "qs__negate": "false",
-                }
-            ),
+                "qs__negate": "false",
+            }),
             content_type=ct,
         ),
     )
     StoredFilter.objects.update_or_create(
         name="Active Artists",
         owner=user,
-        defaults=dict(
-            query_string="?%s" % urlencode({"qs": "active=true"}), content_type=ct
-        ),
+        defaults=dict(query_string="?%s" % urlencode({"qs": "active=true"}), content_type=ct),
     )
 
     return [acdc, geordie]

tests/demoapp/demo/migrations/0001_initial.py

@@ -48,9 +48,7 @@ class Migration(migrations.Migration):
                 ("name", models.CharField(max_length=255)),
                 (
                     "genre",
-                    models.IntegerField(
-                        choices=[(1, "Rock"), (2, "Blues"), (3, "Soul"), (4, "Other")]
-                    ),
+                    models.IntegerField(choices=[(1, "Rock"), (2, "Blues"), (3, "Soul"), (4, "Other")]),
                 ),
                 ("active", models.BooleanField(default=True)),
             ],
@@ -124,15 +122,11 @@ class Migration(migrations.Migration):
                 ("blank", models.CharField(blank=True, max_length=255, null=True)),
                 (
                     "not_editable",
-                    models.CharField(
-                        blank=True, editable=False, max_length=255, null=True
-                    ),
+                    models.CharField(blank=True, editable=False, max_length=255, null=True),
                 ),
                 (
                     "choices",
-                    models.IntegerField(
-                        choices=[(1, "Choice 1"), (2, "Choice 2"), (3, "Choice 3")]
-                    ),
+                    models.IntegerField(choices=[(1, "Choice 1"), (2, "Choice 2"), (3, "Choice 3")]),
                 ),
             ],
         ),
@@ -183,23 +177,17 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="artist",
             name="bands",
-            field=models.ManyToManyField(
-                related_name="bands", to="demo.band", verbose_name="Bands"
-            ),
+            field=models.ManyToManyField(related_name="bands", to="demo.band", verbose_name="Bands"),
         ),
         migrations.AddField(
             model_name="artist",
             name="favourite_city",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE, to="demo.city"
-            ),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="demo.city"),
         ),
         migrations.AddField(
             model_name="artist",
             name="country",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE, to="demo.country"
-            ),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="demo.country"),
         ),
         migrations.CreateModel(
             name="Region",
@@ -216,9 +204,7 @@ class Migration(migrations.Migration):
                 ("name", models.CharField(max_length=255)),
                 (
                     "country",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE, to="demo.country"
-                    ),
+                    models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="demo.country"),
                 ),
             ],
             options={
@@ -228,8 +214,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="city",
             name="region",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE, to="demo.region"
-            ),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="demo.region"),
         ),
     ]

tests/demoapp/demo/models.py

@@ -32,12 +32,8 @@ class DemoModelField(JSONMixin, models.Model):
     unique = models.CharField(max_length=255, unique=True)
     nullable = models.CharField(max_length=255, null=True)
     blank = models.CharField(max_length=255, blank=True, null=True)
-    not_editable = models.CharField(
-        max_length=255, editable=False, blank=True, null=True
-    )
-    choices = models.IntegerField(
-        choices=((1, "Choice 1"), (2, "Choice 2"), (3, "Choice 3"))
-    )
+    not_editable = models.CharField(max_length=255, editable=False, blank=True, null=True)
+    choices = models.IntegerField(choices=((1, "Choice 1"), (2, "Choice 2"), (3, "Choice 3")))
 
     class Meta:
         app_label = "demo"
@@ -111,6 +107,7 @@ class Meta:
     def __str__(self):
         return self.name
 
+
 #
 # class DemoModel2(models.Model):
 #     name = models.CharField(max_length=255)

tests/demoapp/demo/urls.py

@@ -3,7 +3,7 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.http import HttpResponse
-from django.urls import re_path, path
+from django.urls import path, re_path
 
 from adminfilters.depot.admin import StoredFilterAdmin
 from adminfilters.depot.models import StoredFilter
@@ -23,12 +23,8 @@ def has_permission(self, request):
     models.Artist_RelatedFieldCheckBoxFilter,
     admin.DemoModelAdmin_RelatedFieldCheckBoxFilter,
 )
-public_site.register(
-    models.Artist_RelatedFieldRadioFilter, admin.DemoModelAdmin_RelatedFieldRadioFilter
-)
-public_site.register(
-    models.Artist_UnionFieldListFilter, admin.DemoModelAdmin_UnionFieldListFilter
-)
+public_site.register(models.Artist_RelatedFieldRadioFilter, admin.DemoModelAdmin_RelatedFieldRadioFilter)
+public_site.register(models.Artist_UnionFieldListFilter, admin.DemoModelAdmin_UnionFieldListFilter)
 public_site.register(
     models.Artist_IntersectionFieldListFilter,
     admin.DemoModelAdmin_IntersectionFieldListFilter,

tests/demoapp/demo/utils.py

@@ -144,9 +144,7 @@ def driver(self):
 class CellWrapper(WebElementWrapper):
     @cached_property
     def text(self):
-        return self.element.get_attribute("innerText") or strip_tags(
-            self.element.get_attribute("innerHTML")
-        )
+        return self.element.get_attribute("innerText") or strip_tags(self.element.get_attribute("innerHTML"))
 
 
 class RowWrapper(WebElementWrapper):
@@ -181,9 +179,7 @@ class ChangeListWrapper(EmptyChangeListWrapper):
     @classmethod
     def find_in_page(cls, driver):
         try:
-            return ChangeListWrapper(
-                driver.find_element(By.CSS_SELECTOR, "#changelist-form #result_list")
-            )
+            return ChangeListWrapper(driver.find_element(By.CSS_SELECTOR, "#changelist-form #result_list"))
         except NoSuchElementException:
             return EmptyChangeListWrapper(None)
 
@@ -193,10 +189,7 @@ def header(self) -> [RowWrapper]:
 
     @cached_property
     def rows(self) -> [RowWrapper]:
-        return [
-            RowWrapper(e)
-            for e in self.element.find_elements(By.CSS_SELECTOR, "tbody tr")
-        ]
+        return [RowWrapper(e) for e in self.element.find_elements(By.CSS_SELECTOR, "tbody tr")]
 
     def get_row(self, num):
         return list(self.rows)[num]

tests/demoapp/demo/wsgi.py

@@ -13,6 +13,7 @@
 framework.
 
 """
+
 import os
 
 # This application object is used by any WSGI server configured to use this