[CatalogPromotion] Fixes after rebasing with exclusive promotions feature

GSadee · GSadee · commit f0560987caeb · 2021-11-25T10:31:00.000+01:00
diff --git a/src/Sylius/Behat/Context/Setup/CatalogPromotionContext.php b/src/Sylius/Behat/Context/Setup/CatalogPromotionContext.php
@@ -540,8 +540,8 @@ public function thereIsACatalogPromotionWithPriorityThatReducesPriceByFixedInThe
                 'configuration' => ['taxons' => [$taxon->getCode()]],
             ]],
             [[
-                'type' => CatalogPromotionActionInterface::TYPE_PERCENTAGE_DISCOUNT,
-                'configuration' => ['amount' => $discount],
+                'type' => CatalogPromotionActionInterface::TYPE_FIXED_DISCOUNT,
+                'configuration' => [$channel->getCode() => ['amount' => $discount]],
             ]],
             $priority,
         );
diff --git a/src/Sylius/Bundle/CoreBundle/spec/Applicator/CatalogPromotionApplicatorSpec.php b/src/Sylius/Bundle/CoreBundle/spec/Applicator/CatalogPromotionApplicatorSpec.php
@@ -89,6 +89,7 @@ function it_applies_percentage_discount_on_product_variant(
     }
 
     function it_applies_discount_on_product_variant_only_if_exclusive_promotion_is_not_already_applied(
+        CatalogPromotionPriceCalculatorInterface $priceCalculator,
         AppliedPromotionInformationFormatterInterface $appliedPromotionInformationFormatter,
         ProductVariantInterface $variant,
         CatalogPromotionInterface $catalogPromotion,
@@ -108,7 +109,6 @@ function it_applies_discount_on_product_variant_only_if_exclusive_promotion_is_n
         $variant->getChannelPricingForChannel($secondChannel)->willReturn($secondChannelPricing);
 
         $appliedPromotionInformationFormatter->format($catalogPromotion)->willReturn(['winter_sale' => ['name' => 'Winter sale']]);
-        $catalogPromotionAction->getConfiguration()->willReturn(['amount' => 0.3]);
 
         $firstChannelPricing->hasExclusiveCatalogPromotionApplied()->willReturn(true);
 
@@ -119,6 +119,9 @@ function it_applies_discount_on_product_variant_only_if_exclusive_promotion_is_n
         $secondChannelPricing->getOriginalPrice()->willReturn(null);
         $secondChannelPricing->getMinimumPrice()->willReturn(0);
         $secondChannelPricing->setOriginalPrice(1400)->shouldBeCalled();
+
+        $priceCalculator->calculate($secondChannelPricing, $catalogPromotionAction)->willReturn(980);
+
         $secondChannelPricing->setPrice(980)->shouldBeCalled();
         $secondChannelPricing->addAppliedPromotion(['winter_sale' => ['name' => 'Winter sale']])->shouldBeCalled();
         $catalogPromotion->isExclusive()->willReturn(false);
