[CatalogPromotion][API] Minor fixes to creating simple catalog promotion

Sylius · Aug 24, 2021 · f046abb · f046abb
1 parent 597c353
commit f046abb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php
@@ -45,9 +45,6 @@ public function iCreateANewCatalogPromotionWithCodeAndName(string $code, string
      */
     public function thereShouldBeNewCatalogPromotionOnTheList(int $amount): void
     {
-        $x = $this->client->index();
-
-
         Assert::count($this->responseChecker->getCollection($this->client->index()), $amount);
     }
 
@@ -56,10 +53,9 @@ public function thereShouldBeNewCatalogPromotionOnTheList(int $amount): void
      */
     public function itShouldHaveCodeAndName(string $code, string $name): void
     {
-        $expectedValues = ['code' => $code, 'name' => $name];
         Assert::true(
-            $this->responseChecker->hasItemWithValues($this->client->index(), $expectedValues),
-            sprintf('Cannot find catalog promotions with %s in the list', implode(',', $expectedValues))
+            $this->responseChecker->hasItemWithValues($this->client->index(), ['code' => $code, 'name' => $name]),
+            sprintf('Cannot find catalog promotions with code "%s" and name "%s" in the list', $code, $name)
         );
     }
 }
diff --git a/src/Sylius/Bundle/PromotionBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/PromotionBundle/DependencyInjection/Configuration.php
@@ -22,6 +22,7 @@
 use Sylius\Bundle\ResourceBundle\Form\Type\DefaultResourceType;
 use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
 use Sylius\Component\Promotion\Model\CatalogPromotion;
+use Sylius\Component\Promotion\Model\CatalogPromotionInterface;
 use Sylius\Component\Promotion\Model\Promotion;
 use Sylius\Component\Promotion\Model\PromotionAction;
 use Sylius\Component\Promotion\Model\PromotionActionInterface;
@@ -31,7 +32,6 @@
 use Sylius\Component\Promotion\Model\PromotionRule;
 use Sylius\Component\Promotion\Model\PromotionRuleInterface;
 use Sylius\Component\Resource\Factory\Factory;
-use Sylius\Component\Resource\Model\ResourceInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -101,7 +101,7 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
                                     ->addDefaultsIfNotSet()
                                     ->children()
                                         ->scalarNode('model')->defaultValue(CatalogPromotion::class)->cannotBeEmpty()->end()
-                                        ->scalarNode('interface')->defaultValue(ResourceInterface::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('interface')->defaultValue(CatalogPromotionInterface::class)->cannotBeEmpty()->end()
                                         ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
                                         ->scalarNode('repository')->cannotBeEmpty()->end()
                                         ->scalarNode('factory')->defaultValue(Factory::class)->end()

diff --git a/tests/Api/Admin/CatalogPromotionsTest.php b/tests/Api/Admin/CatalogPromotionsTest.php
@@ -41,6 +41,6 @@ public function it_allows_admin_to_get_catalog_promotions(): void
 
         $response = $this->client->getResponse();
 
-        $this->assertResponse($response, 'admin/get_catalog_promotions_admin_response', Response::HTTP_OK);
+        $this->assertResponse($response, 'admin/get_catalog_promotions_response', Response::HTTP_OK);
     }
 }
diff --git a/tests/Api/DataFixtures/ORM/catalog_promotion.yaml b/tests/Api/DataFixtures/ORM/catalog_promotion.yaml
@@ -1,4 +1,4 @@
 Sylius\Component\Promotion\Model\CatalogPromotion:
     catalog_promotion:
-        name: "catalog promotion"
-        code: "catalog_promotion"
+        name: "Mugs discount"
+        code: "mugs_discount"
diff --git a/...et_catalog_promotions_admin_response.json → ...dmin/get_catalog_promotions_response.json b/...et_catalog_promotions_admin_response.json → ...dmin/get_catalog_promotions_response.json
@@ -7,8 +7,8 @@
             "@id": "\/api\/v2\/admin\/catalog-promotions\/catalog_promotion",
             "@type": "CatalogPromotion",
             "id": @integer@,
-            "name": "catalog promotion",
-            "code": "catalog_promotion"
+            "name": "Mugs discount",
+            "code": "mugs_discount"
         }
     ],
     "hydra:totalItems": 1