nautobot 2.0.4__py3-none-any.whl → 2.1.0b1__py3-none-any.whl

nautobot/core/templates/template.css

@@ -0,0 +1,89 @@
+{% load helpers %}
+{% load static %}
+
+@font-face {
+    font-family: 'Ubuntu';
+    font-style: italic;
+    font-weight: 400;
+    font-display: swap;
+    src: url('{% static 'fonts/Ubuntu-Italic.woff2' %}') format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+    font-family: 'Ubuntu';
+    font-style: italic;
+    font-weight: 500;
+    font-display: swap;
+    src: url('{% static 'fonts/Ubuntu-MediumItalic.woff2' %}') format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+    font-family: 'Ubuntu';
+    font-style: italic;
+    font-weight: 700;
+    font-display: swap;
+    src: url('{% static 'fonts/Ubuntu-BoldItalic.woff2' %}') format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+    font-family: 'Ubuntu';
+    font-style: normal;
+    font-weight: 400;
+    font-display: swap;
+    src: url('{% static 'fonts/Ubuntu-Regular.woff2' %}') format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+    font-family: 'Ubuntu';
+    font-style: normal;
+    font-weight: 500;
+    font-display: swap;
+    src: url('{% static 'fonts/Ubuntu-Medium.woff2' %}') format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+    font-family: 'Ubuntu';
+    font-style: normal;
+    font-weight: 700;
+    font-display: swap;
+    src: url('{% static 'fonts/Ubuntu-Bold.woff2' %}') format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+    font-family: 'Ubuntu Mono';
+    font-style: italic;
+    font-weight: 400;
+    font-display: swap;
+    src: url('{% static 'fonts/UbuntuMono-Italic.woff2' %}') format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+    font-family: 'Ubuntu Mono';
+    font-style: italic;
+    font-weight: 700;
+    font-display: swap;
+    src: url('{% static 'fonts/UbuntuMono-BoldItalic.woff2' %}') format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+    font-family: 'Ubuntu Mono';
+    font-style: normal;
+    font-weight: 400;
+    font-display: swap;
+    src: url('{% static 'fonts/UbuntuMono-Regular.woff2' %}') format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+    font-family: 'Ubuntu Mono';
+    font-style: normal;
+    font-weight: 700;
+    font-display: swap;
+    src: url('{% static 'fonts/UbuntuMono-Bold.woff2' %}') format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+h1::before {
+    content: url("{% custom_branding_or_static 'header_bullet' 'img/nautobot_chevron_header.svg' %}");
+    position: relative;
+    top: 12px;
+    padding-right: 7px;
+}

nautobot/core/templates/utilities/templatetags/table_config_form.html

@@ -16,6 +16,7 @@
                             <a class="btn btn-success btn-xs" id="select-all-options" data-target="id_columns"><i class="mdi mdi-expand-all-outline"></i> Select all</a>
                         </div>
                     </div>
+                    <br />
                     <div class="text-right">
                         <input type="submit" class="btn btn-primary" value="Save" />
                         <input type="submit" class="btn btn-danger reset" value="Reset" />

nautobot/core/templatetags/buttons.py

@@ -114,15 +114,20 @@ def export_button(context, content_type=None):
         user = context["request"].user
         export_templates = models.ExportTemplate.objects.restrict(user, "view").filter(content_type=content_type)
         try:
-            export_url = reverse(lookup.get_route_for_model(content_type.model_class(), "list", api=True))
+            export_url = reverse(
+                "extras:job_run_by_class_path", kwargs={"class_path": "nautobot.core.jobs.ExportObjectList"}
+            )
         except NoReverseMatch:
             export_url = None
+        include_yaml_option = hasattr(content_type.model_class(), "to_yaml")
     else:
         export_templates = []
         export_url = None
 
     return {
         "export_url": export_url,
-        "url_params": context["request"].GET,
+        "query_string": context["request"].GET.urlencode(),
+        "content_type": content_type,
         "export_templates": export_templates,
+        "include_yaml_option": include_yaml_option,
     }

nautobot/core/templatetags/helpers.py

@@ -20,9 +20,9 @@ from nautobot.core import forms
 from nautobot.core.utils import color, config, data, lookup
 from nautobot.core.utils.navigation import is_route_new_ui_ready
 
-HTML_TRUE = '<span class="text-success"><i class="mdi mdi-check-bold" title="Yes"></i></span>'
-HTML_FALSE = '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span>'
-HTML_NONE = '<span class="text-muted">&mdash;</span>'
+HTML_TRUE = mark_safe('<span class="text-success"><i class="mdi mdi-check-bold" title="Yes"></i></span>')  # noqa: S308
+HTML_FALSE = mark_safe('<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span>')  # noqa: S308
+HTML_NONE = mark_safe('<span class="text-muted">&mdash;</span>')  # noqa: S308
 
 DEFAULT_SUPPORT_MESSAGE = (
     "If further assistance is required, please join the `#nautobot` channel "
@@ -99,7 +99,7 @@ def placeholder(value):
     """
     if value:
         return value
-    return mark_safe(HTML_NONE)
+    return HTML_NONE
 
 
 @library.filter()
@@ -123,7 +123,7 @@ def add_html_id(element_str, id_str):
     match = re.match(r"^(.*?<\w+) ?(.*)$", element_str, flags=re.DOTALL)
     if not match:
         return element_str
-    return mark_safe(match.group(1) + format_html(' id="{}" ', id_str) + match.group(2))
+    return mark_safe(match.group(1) + format_html(' id="{}" ', id_str) + match.group(2))  # noqa: S308
 
 
 @library.filter()
@@ -154,10 +154,10 @@ def render_boolean(value):
         '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span>'
     """
     if value is None:
-        return mark_safe(HTML_NONE)
+        return HTML_NONE
     if bool(value):
-        return mark_safe(HTML_TRUE)
-    return mark_safe(HTML_FALSE)
+        return HTML_TRUE
+    return HTML_FALSE
 
 
 @library.filter()
@@ -180,7 +180,7 @@ def render_markdown(value):
     # Render Markdown
     html = markdown(value, extensions=["fenced_code", "tables"])
 
-    return mark_safe(html)
+    return mark_safe(html)  # noqa: S308
 
 
 @library.filter()

nautobot/core/testing/views.py

@@ -5,8 +5,9 @@ import uuid
 
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.files.uploadedfile import SimpleUploadedFile
+from django.core.validators import URLValidator
 from django.test import TestCase as _TestCase
 from django.test import override_settings, tag
 from django.urls import NoReverseMatch, reverse
@@ -334,7 +335,22 @@ class ViewTestCases:
                 # Verify ObjectChange creation
                 objectchanges = lookup.get_changes_for_model(instance)
                 self.assertEqual(len(objectchanges), 1)
+                # Assert that Created By table row is updated with the user that created the object
                 self.assertEqual(objectchanges[0].action, extras_choices.ObjectChangeActionChoices.ACTION_CREATE)
+                # Validate if detail view exists
+                validate = URLValidator()
+                detail_url = instance.get_absolute_url()
+                try:
+                    validate(detail_url)
+                    response = self.client.get(detail_url)
+                    response_body = testing.extract_page_body(response.content.decode(response.charset))
+                    advanced_tab_href = f"{detail_url}#advanced"
+                    self.assertIn(advanced_tab_href, response_body)
+                    self.assertIn("<td>Created By</td>", response_body)
+                    self.assertIn("<td>nautobotuser</td>", response_body)
+                except ValidationError:
+                    # Instance does not have a valid detail view, do nothing here.
+                    pass
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
         def test_create_object_with_constrained_permission(self):
@@ -460,6 +476,20 @@ class ViewTestCases:
                 objectchanges = lookup.get_changes_for_model(instance)
                 self.assertEqual(len(objectchanges), 1)
                 self.assertEqual(objectchanges[0].action, extras_choices.ObjectChangeActionChoices.ACTION_UPDATE)
+                # Validate if detail view exists
+                validate = URLValidator()
+                detail_url = instance.get_absolute_url()
+                try:
+                    validate(detail_url)
+                    response = self.client.get(detail_url)
+                    response_body = testing.extract_page_body(response.content.decode(response.charset))
+                    advanced_tab_href = f"{detail_url}#advanced"
+                    self.assertIn(advanced_tab_href, response_body)
+                    self.assertIn("<td>Last Updated By</td>", response_body)
+                    self.assertIn("<td>nautobotuser</td>", response_body)
+                except ValidationError:
+                    # Instance does not have a valid detail view, do nothing here.
+                    pass
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
         def test_edit_object_with_constrained_permission(self):
@@ -704,7 +734,7 @@ class ViewTestCases:
             # TODO: it'd make test failures more readable if we strip the page headers/footers from the content
             self.assertIn("Unknown filter field", content, msg=content)
             # There should be no table rows displayed except for the empty results row
-            self.assertIn(f"No {self.model._meta.verbose_name_plural} found", content, msg=content)
+            self.assertIn("None", content, msg=content)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"], STRICT_FILTERING=False)
         def test_list_objects_unknown_filter_no_strict_filtering(self):
@@ -729,7 +759,7 @@ class ViewTestCases:
             content = testing.extract_page_body(response.content.decode(response.charset))
             # TODO: it'd make test failures more readable if we strip the page headers/footers from the content
             self.assertNotIn("Unknown filter field", content, msg=content)
-            self.assertNotIn(f"No {self.model._meta.verbose_name_plural} found", content, msg=content)
+            self.assertIn("None", content, msg=content)
             if hasattr(self.model, "name"):
                 self.assertRegex(content, r">\s*" + re.escape(instance1.name) + r"\s*<", msg=content)
                 self.assertRegex(content, r">\s*" + re.escape(instance2.name) + r"\s*<", msg=content)
@@ -1114,7 +1144,7 @@ class ViewTestCases:
             # Check if the first and second pk is passed into the form.
             self.assertIn(f'<input type="hidden" name="pk" value="{first_pk}"', response_body)
             self.assertIn(f'<input type="hidden" name="pk" value="{second_pk}"', response_body)
-            self.assertIn("<h1>Editing 2 ", response_body)
+            self.assertIn("Editing 2 ", response_body)
             # Check if the third pk is not passed into the form.
             self.assertNotIn(f'<input type="hidden" name="pk" value="{third_pk}"', response_body)
 

nautobot/core/tests/integration/test_home.py

@@ -1,5 +1,3 @@
-from django.test.utils import override_settings
-
 from nautobot.circuits.models import Circuit, Provider
 from nautobot.core.testing.integration import SeleniumTestCase
 from nautobot.dcim.models import Location, PowerFeed, PowerPanel
@@ -82,47 +80,7 @@ class HomeTestCase(SeleniumTestCase):
                     counter_html = int(item_html.find_by_xpath("./../../span").first.html)
                     self.assertEqual(counter, counter_html)
 
-    @override_settings(HIDE_RESTRICTED_UI=False)
-    def test_homepage_render_no_permissions(self):
-        """
-        Render homepage with no permissions.
-        """
-        self.browser.visit(self.live_server_url)
-
-        columns_html = self.browser.find_by_css("div[class='homepage_column']")
-        for panel_name, panel_details in self.layout.items():
-            columns_html.first.find_by_xpath(f".//strong[text()='{panel_name}']")
-            for item_name, _ in panel_details.items():
-                item_html = columns_html.first.find_by_xpath(f".//h4[contains(text(), '{item_name}')]")
-                self.assertTrue("mdi mdi-lock" in item_html.find_by_xpath("./../span").html)
-
-    @override_settings(HIDE_RESTRICTED_UI=False)
-    def test_homepage_render_limit_permissions(self):
-        """
-        Render homepage with limited permissions.
-        """
-        self.add_permissions("dcim.view_location")
-        self.add_permissions("circuits.view_circuit")
-        user_permissions = self.user.get_all_permissions()
-
-        self.browser.visit(self.live_server_url)
-
-        columns_html = self.browser.find_by_css("div[class='homepage_column']")
-        for panel_name, panel_details in self.layout.items():
-            columns_html.first.find_by_xpath(f".//*[text()='{panel_name}']")
-            for item_name, item_details in panel_details.items():
-                if item_details["permission"] in user_permissions:
-                    item_html = columns_html.first.find_by_xpath(f".//a[contains(text(), '{item_name}')]")
-                    if item_details.get("model"):
-                        counter = item_details["model"].objects.count()
-                        counter_html = int(item_html.find_by_xpath("./../../span").html)
-                        self.assertEqual(counter, counter_html)
-                else:
-                    item_html = columns_html.first.find_by_xpath(f".//h4[contains(text(), '{item_name}')]")
-                    self.assertTrue("mdi mdi-lock" in item_html.find_by_xpath("./../span").html)
-
-    @override_settings(HIDE_RESTRICTED_UI=True)
-    def test_homepage_render_limit_permissions_with_restricted_ui(self):
+    def test_homepage_render_with_limit_permissions(self):
         """
         Render homepage with limited permissions and restricted UI.
         This restricts the user to be able to view ONLY locations and circuits.

nautobot/core/tests/integration/test_navbar.py

@@ -1,5 +1,3 @@
-from django.test.utils import override_settings
-
 from nautobot.core.testing.integration import SeleniumTestCase
 
 
@@ -10,19 +8,19 @@ class NavBarTestCase(SeleniumTestCase):
     navbar = {
         "Organization": {
             "Locations": {
-                "Location": {
+                "Locations": {
                     "permission": "dcim.view_location",
-                    "buttons": ["Add", "Import"],
+                    "buttons": ["Add"],
                 },
                 "Location Types": {
                     "permission": "dcim.view_locationtype",
-                    "buttons": ["Add", "Import"],
+                    "buttons": ["Add"],
                 },
             },
             "Tags": {
                 "Tags": {
                     "permission": "extras.view_tag",
-                    "buttons": ["Add", "Import"],
+                    "buttons": ["Add"],
                 },
             },
         },
@@ -46,7 +44,6 @@ class NavBarTestCase(SeleniumTestCase):
         self.logout()
         super().tearDown()
 
-    @override_settings(HIDE_RESTRICTED_UI=False)
     def test_navbar_render_superuser(self):
         """
         Render navbar from home page with superuser.
@@ -60,75 +57,24 @@ class NavBarTestCase(SeleniumTestCase):
 
         for tab_name, groups in self.navbar.items():
             # XPath to find tabs using the tab name
-            tab_xpath = f"//*[@id='navbar']//*[contains(text(), '{tab_name}')]"
+            tab_xpath = f"//*[@id='navbar']//*[normalize-space()='{tab_name}']"
             tab = self.browser.find_by_xpath(tab_xpath)
             tab.click()
             self.assertTrue(bool(tab["aria-expanded"]))
 
             for group_name, items in groups.items():
                 # Append onto tab xpath with group name search
-                group = tab.find_by_xpath(f"{tab_xpath}/following-sibling::ul//li[contains(text(), '{group_name}')]")
+                group = tab.find_by_xpath(f"{tab_xpath}/following-sibling::ul//li[normalize-space()='{group_name}']")
 
                 for item_name in items:
-                    item_xpath = f"{tab_xpath}/following-sibling::ul//li[.//a[contains(text(), '{item_name}')]]"
+                    item_xpath = f"{tab_xpath}/following-sibling::ul//li[.//a[normalize-space()='{item_name}']]"
                     group.find_by_xpath(item_xpath)
 
-    @override_settings(HIDE_RESTRICTED_UI=False)
-    def test_navbar_render_limit_permissions(self):
-        """
-        Render navbar from home page with limited permissions.
-        """
-        self.add_permissions("extras.view_relationship")
-        user_permissions = self.user.get_all_permissions()
-
-        self.browser.visit(self.live_server_url)
-
-        for tab_name, groups in self.navbar.items():
-            # XPath to find tabs using the tab name
-            tab_xpath = f"//*[@id='navbar']//*[contains(text(), '{tab_name}')]"
-            tab = self.browser.find_by_xpath(tab_xpath)
-            tab.click()
-            self.assertTrue(bool(tab["aria-expanded"]))
-
-            for group_name, items in groups.items():
-                # Append onto tab xpath with group name search
-                group = tab.find_by_xpath(f"{tab_xpath}/following-sibling::ul//li[contains(text(), '{group_name}')]")
-
-                for item_name, item_details in items.items():
-                    item_xpath = f"{tab_xpath}/following-sibling::ul//li[.//a[contains(text(), '{item_name}')]]"
-                    item = group.find_by_xpath(item_xpath)
-                    if item_details["permission"] in user_permissions:
-                        self.assertNotEqual(item["class"], "disabled", f"Item `{item_name}` should not be disabled.")
-                    else:
-                        self.assertEqual(item["class"], "disabled", f"Item `{item_name}` should be disabled.")
-
-    @override_settings(HIDE_RESTRICTED_UI=False)
-    def test_navbar_render_no_permissions(self):
-        """
-        Render navbar from home page with no permissions.
-        """
-        self.browser.visit(self.live_server_url)
-
-        for tab_name, groups in self.navbar.items():
-            # XPath to find tabs using the tab name
-            tab_xpath = f"//*[@id='navbar']//*[contains(text(), '{tab_name}')]"
-            tab = self.browser.find_by_xpath(tab_xpath)
             tab.click()
-            self.assertTrue(bool(tab["aria-expanded"]))
-
-            for group_name, items in groups.items():
-                # Append onto tab xpath with group name search
-                group = tab.find_by_xpath(f"{tab_xpath}/following-sibling::ul//li[contains(text(), '{group_name}')]")
-
-                for item_name in items:
-                    item_xpath = f"{tab_xpath}/following-sibling::ul//li[.//a[contains(text(), '{item_name}')]]"
-                    item = group.find_by_xpath(item_xpath)
-                    self.assertEqual(item["class"], "disabled", f"Item `{item_name}` should be disabled.")
 
-    @override_settings(HIDE_RESTRICTED_UI=True)
-    def test_navbar_render_restricted_ui(self):
+    def test_navbar_render_with_limited_permissions(self):
         """
-        Render navbar from home page with restricted UI set to True.
+        Render navbar from home page with limited permissions.
         This restricts the user to be able to view ONLY relationships on the navbar.
         It then checks the UI for these restrictions.
         """
@@ -146,7 +92,7 @@ class NavBarTestCase(SeleniumTestCase):
                         tab_flag = True
 
             # XPath to find tabs using the tab name
-            tabs = self.browser.find_by_xpath(f"//*[@id='navbar']//*[contains(text(), '{tab_name}')]")
+            tabs = self.browser.find_by_xpath(f"//*[@id='navbar']//*[normalize-space()='{tab_name}']")
             if tab_flag:
                 self.assertEqual(len(tabs), 1)
             else:

nautobot/core/tests/integration/test_plugin_home.py

@@ -1,4 +1,3 @@
-from django.test.utils import override_settings
 from django.conf import settings
 from unittest import skipIf
 
@@ -89,7 +88,6 @@ class PluginHomeTestCase(SeleniumTestCase):
                 counter_html = int(item_html.find_by_xpath("./../../span")["innerHTML"])
                 self.assertEqual(counter, counter_html)
 
-    @override_settings(HIDE_RESTRICTED_UI=False)
     def test_homepage_render_no_permissions(self):
         """
         Render homepage with no permissions.
@@ -101,7 +99,8 @@ class PluginHomeTestCase(SeleniumTestCase):
             columns_html.first.find_by_xpath(f".//strong[text()='{panel_name}']")
             for item_name, _ in panel_details.items():
                 item_html = columns_html.first.find_by_xpath(f".//h4[contains(text(), '{item_name}')]")
-                self.assertTrue("mdi mdi-lock" in item_html.find_by_xpath("./../span")["innerHTML"])
+                # Assert Panel items without permissions are not shown in DOM
+                self.assertFalse(item_html)
 
     def test_examplemodel_custom_panel(self):
         """
@@ -118,7 +117,6 @@ class PluginHomeTestCase(SeleniumTestCase):
         for item_name in self.custom_panel_examplemodel["items"]:
             columns_html.first.find_by_xpath(f".//a[contains(text(), '{item_name}')]")
 
-    @override_settings(HIDE_RESTRICTED_UI=False)
     def test_homepage_render_limit_permissions(self):
         """
         Render homepage with limited permissions.
@@ -142,4 +140,5 @@ class PluginHomeTestCase(SeleniumTestCase):
                         self.assertEqual(counter, counter_html)
                 else:
                     item_html = columns_html.first.find_by_xpath(f".//h4[contains(text(), '{item_name}')]")
-                    self.assertTrue("mdi mdi-lock" in item_html.find_by_xpath("./../span")["innerHTML"])
+                    # Assert Layout items without permission is not visible in DOM
+                    self.assertFalse(item_html)

nautobot/core/tests/integration/test_plugin_navbar.py

@@ -19,7 +19,7 @@ class PluginNavBarTestCase(SeleniumTestCase):
             "Example Group 1": {
                 "Example Model": {
                     "permission": "example_plugin.view_examplemodel",
-                    "buttons": ["Add", "Import"],
+                    "buttons": ["Add"],
                 },
             },
         },
@@ -27,23 +27,23 @@ class PluginNavBarTestCase(SeleniumTestCase):
             "Circuits": {
                 "Circuits": {
                     "permission": "circuits.view_circuit",
-                    "buttons": ["Add", "Import"],
+                    "buttons": ["Add"],
                 },
-                "Circuit Type": {
+                "Circuit Types": {
                     "permission": "circuits.view_circuittype",
-                    "buttons": ["Add", "Import"],
+                    "buttons": ["Add"],
                 },
             },
             "Example Circuit Group": {
                 "Example Model": {
                     "permission": "example_plugin.view_examplemodel",
-                    "buttons": ["Add", "Import"],
+                    "buttons": ["Add"],
                 },
             },
             "Providers": {
                 "Providers": {
                     "permission": "circuits.view_provider",
-                    "buttons": ["Add", "Import"],
+                    "buttons": ["Add"],
                 },
             },
         },
@@ -51,7 +51,7 @@ class PluginNavBarTestCase(SeleniumTestCase):
             "Example Nautobot App": {
                 "Models": {
                     "permission": "example_plugin.view_examplemodel",
-                    "buttons": ["Add a new example model", "Import example models"],
+                    "buttons": ["Add a new example model"],
                 },
                 "Other Models": {
                     "permission": "example_plugin.view_examplemodel",
@@ -80,14 +80,14 @@ class PluginNavBarTestCase(SeleniumTestCase):
         # Retrieve home page
         self.browser.visit(self.live_server_url)
 
-        tab_xpath = "//*[@id='navbar']//*[contains(text(), 'Example Menu')]"
+        tab_xpath = "//*[@id='navbar']//*[normalize-space()='Example Menu']"
         tab = self.browser.find_by_xpath(tab_xpath)
         tab.click()
         self.assertTrue(bool(tab["aria-expanded"]))
 
-        group = tab.find_by_xpath(f"{tab_xpath}/following-sibling::ul//li[contains(text(), 'Example Group 1')]")
+        group = tab.find_by_xpath(f"{tab_xpath}/following-sibling::ul//li[normalize-space()='Example Group 1']")
 
-        item_xpath = f"{tab_xpath}/following-sibling::ul//li[.//a[contains(text(), 'Example Model')]]"
+        item_xpath = f"{tab_xpath}/following-sibling::ul//li[.//a[normalize-space()='Example Model']]"
         group.find_by_xpath(item_xpath)
 
     def test_plugin_navbar_modify_circuits(self):
@@ -101,15 +101,15 @@ class PluginNavBarTestCase(SeleniumTestCase):
         # Retrieve home page
         self.browser.visit(self.live_server_url)
 
-        tab_xpath = "//*[@id='navbar']//*[contains(text(), 'Circuits')]"
+        tab_xpath = "//*[@id='navbar']//*[normalize-space()='Circuits']"
         tab = self.browser.find_by_xpath(tab_xpath)
         tab.click()
         self.assertTrue(bool(tab["aria-expanded"]))
 
         for group_name, items in self.navbar["Circuits"].items():
-            group = tab.find_by_xpath(f"{tab_xpath}/following-sibling::ul//li[contains(text(), '{group_name}')]")
+            group = tab.find_by_xpath(f"{tab_xpath}/following-sibling::ul//li[normalize-space()='{group_name}']")
             for item_name, item_details in items.items():
-                item_xpath = f"{tab_xpath}/following-sibling::ul//li[.//a[contains(text(), '{item_name}')]]"
+                item_xpath = f"{tab_xpath}/following-sibling::ul//li[.//a[normalize-space()='{item_name}']]"
                 item = group.find_by_xpath(item_xpath)
 
                 for button_name in item_details["buttons"]:
@@ -120,6 +120,8 @@ class PluginNavBarTestCase(SeleniumTestCase):
                         icon = button.find_by_xpath(f"{item_xpath}/div//a[@title='{button_name}']/i")
                         self.assertIn(button_icon, icon["class"])
 
+        tab.click()
+
     def test_plugin_navbar_plugin_tab(self):
         """
         Test that old-style plugin menu definitions are correctly rendered to the Plugins menu tab.
@@ -131,15 +133,15 @@ class PluginNavBarTestCase(SeleniumTestCase):
         # Retrieve home page
         self.browser.visit(self.live_server_url)
 
-        tab_xpath = "//*[@id='navbar']//*[contains(text(), 'Plugins')]"
+        tab_xpath = "//*[@id='navbar']//*[normalize-space()='Plugins']"
         tab = self.browser.find_by_xpath(tab_xpath)
         tab.click()
         self.assertTrue(bool(tab["aria-expanded"]))
 
         for group_name, items in self.navbar["Plugins"].items():
-            group = tab.find_by_xpath(f"{tab_xpath}/following-sibling::ul//li[contains(text(), '{group_name}')]")
+            group = tab.find_by_xpath(f"{tab_xpath}/following-sibling::ul//li[normalize-space()='{group_name}']")
             for item_name, item_details in items.items():
-                item_xpath = f"{tab_xpath}/following-sibling::ul//li[.//a[contains(text(), '{item_name}')]]"
+                item_xpath = f"{tab_xpath}/following-sibling::ul//li[.//a[normalize-space()='{item_name}']]"
                 item = group.find_by_xpath(item_xpath)
 
                 for button_name in item_details["buttons"]:
@@ -149,3 +151,5 @@ class PluginNavBarTestCase(SeleniumTestCase):
                     if button_icon := getattr(ButtonActionIconChoices, button_name.upper(), None):
                         icon = button.find_by_xpath(f"{item_xpath}/div//a[@title='{button_name}']/i")
                         self.assertIn(button_icon, icon["class"])
+
+        tab.click()

nautobot/core/tests/integration/test_theme.py

@@ -4,6 +4,10 @@ from nautobot.core.testing.integration import SeleniumTestCase
 class ThemeTestCase(SeleniumTestCase):
     """Integration test to check theme selection modal functionality."""
 
+    def setUp(self):
+        super().setUp()
+        self.login(self.user.username, self.password)
+
     def test_modal_not_rendered(self):
         """As implemented, modal dialog box does not render until activated."""