Batch DNC fix (mautic#14085)

* Fixing batch dnc * Loading the batch DNC form in the existing test to catch issues with it
lenonleite · Aug 29, 2024 · b5d174f · b5d174f
1 parent f66e8c9
commit b5d174f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/app/bundles/LeadBundle/Controller/LeadController.php b/app/bundles/LeadBundle/Controller/LeadController.php
@@ -1732,7 +1732,7 @@ public function batchDncAction(Request $request, DoNotContactModel $doNotContact
             $this->addFlashMessage(
                 'mautic.lead.batch_leads_affected',
                 [
-                    '%count%'     => $count,
+                    '%count%' => $count,
                 ]
             );
 
@@ -1754,15 +1754,9 @@ public function batchDncAction(Request $request, DoNotContactModel $doNotContact
         return $this->delegateView(
             [
                 'viewParameters' => [
-                    'form' => $this->createForm(
-                        DncType::class,
-                        [],
-                        [
-                            'action' => $route,
-                        ]
-                    )->createView(),
+                    'form' => $this->createForm(DncType::class, [], ['action' => $route])->createView(),
                 ],
-                'contentTemplate' => 'MauticLeadBundle:Batch:form.html.php',
+                'contentTemplate' => '@MauticLead/Batch/form.html.twig',
                 'passthroughVars' => [
                     'activeLink'    => '#mautic_contact_index',
                     'mauticContent' => 'leadBatch',

diff --git a/app/bundles/LeadBundle/Tests/Controller/LeadControllerTest.php b/app/bundles/LeadBundle/Tests/Controller/LeadControllerTest.php
@@ -936,14 +936,18 @@ public function testBatchDncIsNotUpdatingLeadEntities(): void
         $this->em->flush();
         $this->em->clear();
 
-        $payload = [
-            'lead_batch_dnc' => [
-                'reason' => 'Test Reason',
-                'ids'    => json_encode([$contact->getId()]),
-            ],
-        ];
-
-        $this->client->request(Request::METHOD_POST, '/s/contacts/batchDnc', $payload, [], $this->createAjaxHeaders());
+        $this->client->request(Request::METHOD_GET, '/s/contacts/batchDnc', [], [], $this->createAjaxHeaders());
+        Assert::assertTrue($this->client->getResponse()->isOk());
+        $crawler = new Crawler(json_decode($this->client->getResponse()->getContent(), true)['newContent'], $this->client->getInternalRequest()->getUri());
+        $form    = $crawler->selectButton('Save')->form();
+        $form->setValues(
+            [
+                'lead_batch_dnc[reason]' => 'Test Reason',
+                'lead_batch_dnc[ids]'    => json_encode([$contact->getId()]),
+            ]
+        );
+        $crawler = $this->client->submit($form);
+        $this->assertTrue($this->client->getResponse()->isOk(), $this->client->getResponse()->getContent());
 
         $clientResponse = $this->client->getResponse();