fix: adjust deleted_objects count + drop dependent merge UI test

- unittests/test_rest_framework.py: EngagementTest.deleted_objects went
  from 23 -> 21 because the cascading delete no longer pulls 2
  Stub_Finding rows.
- tests/test_test.py: drop test_merge_findings (the integration test
  needed two findings; the second one used to come from the stub
  finding promote flow which is now gone). The merge functionality is
  still covered by the unit tests.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: Maffooch

.gitignore

@@ -152,3 +152,4 @@ docs/.hugo_build.lock
 
 # claude etc
 MEMORY.md
+.claude/

tests/test_test.py

@@ -188,27 +188,6 @@ def test_add_test_finding(self):
         driver.find_element(By.LINK_TEXT, "App Vulnerable to XSS2").click()
         self.assertTrue(self.is_text_present_on_page(text="product2.finding.com"))
 
-    def test_merge_findings(self):
-        # View existing test from ProductTest()
-        # Login to the site.
-        driver = self.driver
-
-        # Navigate to the engagement page
-        self.goto_active_engagements_overview(driver)
-        # Select a previously created engagement title
-        driver.find_element(By.PARTIAL_LINK_TEXT, "Beta Test").click()
-        driver.find_element(By.PARTIAL_LINK_TEXT, "Quick Security Testing").click()
-
-        driver.find_element(By.ID, "select_all").click()
-
-        driver.find_element(By.ID, "merge_findings").click()
-
-        Select(driver.find_element(By.ID, "id_finding_action")).select_by_visible_text("Inactive")
-
-        Select(driver.find_element(By.ID, "id_findings_to_merge")).select_by_visible_text("App Vulnerable to XSS3")
-
-        driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
-
     def test_delete_test(self):
         # Login to the site. Password will have to be modified
         # to match an admin password in your own container
@@ -239,7 +218,9 @@ def suite():
     suite.addTest(TestUnitTest("test_create_test"))
     suite.addTest(TestUnitTest("test_edit_test"))
     suite.addTest(TestUnitTest("test_add_test_finding"))
-    suite.addTest(TestUnitTest("test_merge_findings"))
+    # test_merge_findings depended on the stub-finding promote flow to create
+    # a second finding ("App Vulnerable to XSS3") before merging — drop it
+    # along with the rest of the stub-finding scaffolding.
     suite.addTest(TestUnitTest("test_add_note"))
     suite.addTest(TestUnitTest("test_delete_test"))
     suite.addTest(ProductTest("test_delete_product"))

unittests/test_rest_framework.py

@@ -1682,7 +1682,9 @@ def __init__(self, *args, **kwargs):
         self.permission_create = Permissions.Engagement_Add
         self.permission_update = Permissions.Engagement_Edit
         self.permission_delete = Permissions.Engagement_Delete
-        self.deleted_objects = 23
+        # 23 -> 21: cascading delete no longer pulls 2 Stub_Finding rows now
+        # that the model has been removed.
+        self.deleted_objects = 21
         BaseClass.RESTEndpointTest.__init__(self, *args, **kwargs)