test

Author: David Farrington

jazzmin/utils.py

@@ -150,7 +150,16 @@ def get_view_permissions(user: AbstractUser) -> Set[str]:
     lower_perms = []
     for perm in perms:
         app, perm_codename = perm.split(".")
+<<<<<<< HEAD
         lower_perms.append("{app}.{perm_codename}".format(app=app, perm_codename=perm_codename.lower()))
+=======
+        lower_perms.append(
+            "{app}.{perm_codename}".format(
+                app=app,
+                perm_codename=perm_codename.lower(),
+            )
+        )
+>>>>>>> 3ec6d11 (test)
     return {x.replace("view_", "") for x in lower_perms if "view" in x or "change" in x}
 
 
@@ -208,7 +217,15 @@ def make_menu(
         # App links
         elif "app" in link and allow_appmenus:
             children = [
+<<<<<<< HEAD
                 {"name": child.get("verbose_name", child["name"]), "url": child["url"], "children": None}
+=======
+                {
+                    "name": child.get("verbose_name", child["name"]),
+                    "url": child["url"],
+                    "children": None,
+                }
+>>>>>>> 3ec6d11 (test)
                 for child in get_app_admin_urls(link["app"], admin_site=admin_site)
                 if child["model"] in model_permissions
             ]

tests/test_app/library/settings.py

@@ -71,15 +71,25 @@
 
 DATABASES = {
     "default": dj_database_url.config(
-        env="DATABASE_URL", conn_max_age=500, default="sqlite:///{}".format(os.path.join(BASE_DIR, "db.sqlite3")),
+        env="DATABASE_URL",
+        conn_max_age=500,
+        default="sqlite:///{}".format(os.path.join(BASE_DIR, "db.sqlite3")),
     )
 }
 
 AUTH_PASSWORD_VALIDATORS = [
-    {"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",},
-    {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",},
-    {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",},
-    {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",},
+    {
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
+    },
 ]
 
 LANGUAGE_CODE = "en"
@@ -134,7 +144,11 @@
         # Url that gets reversed (Permissions can be added)
         {"name": "Home", "url": "admin:index", "permissions": ["auth.view_user"]},
         # external url that opens in a new window (Permissions can be added)
-        {"name": "Support", "url": "https://github.com/farridav/django-jazzmin/issues", "new_window": True,},
+        {
+            "name": "Support",
+            "url": "https://github.com/farridav/django-jazzmin/issues",
+            "new_window": True,
+        },
         # model admin to link to (Permissions checked against model)
         {"model": "auth.User"},
         # App with dropdown menu to all its models pages (Permissions checked against models)
@@ -146,7 +160,11 @@
     #############
     # Additional links to include in the user menu on the top right ('app' url type is not allowed)
     "usermenu_links": [
-        {"name": "Support", "url": "https://github.com/farridav/django-jazzmin/issues", "new_window": True,},
+        {
+            "name": "Support",
+            "url": "https://github.com/farridav/django-jazzmin/issues",
+            "new_window": True,
+        },
         {"model": "auth.user"},
     ],
     #############

tests/test_jazzmin_menus.py

@@ -1,6 +1,5 @@
 import pytest
 from django.contrib.admin import site
-from django.template import Context
 from django.urls import reverse
 
 from jazzmin.templatetags.jazzmin import get_side_menu
@@ -24,10 +23,21 @@ def test_side_menu(admin_client, settings):
 
     assert parse_sidemenu(response) == {
         "Administration": ["/en/admin/admin/logentry/"],
-        "Authentication and Authorization": ["/en/admin/auth/group/", "/en/admin/auth/user/",],
-        "Books": ["/en/admin/books/author/", "/en/admin/books/book/", "/en/admin/books/genre/",],
+        "Authentication and Authorization": [
+            "/en/admin/auth/group/",
+            "/en/admin/auth/user/",
+        ],
+        "Books": [
+            "/en/admin/books/author/",
+            "/en/admin/books/book/",
+            "/en/admin/books/genre/",
+        ],
         "Global": ["/en/admin/"],
-        "Loans": ["/make_messages/", "/en/admin/loans/bookloan/", "/en/admin/loans/library/",],
+        "Loans": [
+            "/make_messages/",
+            "/en/admin/loans/bookloan/",
+            "/en/admin/loans/library/",
+        ],
     }
 
     settings.JAZZMIN_SETTINGS = override_jazzmin_settings(hide_models=["auth.user"])
@@ -36,8 +46,16 @@ def test_side_menu(admin_client, settings):
     assert parse_sidemenu(response) == {
         "Global": ["/en/admin/"],
         "Authentication and Authorization": ["/en/admin/auth/group/"],
-        "Books": ["/en/admin/books/author/", "/en/admin/books/book/", "/en/admin/books/genre/",],
-        "Loans": ["/make_messages/", "/en/admin/loans/bookloan/", "/en/admin/loans/library/",],
+        "Books": [
+            "/en/admin/books/author/",
+            "/en/admin/books/book/",
+            "/en/admin/books/genre/",
+        ],
+        "Loans": [
+            "/make_messages/",
+            "/en/admin/loans/bookloan/",
+            "/en/admin/loans/library/",
+        ],
         "Administration": ["/en/admin/admin/logentry/"],
     }
 
@@ -87,7 +105,11 @@ def test_top_menu(admin_client, settings):
     settings.JAZZMIN_SETTINGS = override_jazzmin_settings(
         topmenu_links=[
             {"name": "Home", "url": "admin:index", "permissions": ["auth.view_user"]},
-            {"name": "Support", "url": "https://github.com/farridav/django-jazzmin/issues", "new_window": True,},
+            {
+                "name": "Support",
+                "url": "https://github.com/farridav/django-jazzmin/issues",
+                "new_window": True,
+            },
             {"model": "auth.User"},
             {"app": "books"},
         ]
@@ -97,7 +119,10 @@ def test_top_menu(admin_client, settings):
 
     assert parse_topmenu(response) == [
         {"name": "Home", "link": "/en/admin/"},
-        {"name": "Support", "link": "https://github.com/farridav/django-jazzmin/issues",},
+        {
+            "name": "Support",
+            "link": "https://github.com/farridav/django-jazzmin/issues",
+        },
         {"name": "Users", "link": "/en/admin/auth/user/"},
         {
             "name": "Books",
@@ -139,12 +164,71 @@ def test_user_menu(admin_user, client, settings):
     ]
 
 
-def test_custom_menu_grouping(settings, rf):
-    context = site.each_context(rf)
+def test_custom_menu_grouping(admin_user, settings, rf):
+    """
+    When we use a custom menu we get exactly what we ask for
+    """
+    request = rf.request()
+    request.user = admin_user
+    context = site.each_context(request)
+    context.update({"user": admin_user})
+
     settings.JAZZMIN_SETTINGS = override_jazzmin_settings(
         custom_menu={"auth": ["books.book"], "arbitrary name": ["auth.user", "auth.group"]}
     )
 
     menu = get_side_menu(context)
 
-    assert menu == []
+    assert menu == [
+        {
+            "app_label": "auth",
+            "app_url": "/en/admin/auth/",
+            "has_module_perms": True,
+            "icon": "fas fa-users-cog",
+            "models": [
+                {
+                    "add_url": "/en/admin/books/book/add/",
+                    "admin_url": "/en/admin/books/book/",
+                    "icon": "fas fa-circle",
+                    "model_str": "auth.book",
+                    "name": "Books",
+                    "object_name": "Book",
+                    "perms": {"add": True, "change": True, "delete": True, "view": True},
+                    "url": "/en/admin/books/book/",
+                    "view_only": False,
+                }
+            ],
+            "name": "Authentication and Authorization",
+        },
+        {
+            "app_label": "arbitrary name",
+            "app_url": None,
+            "has_module_perms": True,
+            "icon": "fas fa-chevron-circle-right",
+            "models": [
+                {
+                    "add_url": "/en/admin/auth/user/add/",
+                    "admin_url": "/en/admin/auth/user/",
+                    "icon": "fas fa-circle",
+                    "model_str": "arbitrary name.user",
+                    "name": "Users",
+                    "object_name": "User",
+                    "perms": {"add": True, "change": True, "delete": True, "view": True},
+                    "url": "/en/admin/auth/user/",
+                    "view_only": False,
+                },
+                {
+                    "add_url": "/en/admin/auth/group/add/",
+                    "admin_url": "/en/admin/auth/group/",
+                    "icon": "fas fa-circle",
+                    "model_str": "arbitrary name.group",
+                    "name": "Groups",
+                    "object_name": "Group",
+                    "perms": {"add": True, "change": True, "delete": True, "view": True},
+                    "url": "/en/admin/auth/group/",
+                    "view_only": False,
+                },
+            ],
+            "name": "Arbitrary Name",
+        },
+    ]