retour MR

Author: vgreb

composer.lock

@@ -5,7 +5,6 @@
 namespace AppBundle\Controller\Admin\Accounting\Quotation;
 
 use AppBundle\Accounting\Form\QuotationType;
-use AppBundle\Accounting\Model\Invoicing;
 use AppBundle\Accounting\Model\Repository\InvoicingDetailRepository;
 use AppBundle\Accounting\Model\Repository\InvoicingRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -34,7 +33,6 @@ public function __invoke(Request $request): Response
                 $idsToRemove = $this->invoicingDetailRepository->getRowsIdsPerInvoicingId($quotation->getId());
                 $existingIds = [];
                 $this->invoicingRepository->startTransaction();
-                $this->cleanLegacyData($quotation);
                 $this->invoicingRepository->save($quotation);
                 foreach ($quotation->getDetails() as $detail) {
                     if ($detail->getId() !== null) {
@@ -63,21 +61,4 @@ public function __invoke(Request $request): Response
             'submitLabel' => 'Modifier',
         ]);
     }
-
-    /**
-     * Pour simplifier la modification d'un devis créé avant ma refonte sous symfony, on supprime les lignes vides
-     */
-    private function cleanLegacyData(Invoicing $quotation): void
-    {
-        $cleanedDetails = [];
-        foreach ($quotation->getDetails() as $detail) {
-            if (empty($detail->getDesignation()) && empty($detail->getQuantity()) && empty($detail->getUnitPrice()) && empty($detail->getReference())) {
-                $this->invoicingDetailRepository->delete($detail);
-            } else {
-                $cleanedDetails[] = $detail;
-            }
-        }
-        $quotation->setDetails($cleanedDetails);
-
-    }
 }

sources/AppBundle/Controller/Admin/Accounting/Quotation/EditQuotationAction.php

@@ -6,7 +6,6 @@
 
 use Afup\Tests\Support\TimeMocker;
 use Behat\Hook\BeforeScenario;
-use Behat\Mink\Driver\PantherDriver;
 use Behat\Step\Given;
 use Behat\Step\Then;
 use DateTimeImmutable;
@@ -24,10 +23,6 @@ private function initTimeContext(): void
     #[BeforeScenario]
     public function clearTestClock(): void
     {
-        if ($this->minkContext->getSession()->getDriver() instanceof PantherDriver) {
-            // setRequestHeader is not supported by PantherDriver
-            return;
-        }
         $this->timeMocker->clearCurrentDateMock();
     }
 

tests/behat/bootstrap/TimeContext.php

@@ -82,8 +82,7 @@ public function clickLinkOfTooltipAndWaitToSee(string $tooltip, string $text, ?s
         $session = $this->minkContext->getSession();
 
         if ($session->getDriver() instanceof \Behat\Mink\Driver\PantherDriver) {
-            $href = $link->getAttribute('href');
-            $session->executeScript(sprintf('window.location.href = %s;', json_encode($href)));
+            $link->click();
 
             $timeoutMs = $timeout !== null ? (int) $timeout : self::DEFAULT_TIMEOUT_MS;
             $this->waitForCondition(

tests/behat/bootstrap/WaitContext.php

@@ -53,7 +53,6 @@ Feature: Administration - Trésorerie - Devis/Facture
     And I fill in "quotation[details][1][quantity]" with "1"
     And I fill in "quotation[details][1][unitPrice]" with "12000"
     When I press "Ajouter" and wait until I see "L'écriture a été ajoutée"
-    Then I should see "L'écriture a été ajoutée"
     And I should see "ESN dev en folie"
     And I should see "Paris"
     And I should see "CLIENT-AFGD5S"