[All] make CoreShop 2.1 have Pimcore 5.7 at min requirement coreshop#3 …

…- fix broken test
dpfaffenbauer · Mar 16, 2019 · 2541608 · 2541608
1 parent 3b01cbe
commit 2541608
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/features/product_quantity_price_rules/simple_quantity_price_rule.feature b/features/product_quantity_price_rules/simple_quantity_price_rule.feature
@@ -9,7 +9,7 @@ Feature: Adding a new product with a simple quantity price rule
     Then the product "Shoe" should be priced at "10000"
 
   Scenario: Add a quantity price rule with no conditions
-    Given adding a quantity price rule to product "Shoe" named "default-product-quantity-price-rule"
+    Given adding a quantity price rule to product "Shoe" named "default-product-quantity-price-rule" and with calculation-behaviour "volume"
     And the quantity price rule is active
     And the quantity price rule has a range from 0 to 10 with behaviour percentage-decrease of 10%
     Then the quantity price rule should be valid for product "Shoe"

diff --git a/src/CoreShop/Behat/Context/Setup/ProductQuantityPriceRuleContext.php b/src/CoreShop/Behat/Context/Setup/ProductQuantityPriceRuleContext.php
@@ -97,16 +97,17 @@ public function __construct(
     }
 
     /**
-     * @Given /^adding a quantity price rule to (product "[^"]+") named "([^"]+)"$/
+     * @Given /^adding a quantity price rule to (product "[^"]+") named "([^"]+)" and with calculation-behaviour "([^"]+)"$/
      */
-    public function addingAProductSpecificPriceRuleToProduct(ProductInterface $product, $ruleName)
+    public function addingAProductQuantityPriceRuleToProduct(ProductInterface $product, $ruleName, $calculationBehaviourName)
     {
         /**
          * @var ProductQuantityPriceRuleInterface $rule
          */
         $rule = $this->productQuantityPriceRuleFactory->createNew();
         $rule->setName($ruleName);
         $rule->setProduct($product->getId());
+        $rule->setCalculationBehaviour($calculationBehaviourName);
 
         $this->objectManager->persist($rule);
         $this->objectManager->flush();