Fix Behat tests

BitBagCommerce · Feb 5, 2018 · 699353a · 699353a
1 parent 033f11f
commit 699353a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/Repository/ShippingGatewayRepository.php b/src/Repository/ShippingGatewayRepository.php
@@ -46,7 +46,7 @@ public function findOneByCode(string $code): ?ShippingMethodInterface
     public function findOneByShippingMethod(ShippingMethodInterface $shippingMethod): ?ShippingGatewayInterface
     {
         return $this->createQueryBuilder('o')
-            ->where('o.shippingMethod = :shippingMethod')
+            ->where(':shippingMethod MEMBER OF o.shippingMethods')
             ->setParameter('shippingMethod', $shippingMethod)
             ->getQuery()
             ->getOneOrNullResult()

diff --git a/tests/Behat/Context/Setup/ShippingExportContext.php b/tests/Behat/Context/Setup/ShippingExportContext.php
@@ -127,20 +127,6 @@ public function thoseOrdersWerePlacedWithShippingMethod($name)
         }
     }
 
-    /**
-     * @param ShipmentInterface $shipment
-     * @param ShippingGatewayInterface $shippingGateway
-     */
-    private function addShippingExportForGateway(ShipmentInterface $shipment, ShippingGatewayInterface $shippingGateway)
-    {
-        /** @var ShippingExport $shippingExport */
-        $shippingExport = $this->shippingExportFactory->createNew();
-        $shippingExport->setShipment($shipment);
-        $shippingExport->setShippingGateway($shippingGateway);
-
-        $this->shippingExportRepository->add($shippingExport);
-    }
-
     /**
      * @Given those orders were completed
      */
@@ -160,4 +146,18 @@ public function newShippingExportsShouldBeCreated($number)
     {
         Assert::eq(count($this->shippingExportRepository->findAll()), $number);
     }
+
+    /**
+     * @param ShipmentInterface $shipment
+     * @param ShippingGatewayInterface $shippingGateway
+     */
+    private function addShippingExportForGateway(ShipmentInterface $shipment, ShippingGatewayInterface $shippingGateway)
+    {
+        /** @var ShippingExport $shippingExport */
+        $shippingExport = $this->shippingExportFactory->createNew();
+        $shippingExport->setShipment($shipment);
+        $shippingExport->setShippingGateway($shippingGateway);
+
+        $this->shippingExportRepository->add($shippingExport);
+    }
 }
diff --git a/tests/Behat/Context/Setup/ShippingGatewayContext.php b/tests/Behat/Context/Setup/ShippingGatewayContext.php
@@ -94,7 +94,7 @@ public function thereIsARegisteredShippingGatewayForThisShippingMethod($code, $n
         /** @var ShippingMethodInterface $shippingMethod */
         $shippingMethod = $this->sharedStorage->get('shipping_method');
 
-        $shippingGateway->setShippingMethod($shippingMethod);
+        $shippingGateway->addShippingMethod($shippingMethod);
         $shippingGateway->setCode($code);
         $shippingGateway->setLabel($name);
         $shippingGateway->setConfig(['iban' => '123', 'address' => 'foo bar']);