nautobot 2.4.21__py3-none-any.whl → 3.0.0a3__py3-none-any.whl

nautobot/extras/templatetags/custom_links.py

@@ -10,16 +10,16 @@ from nautobot.extras.models import CustomLink
 
 register = template.Library()
 
-LINK_BUTTON = '<a href="{}"{} class="btn btn-sm btn-{}">{}</a>\n'
+LINK_BUTTON = '<a href="{}"{} class="btn btn-{}">{}</a>\n'
 GROUP_BUTTON = (
-    '<div class="btn-group">\n'
-    '<button type="button" class="btn btn-sm btn-{} dropdown-toggle" data-toggle="dropdown">\n'
-    '{} <span class="caret"></span>\n'
+    '<div class="dropdown d-inline-flex align-middle">\n'
+    '<button type="button" class="btn btn-{} dropdown-toggle" data-bs-toggle="dropdown">\n'
+    '{} <span class="mdi mdi-chevron-down" aria-hidden="true"></span>\n'
     "</button>\n"
-    '<ul class="dropdown-menu pull-right">\n'
+    '<ul class="dropdown-menu float-end">\n'
     "{}</ul></div>\n"
 )
-GROUP_LINK = '<li><a href="{}"{}>{}</a></li>\n'
+GROUP_LINK = '<li><a class="dropdown-item" href="{}"{}>{}</a></li>\n'
 
 
 @register.simple_tag(takes_context=True)
@@ -58,12 +58,12 @@ def custom_links(context, obj):
                     link_rendered = render_jinja2(cl.target_url, link_context)
                     link_target = ' target="_blank"' if cl.new_window else ""
                     template_code += format_html(
-                        LINK_BUTTON, link_rendered, link_target, cl.button_class, text_rendered
+                        LINK_BUTTON, link_rendered, link_target, cl.button_class_css_class, text_rendered
                     )
             except Exception as e:
                 template_code += format_html(
-                    '<a class="btn btn-sm btn-default" disabled="disabled" title="{}">'
-                    '<i class="mdi mdi-alert"></i> {}</a>\n',
+                    '<a aria-disabled="true" class="btn btn-secondary disabled" title="{}">'
+                    '<span class="mdi mdi-alert"></span> {}</a>\n',
                     e,
                     cl.name,
                 )
@@ -81,13 +81,13 @@ def custom_links(context, obj):
                     links_rendered += format_html(GROUP_LINK, link_rendered, link_target, text_rendered)
             except Exception as e:
                 links_rendered += format_html(
-                    '<li><a disabled="disabled" title="{}"><span class="text-muted">'
-                    '<i class="mdi mdi-alert"></i> {}</span></a></li>',
+                    '<li><a aria-disabled="true" class="disabled dropdown-item" title="{}"><span class="text-secondary">'
+                    '<span class="mdi mdi-alert"></span> {}</span></a></li>',
                     e,
                     cl.name,
                 )
 
         if links_rendered:
-            template_code += format_html(GROUP_BUTTON, links[0].button_class, group, links_rendered)
+            template_code += format_html(GROUP_BUTTON, links[0].button_class_css_class, group, links_rendered)
 
     return template_code

nautobot/extras/templatetags/job_buttons.py

@@ -13,11 +13,11 @@ from nautobot.extras.models import Job, JobButton, JobQueue
 register = template.Library()
 
 GROUP_DROPDOWN = """
-<div class="btn-group">
-  <button type="button" class="btn btn-sm btn-{group_button_class} dropdown-toggle" data-toggle="dropdown">
-    {group_name} <span class="caret"></span>
+<div class="dropdown d-inline-flex align-middle">
+  <button type="button" class="btn btn-{group_button_class} dropdown-toggle" data-bs-toggle="dropdown">
+    {group_name} <span class="mdi mdi-chevron-down" aria-hidden="true"></span>
   </button>
-  <ul class="dropdown-menu pull-right">
+  <ul class="dropdown-menu dropdown-menu-end">
     {grouped_buttons}
   </ul>
 </div>
@@ -33,7 +33,7 @@ HIDDEN_INPUTS = """
 """
 
 NO_CONFIRM_BUTTON = """
-<button type="submit" form="form_id_{button_id}" class="btn btn-sm btn-{button_class}" {disabled}>{button_text}</button>
+<button type="submit" form="form_id_{button_id}" class="btn btn-{button_class} {menu_item}" {disabled}>{button_text}</button>
 """
 
 NO_CONFIRM_FORM = """
@@ -43,7 +43,7 @@ NO_CONFIRM_FORM = """
 """
 
 CONFIRM_BUTTON = """
-<button type="button" class="btn btn-sm btn-{button_class}" data-toggle="modal" data-target="#confirm_modal_id_{button_id}" {disabled}>
+<button type="button" class="btn btn-{button_class} {menu_item}" data-bs-toggle="modal" data-bs-target="#confirm_modal_id_{button_id}" {disabled}>
   {button_text}
 </button>
 """
@@ -53,8 +53,8 @@ CONFIRM_MODAL = """
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title" id="confirm_modal_label_{button_id}">Confirmation</h4>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <form id="form_id_{button_id}" action="{button_url}" method="post" class="form">
         <div class="modal-body">
@@ -62,7 +62,7 @@ CONFIRM_MODAL = """
           Run Job <strong>'{job}'</strong> with object <strong>'{object}'</strong>?
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
           <button type="submit" class="btn btn-primary">Confirm</button>
         </div>
       </form>
@@ -94,8 +94,9 @@ def _render_job_button_for_obj(job_button, obj, context, content_type):
     except Exception as exc:
         return (
             format_html(
-                '<a class="btn btn-sm btn-{}" disabled="disabled" title="{}"><i class="mdi mdi-alert"></i> {}</a>\n',
-                "default" if not job_button.group_name else "link",
+                '<a aria-disabled="true" class="btn btn-{} disabled" title="{}">'
+                '<span class="mdi mdi-alert"></span> {}</a>\n',
+                "secondary" if not job_button.group_name else "link dropdown-item",
                 exc,
                 job_button.name,
             ),
@@ -123,12 +124,13 @@ def _render_job_button_for_obj(job_button, obj, context, content_type):
     template_args = {
         "button_id": job_button.pk,
         "button_text": text_rendered,
-        "button_class": job_button.button_class if not job_button.group_name else "link",
+        "button_class": job_button.button_class_css_class if not job_button.group_name else "link",
         "button_url": reverse("extras:job_run", kwargs={"pk": job_button.job.pk}),
         "object": obj,
         "job": job_button.job,
         "hidden_inputs": hidden_inputs,
         "disabled": "" if (has_run_perm and job_button.job.installed and job_button.job.enabled) else "disabled",
+        "menu_item": "dropdown-item" if job_button.group_name else "",
     }
 
     if job_button.confirmation:
@@ -170,7 +172,7 @@ def job_buttons(context, obj):
 
     # Add grouped buttons to template
     for group_name, buttons in group_names.items():
-        group_button_class = buttons[0].button_class
+        group_button_class = buttons[0].button_class_css_class
 
         buttons_rendered = SAFE_EMPTY_STR
 

nautobot/extras/test_jobs/invalid_import.py

@@ -0,0 +1,9 @@
+from nautobot.core.celery import register_jobs
+from nautobot.extras.jobs import Job, no_such_attribute  # noqa: F401  # pylint: disable=no-name-in-module
+
+
+class MyJob(Job):
+    pass
+
+
+register_jobs(MyJob)

nautobot/extras/test_jobs/log_counts_by_level.py

@@ -0,0 +1,23 @@
+from nautobot.core.celery import register_jobs
+from nautobot.extras.jobs import get_task_logger, Job
+
+logger = get_task_logger(__name__)
+
+
+class TestLogCountsByLevel(Job):
+    class Meta:
+        description = "Test counts of log entries by level."
+
+    def run(self):  # pylint: disable=arguments-differ
+        # intentionally omit debug
+        logger.info("This is an info log")
+        logger.info("This is an info log")
+        logger.warning("This is a warning log")
+        logger.warning("This is a warning log")
+        logger.error("This is an error log")
+        logger.critical("This is a critical log")
+        logger.failure("This is a failure log")
+        # success log will be added by post_run
+
+
+register_jobs(TestLogCountsByLevel)

nautobot/extras/test_jobs/missing_import.py

@@ -0,0 +1,11 @@
+from no_such_module import no_such_attribute  # noqa: F401  # pylint: disable=import-error
+
+from nautobot.core.celery import register_jobs
+from nautobot.extras.jobs import Job
+
+
+class MyJob(Job):
+    pass
+
+
+register_jobs(MyJob)

nautobot/extras/tests/integration/test_computedfields.py

@@ -1,4 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
+from django.test import tag
 from django.urls import reverse
 
 from nautobot.core.testing.integration import SeleniumTestCase
@@ -16,9 +17,7 @@ class ComputedFieldsTestCase(SeleniumTestCase):
 
     def setUp(self):
         super().setUp()
-        self.user.is_superuser = True
-        self.user.save()
-        self.login(self.user.username, self.password)
+        self.login_as_superuser()
         self.device = create_test_device()
         self.computed_field = ComputedField.objects.create(
             content_type=ContentType.objects.get_for_model(Device),
@@ -27,10 +26,7 @@ class ComputedFieldsTestCase(SeleniumTestCase):
             template="{{ obj.name }} is awesome!",
         )
 
-    def tearDown(self):
-        self.logout()
-        super().tearDown()
-
+    @tag("fix_in_v3")
     def test_computed_field_advanced_ui(self):
         """
         This test creates a device and a computed field for that device.
@@ -61,13 +57,14 @@ class ComputedFieldsTestCase(SeleniumTestCase):
         self.assertTrue(self.browser.is_text_present("Device Computed Field"))
         self.assertTrue(self.browser.is_text_present(f"{self.device.name} is awesome!"))
 
+    @tag("fix_in_v3")
     def test_computed_field_appears_in_object_list(self):
         """
         This test sets the computed field to be visible on the object list
         and then checks to see if it actually appears there.
         """
         self.browser.visit(f"{self.live_server_url}/dcim/devices/")
-        self.browser.find_by_xpath(".//button[@data-original-title='Configure table']").click()
+        self.click_button("#table-configure-button")
         select_option = self.browser.find_by_xpath(
             ".//select[@id='id_columns']/option[contains(text(), 'Device Computed Field')]"
         )

nautobot/extras/tests/integration/test_configcontextschema.py

@@ -1,25 +1,19 @@
 from django.contrib.contenttypes.models import ContentType
 
-from nautobot.core.testing.integration import SeleniumTestCase
+from nautobot.core.testing.integration import ObjectDetailsMixin, ObjectsListMixin, SeleniumTestCase
 from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Manufacturer
 from nautobot.extras.models import ConfigContext, ConfigContextSchema, Role, Status
 from nautobot.virtualization.models import Cluster, ClusterType, VirtualMachine
 
 
-class ConfigContextSchemaTestCase(SeleniumTestCase):
+class ConfigContextSchemaTestCase(SeleniumTestCase, ObjectDetailsMixin, ObjectsListMixin):
     """
     Integration tests for the ConfigContextSchema model
     """
 
     def setUp(self):
         super().setUp()
-        self.user.is_superuser = True
-        self.user.save()
-        self.login(self.user.username, self.password)
-
-    def tearDown(self):
-        self.logout()
-        super().tearDown()
+        self.login_as_superuser()
 
     def test_create_valid_config_context_schema(self):
         """
@@ -29,18 +23,16 @@ class ConfigContextSchemaTestCase(SeleniumTestCase):
         """
         # Navigate to ConfigContextSchema list view
         self.browser.visit(self.live_server_url)
-        self.browser.links.find_by_partial_text("Extensibility").click()
-        self.browser.links.find_by_partial_text("Config Context Schemas").click()
+        self.click_navbar_entry("Extensibility", "Config Context Schemas")
 
         # Click add button
-        # Need to be a bit clever in our search here to avoid accidentally hitting "IP Addresses -> Add" in the nav
-        self.browser.find_by_xpath("//div[contains(@class, 'wrapper')]//a[contains(., 'Add')]").click()
+        self.click_add_item()
 
         # Fill out form
-        self.browser.fill("name", "Integration Schema 1")
-        self.browser.fill("description", "Description")
-        self.browser.fill("data_schema", '{"type": "object", "properties": {"a": {"type": "string"}}}')
-        self.browser.find_by_text("Create").click()
+        self.fill_input("name", "Integration Schema 1")
+        self.fill_input("description", "Description")
+        self.fill_input("data_schema", '{"type": "object", "properties": {"a": {"type": "string"}}}')
+        self.browser.find_by_xpath("//button[normalize-space()='Create']").click()
 
         # Verify form redirect
         self.assertTrue(self.browser.is_text_present("Created config context schema Integration Schema 1"))
@@ -57,18 +49,16 @@ class ConfigContextSchemaTestCase(SeleniumTestCase):
         """
         # Navigate to ConfigContextSchema list view
         self.browser.visit(self.live_server_url)
-        self.browser.links.find_by_partial_text("Extensibility").click()
-        self.browser.links.find_by_partial_text("Config Context Schemas").click()
+        self.click_navbar_entry("Extensibility", "Config Context Schemas")
 
         # Click add button
-        # Need to be a bit clever in our search here to avoid accidentally hitting "IP Addresses -> Add" in the nav
-        self.browser.find_by_xpath("//div[contains(@class, 'wrapper')]//a[contains(., 'Add')]").click()
+        self.click_add_item()
 
         # Fill out form
-        self.browser.fill("name", "Integration Schema 2")
-        self.browser.fill("description", "Description")
-        self.browser.fill("data_schema", '{"type": "object", "properties": {"a": {"type": "not a valid type"}}}')
-        self.browser.find_by_text("Create").click()
+        self.fill_input("name", "Integration Schema 2")
+        self.fill_input("description", "Description")
+        self.fill_input("data_schema", '{"type": "object", "properties": {"a": {"type": "not a valid type"}}}')
+        self.browser.find_by_xpath("//button[normalize-space()='Create']").click()
 
         # Verify validation error raised to user within form
         self.assertTrue(self.browser.is_text_present("'not a valid type' is not valid under any of the given schemas"))
@@ -139,64 +129,69 @@ class ConfigContextSchemaTestCase(SeleniumTestCase):
 
         # Navigate to ConfigContextSchema Validation tab
         self.browser.visit(f"{self.live_server_url}/extras/config-context-schemas/{schema.pk}/")
-        self.browser.links.find_by_text("Validation").click()
+        self.switch_tab("Validation")
 
         # Assert Validation states
         self.assertEqual(
-            len(self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")), 3
+            len(self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")), 3
         )  # 3 rows (config context, device, virtual machine)
-        for row in self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr"):
+        for row in self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr"):
             self.assertEqual(
                 row.find_by_tag("td")[-2].html,
-                '<span class="text-success"><i class="mdi mdi-check-bold" title="" data-original-title="Yes"></i></span>',
+                '<span class="text-success"><i class="mdi mdi-check-bold" title="Yes"></i></span>',
             )
 
         # Edit the schema
-        self.browser.links.find_by_partial_text("Edit").click()
+        self.switch_tab("Config Context")
+        self.click_button("#edit-button")
         # Change property "a" to be type string
-        self.browser.fill(
+        self.fill_input(
             "data_schema",
             '{"type": "object", "properties": {"a": {"type": "string"}, "b": {"type": "integer"}, "c": {"type": "integer"}}, "additionalProperties": false}',
         )
-        self.browser.find_by_text("Update").click()
+        self.browser.find_by_xpath("//button[normalize-space()='Update']").click()
 
         # Navigate to ConfigContextSchema Validation tab
-        self.browser.links.find_by_text("Validation").click()
+        self.switch_tab("Validation")
 
         # Assert Validation states
         self.assertEqual(
-            len(self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")), 3
+            len(self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")), 3
         )  # 3 rows (config context, device, virtual machine)
-        for row in self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr"):
+        for row in self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr"):
             self.assertEqual(
                 row.find_by_tag("td")[-2].html,
-                '<span class="text-danger"><i class="mdi mdi-close-thick" title="" data-original-title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
+                '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
             )
 
         # Edit the device local context data and redirect back to the validation tab
-        self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")[1].find_by_tag("td")[
-            -1
-        ].find_by_tag("a").click()
+        self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")[1].find_by_tag("td")[-1].find_by_tag(
+            "button"
+        ).click()
+        menu = self.browser.find_by_xpath("//ul[contains(@class, 'dropdown-menu') and contains(@class, 'show')]")
+        menu.is_visible(wait_time=5)
+        menu.find_by_tag("a").click()
+
         # Update the property "a" to be a string
-        self.browser.fill("local_config_context_data", '{"a": "foo", "b": 456, "c": 777}')
-        self.browser.find_by_text("Update").click()
+        self.fill_input("local_config_context_data", '{"a": "foo", "b": 456, "c": 777}')
+        self.browser.find_by_xpath("//button[normalize-space()='Update']").click()
 
         # Assert Validation states
         self.assertEqual(
-            len(self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")), 3
+            len(self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")), 3
         )  # 3 rows (config context, device, virtual machine)
         # Config context still fails
         self.assertEqual(
-            self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")[0].find_by_tag("td")[-2].html,
-            '<span class="text-danger"><i class="mdi mdi-close-thick" title="" data-original-title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
+            self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")[0].find_by_tag("td")[-2].html,
+            '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
         )
         # Device now passes
         self.assertEqual(
-            self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")[1].find_by_tag("td")[-2].html,
-            '<span class="text-success"><i class="mdi mdi-check-bold" title="" data-original-title="Yes"></i></span>',
+            self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")[1].find_by_tag("td")[-2].html,
+            '<span class="text-success"><i class="mdi mdi-check-bold" title="Yes"></i></span>',
         )
         # Virtual machine still fails
         self.assertEqual(
-            self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")[2].find_by_tag("td")[-2].html,
-            '<span class="text-danger"><i class="mdi mdi-close-thick" title="" data-original-title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
+            self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")[2].find_by_tag("td")[-2].html,
+            '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
         )

nautobot/extras/tests/integration/test_customfields.py

@@ -2,29 +2,23 @@ from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
 from selenium.webdriver.common.keys import Keys
 
-from nautobot.core.testing.integration import SeleniumTestCase
+from nautobot.core.testing.integration import ObjectDetailsMixin, SeleniumTestCase
 from nautobot.dcim.models import Device
 from nautobot.extras.models import CustomField, CustomFieldChoice
 
 from . import create_test_device
 
 
-class CustomFieldTestCase(SeleniumTestCase):
+class CustomFieldTestCase(SeleniumTestCase, ObjectDetailsMixin):
     """
     Integration tests for the CustomField and CustomFieldChoice models.
     """
 
     def setUp(self):
         super().setUp()
-        self.user.is_superuser = True
-        self.user.save()
-        self.login(self.user.username, self.password)
+        self.login_as_superuser()
         self.device = create_test_device()
 
-    def tearDown(self):
-        self.logout()
-        super().tearDown()
-
     def _create_custom_field(self, field_label, field_type, choices=None, call_before_create=None):
         """
         Repeatable method for creating custom fields.
@@ -45,15 +39,14 @@ class CustomFieldTestCase(SeleniumTestCase):
 
         # Navigate to CustomFields list view
         self.browser.visit(self.live_server_url)
-        self.browser.links.find_by_partial_text("Extensibility").click()
-        self.browser.links.find_by_partial_text("Custom Fields").click()
+        self.click_navbar_entry("Extensibility", "Custom Fields")
 
         # Click add button
         self.browser.find_by_id("add-button").click()
 
         # Fill out form
         self.browser.select("type", field_type)
-        self.browser.fill("label", field_label)
+        self.fill_input("label", field_label)
 
         # Find the "content_types" dynamic multi-select and type into it.
         # See: https://splinter.readthedocs.io/en/latest/elements-in-the-page.html#interacting-with-forms
@@ -64,14 +57,14 @@ class CustomFieldTestCase(SeleniumTestCase):
 
         # Enumerate and set the choices (if any)
         for idx, choice in enumerate(choices):
-            self.browser.fill(f"custom_field_choices-{idx}-value", choice)
+            self.fill_input(f"custom_field_choices-{idx}-value", choice)
 
         # Do the pre-create stuff
         if callable(call_before_create):
             call_before_create()
 
         # Click that "Create" button
-        self.browser.find_by_text("Create").click()
+        self.browser.find_by_xpath("//button[contains(normalize-space(), 'Create')]").click()
 
         # Verify form redirect and presence of choices
         self.assertTrue(self.browser.is_text_present(f"Created custom field {field_label}"))
@@ -117,10 +110,14 @@ class CustomFieldTestCase(SeleniumTestCase):
             self.assertEqual(len(table.find_by_css(".formset_row-custom_field_choices")), 5)
 
             # And 6 after clicking "Add another..."
-            self.browser.find_by_css(".add-row").click()
+            self.click_button(".add-row")
+            # Before proceeding with further assertions and interactions, wait for the 6th row to appear in the DOM.
+            self.browser.is_element_present_by_css(
+                "#custom-field-choices .formset_row-custom_field_choices:nth-of-type(6)", wait_time=5
+            )
             rows = table.find_by_css(".formset_row-custom_field_choices")
             self.assertEqual(len(rows), 6)
-            self.browser.fill("custom_field_choices-5-value", "choice3")
+            self.fill_input("custom_field_choices-5-value", "choice3")
 
             # Make sure it the new row has default values while we're at it.
             self.assertEqual(rows.last.find_by_name("custom_field_choices-5-weight").value, "100")
@@ -147,19 +144,18 @@ class CustomFieldTestCase(SeleniumTestCase):
         self.assertIn("edit", self.browser.url)
 
         # Null out the first choice, click "Update", expect it to fail.
-        self.browser.fill("custom_field_choices-0-value", "")
+        self.fill_input("custom_field_choices-0-value", "")
         self.assertEqual(self.browser.find_by_name("custom_field_choices-0-value").value, "")
-        self.browser.find_by_text("Update").click()
+        self.browser.find_by_xpath("//button[contains(normalize-space(), 'Update')]").click()
         self.assertTrue(self.browser.is_text_present(f"{cf_label} failed validation"))
         self.assertTrue(self.browser.is_text_present("This field is required."))
 
         #
         # Pass updating existing choice (changing value of existing choice)
         #
-
         # Fix it, save it, assert correctness.
-        self.browser.fill("custom_field_choices-0-value", "new_choice")
-        self.browser.find_by_text("Update").click()
+        self.fill_input("custom_field_choices-0-value", "new_choice")
+        self.browser.find_by_xpath("//button[contains(normalize-space(), 'Update')]").click()
         self.assertEqual(self.browser.url, detail_url)
         self.assertTrue(self.browser.is_text_present("Modified custom field"))
         self.assertTrue(self.browser.is_text_present("new_choice"))
@@ -178,13 +174,13 @@ class CustomFieldTestCase(SeleniumTestCase):
 
         # Gather the rows, delete the first one, add a new one.
         table = self.browser.find_by_id("custom-field-choices")
-        self.browser.find_by_css(".add-row").click()  # Add a new row
+        self.click_button(".add-row")  # Add a new row
         rows = table.find_by_css(".formset_row-custom_field_choices")
         rows.first.find_by_css(".delete-row").click()  # Delete first row
 
         # Fill the new row, save it, assert correctness.
-        self.browser.fill("custom_field_choices-5-value", "new_choice")  # Fill the last row
-        self.browser.find_by_text("Update").click()
+        self.fill_input("custom_field_choices-5-value", "new_choice")  # Fill the last row
+        self.browser.find_by_xpath("//button[normalize-space()='Update']").click()
         self.assertEqual(self.browser.url, detail_url)
         self.assertTrue(self.browser.is_text_present("Modified custom field"))
         self.assertTrue(self.browser.is_text_present("new_choice"))
@@ -216,7 +212,7 @@ class CustomFieldTestCase(SeleniumTestCase):
         self.assertTrue(self.browser.is_text_present("Device Custom Field"))
         self.assertTrue(self.browser.is_text_present("This is some testing text"))
         # Check the custom field does NOT appear in the advanced tab
-        self.browser.links.find_by_partial_text("Advanced")[0].click()
+        self.switch_tab("Advanced")
         self.assertFalse(self.browser.is_text_present("Device Custom Field"))
         self.assertFalse(self.browser.is_text_present("This is some testing text"))
         # Set the custom_field to only show in the advanced tab
@@ -228,7 +224,7 @@ class CustomFieldTestCase(SeleniumTestCase):
         self.assertFalse(self.browser.is_text_present("Device Custom Field"))
         self.assertFalse(self.browser.is_text_present("This is some testing text"))
         # Check the custom field appears in the advanced tab
-        self.browser.links.find_by_partial_text("Advanced")[0].click()
+        self.switch_tab("Advanced")
         self.assertTrue(self.browser.is_text_present("Device Custom Field"))
         self.assertTrue(self.browser.is_text_present("This is some testing text"))
 
@@ -253,7 +249,7 @@ class CustomFieldTestCase(SeleniumTestCase):
         active_web_element = self.browser.driver.switch_to.active_element
         # Type invalid JSON data into the form
         active_web_element.send_keys('{"test_json_key": "Test JSON Value"}')
-        self.browser.find_by_xpath(".//button[contains(text(), 'Update')]").click()
+        self.browser.find_by_xpath("//button[contains(normalize-space(), 'Update')]").click()
         self.assertTrue(self.browser.is_text_present("Test Device"))
         # Confirm the JSON data is visible
         self.assertTrue(self.browser.is_text_present("Test JSON Value"))
@@ -279,7 +275,7 @@ class CustomFieldTestCase(SeleniumTestCase):
         active_web_element = self.browser.driver.switch_to.active_element
         # Type invalid JSON data into the form
         active_web_element.send_keys('{test_json_key: "Test Invalid JSON Value"}')
-        self.browser.find_by_xpath(".//button[contains(text(), 'Update')]").click()
+        self.browser.find_by_xpath("//button[normalize-space()='Update']").click()
         self.assertTrue(self.browser.is_text_present("Enter a valid JSON"))
 
     def test_saving_object_after_its_custom_field_deleted(self):
@@ -308,29 +304,33 @@ class CustomFieldTestCase(SeleniumTestCase):
         # Visit the device edit page
         self.browser.visit(f"{self.live_server_url}{reverse('dcim:device_edit', kwargs={'pk': device.pk})}")
         # Get the first item selected on the custom field
+        self.browser.execute_script(
+            'document.querySelector(\'label:has(+ * [name="cf_test_selection_field"])\').scrollIntoView({ behavior: "instant" });'
+        )
         self.browser.find_by_xpath(".//label[contains(text(), 'Device Selection Field')]").click()
         active_web_element = self.browser.driver.switch_to.active_element
         active_web_element.send_keys(Keys.ENTER)
         active_web_element.send_keys(Keys.ENTER)
         # Click update button
-        self.browser.find_by_xpath(".//button[contains(text(), 'Update')]").click()
+        self.browser.find_by_xpath("//button[contains(normalize-space(), 'Update')]").click()
         # Check successful redirect to device object page
         self.assertTrue(self.browser.is_text_present("Modified device"))
+        self.find_and_open_panel_v2("Custom Fields")
         self.assertTrue(self.browser.is_text_present("SelectionChoice"))
 
         # Delete the custom field
         # find_by_partial_text finds both Inventory > Platform as well as the desired top-level Platform menu
-        self.browser.links.find_by_partial_text("Extensibility").click()
-        self.browser.links.find_by_partial_text("Custom Fields").click()
+        self.click_navbar_entry("Extensibility", "Custom Fields")
         self.browser.links.find_by_partial_text("Device Selection Field").click()
         self.browser.find_by_id("actions-dropdown").click()
         self.browser.links.find_by_partial_text("Delete").click()
-        self.browser.find_by_xpath(".//button[contains(text(), 'Confirm')]").click()
+        self.browser.find_by_xpath("//button[contains(normalize-space(), 'Confirm')]").click()
 
         # Visit the device edit page
         self.browser.visit(f"{self.live_server_url}{reverse('dcim:device_edit', kwargs={'pk': device.pk})}")
         # Click update button
-        self.browser.find_by_xpath(".//button[contains(text(), 'Update')]").click()
+
+        self.browser.find_by_xpath("//button[contains(normalize-space(), 'Update')]").click()
         # Check successful redirect to device object page
         self.assertTrue(self.browser.is_text_present("Modified device"))
         # Check custom field is no longer present