Fixed #35331 -- Updated dropdown lists with entries added via the '+' sign from M2M field.

1 files changed, 61 insertions, 2 deletions

diff --git a/tests/admin_views/test_related_object_lookups.py b/tests/admin_views/test_related_object_lookups.py
index 761819a50f..4b2171a09f 100644
--- a/tests/admin_views/test_related_object_lookups.py
+++ b/tests/admin_views/test_related_object_lookups.py
@@ -3,6 +3,8 @@ from django.contrib.auth.models import User
 from django.test import override_settings
 from django.urls import reverse
 
+from .models import CamelCaseModel
+
 
 @override_settings(ROOT_URLCONF="admin_views.urls")
 class SeleniumTests(AdminSeleniumTestCase):
@@ -100,6 +102,8 @@ class SeleniumTests(AdminSeleniumTestCase):
         self.wait_until(lambda d: len(d.window_handles) == 1, 1)
         self.selenium.switch_to.window(self.selenium.window_handles[0])
 
+        id_value = CamelCaseModel.objects.get(interesting_name=interesting_name).id
+
         # Check that both the "Available" m2m box and the "Fk" dropdown now
         # include the newly added CamelCaseModel instance.
         fk_dropdown = self.selenium.find_element(By.ID, "id_fk")
@@ -107,7 +111,7 @@ class SeleniumTests(AdminSeleniumTestCase):
             fk_dropdown.get_attribute("innerHTML"),
             f"""
             <option value="" selected="">---------</option>
-            <option value="1" selected>{interesting_name}</option>
+            <option value="{id_value}" selected>{interesting_name}</option>
             """,
         )
         # Check the newly added instance is not also added in the "to" box.
@@ -117,6 +121,61 @@ class SeleniumTests(AdminSeleniumTestCase):
         self.assertHTMLEqual(
             m2m_box.get_attribute("innerHTML"),
             f"""
-            <option value="1">{interesting_name}</option>
+            <option title="{interesting_name}" value="{id_value}">
+            {interesting_name}</option>
+            """,
+        )
+
+    def test_related_object_add_js_actions(self):
+        from selenium.webdriver.common.by import By
+
+        add_url = reverse("admin:admin_views_camelcaserelatedmodel_add")
+        self.selenium.get(self.live_server_url + add_url)
+        m2m_to = self.selenium.find_element(By.ID, "id_m2m_to")
+        m2m_box = self.selenium.find_element(By.ID, "id_m2m_from")
+        fk_dropdown = self.selenium.find_element(By.ID, "id_fk")
+
+        # Add new related entry using +.
+        name = "Bergeron"
+        self.selenium.find_element(By.ID, "add_id_m2m").click()
+        self.wait_for_and_switch_to_popup()
+        self.selenium.find_element(By.ID, "id_interesting_name").send_keys(name)
+        self.selenium.find_element(By.NAME, "_save").click()
+        self.wait_until(lambda d: len(d.window_handles) == 1, 1)
+        self.selenium.switch_to.window(self.selenium.window_handles[0])
+
+        id_value = CamelCaseModel.objects.get(interesting_name=name).id
+
+        # Check the new value correctly appears in the "to" box.
+        self.assertHTMLEqual(
+            m2m_to.get_attribute("innerHTML"),
+            f"""<option title="{name}" value="{id_value}">{name}</option>""",
+        )
+        self.assertHTMLEqual(m2m_box.get_attribute("innerHTML"), "")
+        self.assertHTMLEqual(
+            fk_dropdown.get_attribute("innerHTML"),
+            f"""
+            <option value="" selected>---------</option>
+            <option value="{id_value}">{name}</option>
             """,
         )
+
+        # Move the new value to the from box.
+        self.selenium.find_element(By.XPATH, "//*[@id='id_m2m_to']/option").click()
+        self.selenium.find_element(By.XPATH, "//*[@id='id_m2m_remove_link']").click()
+
+        self.assertHTMLEqual(
+            m2m_box.get_attribute("innerHTML"),
+            f"""<option title="{name}" value="{id_value}">{name}</option>""",
+        )
+        self.assertHTMLEqual(m2m_to.get_attribute("innerHTML"), "")
+
+        # Move the new value to the to box.
+        self.selenium.find_element(By.XPATH, "//*[@id='id_m2m_from']/option").click()
+        self.selenium.find_element(By.XPATH, "//*[@id='id_m2m_add_link']").click()
+
+        self.assertHTMLEqual(m2m_box.get_attribute("innerHTML"), "")
+        self.assertHTMLEqual(
+            m2m_to.get_attribute("innerHTML"),
+            f"""<option title="{name}" value="{id_value}">{name}</option>""",
+        )