OP-290: tests

BitBagCommerce · Sep 3, 2024 · f245fe6 · f245fe6
1 parent 8c8e236
commit f245fe6
Show file tree

Hide file tree

Showing 22 changed files with 67 additions and 197 deletions.
diff --git a/spec/Assigner/ChannelsAssignerSpec.php b/spec/Assigner/ChannelsAssignerSpec.php
@@ -34,8 +34,7 @@ public function it_assigns_channels(
         ChannelInterface $posChannel,
         ChannelsAwareInterface $channelsAware,
     ): void {
-        $channelRepository->findOneBy(['code' => 'web'])->willReturn($webChannel);
-        $channelRepository->findOneBy(['code' => 'pos'])->willReturn($posChannel);
+        $channelRepository->findBy(['code' => ['web', 'pos']])->willReturn([$webChannel, $posChannel]);
 
         $channelsAware->addChannel($webChannel)->shouldBeCalled();
         $channelsAware->addChannel($posChannel)->shouldBeCalled();

diff --git a/spec/Assigner/CollectionsAssignerSpec.php b/spec/Assigner/CollectionsAssignerSpec.php
@@ -34,8 +34,7 @@ public function it_assigns_collections(
         CollectionInterface $blogCollection,
         CollectibleInterface $collectionsAware,
     ): void {
-        $collectionRepository->findOneBy(['code' => 'about'])->willReturn($aboutCollection);
-        $collectionRepository->findOneBy(['code' => 'blog'])->willReturn($blogCollection);
+        $collectionRepository->findBy(['code' => ['about', 'blog']])->willReturn([$aboutCollection, $blogCollection]);
 
         $collectionsAware->addCollection($aboutCollection)->shouldBeCalled();
         $collectionsAware->addCollection($blogCollection)->shouldBeCalled();

diff --git a/spec/Assigner/LocalesAssignerSpec.php b/spec/Assigner/LocalesAssignerSpec.php
@@ -37,7 +37,7 @@ public function it_assigns_locales_to_locale_aware_entity(
         $locale1->getCode()->willReturn('en_US');
         $locale2->getCode()->willReturn('fr_FR');
 
-        $localeRepository->findAll()->willReturn([$locale1, $locale2]);
+        $localeRepository->findBy(['code' => ['en_US', 'fr_FR']])->willReturn([$locale1, $locale2]);
 
         $localesAware->addLocale($locale1)->shouldBeCalled();
         $localesAware->addLocale($locale2)->shouldBeCalled();

diff --git a/spec/Assigner/ProductsAssignerSpec.php b/spec/Assigner/ProductsAssignerSpec.php
@@ -34,8 +34,7 @@ public function it_assigns_products(
         ProductInterface $tshirtProduct,
         ProductsAwareInterface $productsAware,
     ): void {
-        $productRepository->findOneBy(['code' => 'mug'])->willReturn($mugProduct);
-        $productRepository->findOneBy(['code' => 't-shirt'])->willReturn($tshirtProduct);
+        $productRepository->findBy(['code' => ['mug', 't-shirt']])->willReturn([$mugProduct, $tshirtProduct]);
 
         $productsAware->addProduct($mugProduct)->shouldBeCalled();
         $productsAware->addProduct($tshirtProduct)->shouldBeCalled();

diff --git a/spec/Assigner/ProductsInTaxonsAssignerSpec.php b/spec/Assigner/ProductsInTaxonsAssignerSpec.php
@@ -37,8 +37,7 @@ public function it_assigns_taxons_to_products_in_taxons_aware_entity(
         $taxon1->getCode()->willReturn('taxon_code_1');
         $taxon2->getCode()->willReturn('taxon_code_2');
 
-        $taxonRepository->findOneBy(['code' => 'taxon_code_1'])->willReturn($taxon1);
-        $taxonRepository->findOneBy(['code' => 'taxon_code_2'])->willReturn($taxon2);
+        $taxonRepository->findBy(['code' => ['taxon_code_1', 'taxon_code_2']])->willReturn([$taxon1, $taxon2]);
 
         $productsInTaxonsAware->addProductsInTaxon($taxon1)->shouldBeCalled();
         $productsInTaxonsAware->addProductsInTaxon($taxon2)->shouldBeCalled();

diff --git a/spec/Assigner/TaxonsAssignerSpec.php b/spec/Assigner/TaxonsAssignerSpec.php
@@ -34,8 +34,7 @@ public function it_assigns_taxons(
         TaxonInterface $stickersTaxon,
         TaxonAwareInterface $taxonsAware,
     ): void {
-        $taxonRepository->findOneBy(['code' => 'mugs'])->willReturn($mugsTaxon);
-        $taxonRepository->findOneBy(['code' => 'stickers'])->willReturn($stickersTaxon);
+        $taxonRepository->findBy(['code' => ['mugs', 'stickers']])->willReturn([$mugsTaxon, $stickersTaxon]);
 
         $taxonsAware->addTaxon($mugsTaxon)->shouldBeCalled();
         $taxonsAware->addTaxon($stickersTaxon)->shouldBeCalled();

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -137,7 +137,7 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
                                             ->children()
                                                 ->scalarNode('model')->defaultValue(MediaTranslation::class)->cannotBeEmpty()->end()
                                                 ->scalarNode('interface')->defaultValue(MediaTranslationInterface::class)->cannotBeEmpty()->end()
-                                                ->scalarNode('factory')->defaultValue(TranslatableFactory::class)->cannotBeEmpty()->end()
+                                                ->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end()
                                             ->end()
                                         ->end()
                                     ->end()
@@ -167,7 +167,7 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
                                             ->children()
                                                 ->scalarNode('model')->defaultValue(PageTranslation::class)->cannotBeEmpty()->end()
                                                 ->scalarNode('interface')->defaultValue(PageTranslationInterface::class)->cannotBeEmpty()->end()
-                                                ->scalarNode('factory')->defaultValue(TranslatableFactory::class)->cannotBeEmpty()->end()
+                                                ->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end()
                                             ->end()
                                         ->end()
                                     ->end()

diff --git a/src/Resources/config/api_resources/Block.xml b/src/Resources/config/api_resources/Block.xml
@@ -41,10 +41,14 @@
 
         <property name="id" identifier="true" writable="false"/>
         <property name="code" identifier="false" writable="false"/>
+        <property name="name" identifier="false" writable="false"/>
         <property name="enabled" identifier="false" writable="false"/>
+        <property name="channels" identifier="false" writable="false"/>
+        <property name="locales" identifier="false" writable="false"/>
         <property name="collections" identifier="false" writable="false"/>
         <property name="products" identifier="false" writable="false"/>
-        <property name="channels" identifier="false" writable="false"/>
-        <property name="taxonomies" identifier="false" writable="false"/>
+        <property name="taxons" identifier="false" writable="false"/>
+        <property name="productsInTaxons" identifier="false" writable="false"/>
+        <property name="contentElements" identifier="false" writable="false"/>
     </resource>
 </resources>
diff --git a/src/Resources/config/serialization/Block.xml b/src/Resources/config/serialization/Block.xml
@@ -12,16 +12,23 @@
             <group>sylius_cms:block:read:index</group>
             <group>sylius_cms:block:read:show</group>
         </attribute>
-        <attribute name="enabled">
+        <attribute name="name">
             <group>sylius_cms:block:read:index</group>
             <group>sylius_cms:block:read:show</group>
         </attribute>
-        <attribute name="collections">
+        <attribute name="enabled">
+            <group>sylius_cms:block:read:index</group>
             <group>sylius_cms:block:read:show</group>
         </attribute>
         <attribute name="channels">
             <group>sylius_cms:block:read:show</group>
         </attribute>
+        <attribute name="locales">
+            <group>sylius_cms:block:read:show</group>
+        </attribute>
+        <attribute name="collections">
+            <group>sylius_cms:block:read:show</group>
+        </attribute>
         <attribute name="products">
             <group>sylius_cms:block:read:show</group>
         </attribute>

diff --git a/src/Resources/config/serialization/Collection.xml b/src/Resources/config/serialization/Collection.xml
@@ -13,6 +13,7 @@
             <group>sylius_cms:collection:read:show</group>
         </attribute>
         <attribute name="type">
+            <group>sylius_cms:collection:read:index</group>
             <group>sylius_cms:collection:read:show</group>
         </attribute>
         <attribute name="pages">

diff --git a/src/Resources/config/serialization/Media.xml b/src/Resources/config/serialization/Media.xml
@@ -20,14 +20,14 @@
             <group>sylius_cms:media:read:index</group>
             <group>sylius_cms:media:read:show</group>
         </attribute>
-        <attribute name="path">
+        <attribute name="enabled">
+            <group>sylius_cms:media:read:index</group>
             <group>sylius_cms:media:read:show</group>
         </attribute>
-        <attribute name="mimeType">
+        <attribute name="path">
             <group>sylius_cms:media:read:show</group>
         </attribute>
-        <attribute name="enabled">
-            <group>sylius_cms:media:read:index</group>
+        <attribute name="mimeType">
             <group>sylius_cms:media:read:show</group>
         </attribute>
         <attribute name="width">

diff --git a/tests/Functional/DataFixtures/ORM/Api/BlockTest/block.yml b/tests/Functional/DataFixtures/ORM/Api/BlockTest/block.yml
@@ -74,25 +74,34 @@ Sylius\Component\Core\Model\ProductVariant:
 Sylius\CmsPlugin\Entity\Block:
   block1:
     code: 'block1-code'
+    name: 'block1-name'
     enabled: true
     collections:
       - '@collection1'
     channels:
       - '@channel'
+    locales:
+        - '@locale'
   block2:
     code: 'block2-code'
+    name: 'block2-name'
     enabled: true
     collections:
       - '@collection2'
     channels:
       - '@channel'
+    locales:
+      - '@locale'
   block3:
     code: 'block3-code'
-    enabled: false
+    name: 'block3-name'
+    enabled: true
     collections:
       - '@collection3'
     channels:
       - '@channel'
+    locales:
+      - '@locale'
 Sylius\CmsPlugin\Entity\Collection:
   collection1:
     code: 'collection1-code'

diff --git a/tests/Functional/DataFixtures/ORM/Api/CollectionTest/collection.yml b/tests/Functional/DataFixtures/ORM/Api/CollectionTest/collection.yml
@@ -21,9 +21,12 @@ Sylius\CmsPlugin\Entity\Collection:
   collection1:
     code: 'collection1-code'
     name: 'collection1-name'
+    type: 'page'
   collection2:
     code: 'collection2-code'
     name: 'collection2-name'
+    type: 'block'
   collection3:
     code: 'collection3-code'
     name: 'collection3-name'
+    type: 'media'
diff --git a/tests/Functional/DataFixtures/ORM/Api/MediaTest/media.yml b/tests/Functional/DataFixtures/ORM/Api/MediaTest/media.yml
@@ -113,7 +113,7 @@ Sylius\CmsPlugin\Entity\Media:
   media3:
     code: 'media3-code'
     name: 'media3-name'
-    enabled: false
+    enabled: true
     type: 'image'
     path: '/path/to/media3'
     collections:

diff --git a/tests/Functional/DataFixtures/ORM/Api/PageTest/page.yml b/tests/Functional/DataFixtures/ORM/Api/PageTest/page.yml
@@ -109,7 +109,7 @@ Sylius\CmsPlugin\Entity\Page:
       - '@page2_translation'
   page3:
     code: 'page3-code'
-    enabled: false
+    enabled: true
     collections:
       - '@collection3'
     channels:

diff --git a/tests/Functional/Responses/Expected/Api/BlockTest/test_it_get_block_by_id.json b/tests/Functional/Responses/Expected/Api/BlockTest/test_it_get_block_by_id.json
@@ -4,18 +4,17 @@
   "@type": "Block",
   "id": "@integer@",
   "code": "block1-code",
+  "name": "block1-name",
   "enabled": true,
   "collections": [
-    {
-      "@id": "/api/v2/shop/cms-plugin/collections/@integer@",
-      "@type": "Collection",
-      "id": "@integer@",
-      "code": "collection1-code"
-    }
+    "/api/v2/shop/cms-plugin/collections/@integer@"
   ],
   "channels": [
     "/api/v2/shop/channels/code"
   ],
+  "locales": [
+    "/api/v2/shop/locales/@string@"
+  ],
   "contentElements": [],
   "products": [],
   "taxons": [],

diff --git a/tests/Functional/Responses/Expected/Api/BlockTest/test_it_get_blocks.json b/tests/Functional/Responses/Expected/Api/BlockTest/test_it_get_blocks.json
@@ -8,66 +8,24 @@
       "@type": "Block",
       "id": "@integer@",
       "code": "block1-code",
-      "enabled": true,
-      "collections": [
-        {
-          "@id": "/api/v2/shop/cms-plugin/collections/@integer@",
-          "@type": "Collection",
-          "id": "@integer@",
-          "code": "collection1-code"
-        }
-      ],
-      "channels": [
-        "/api/v2/shop/channels/code"
-      ],
-      "contentElements": [],
-      "products": [],
-      "taxons": [],
-      "productsInTaxons": []
+      "name": "block1-name",
+      "enabled": true
     },
     {
       "@id": "/api/v2/shop/cms-plugin/blocks/@integer@",
       "@type": "Block",
       "id": "@integer@",
       "code": "block2-code",
-      "enabled": true,
-      "collections": [
-        {
-          "@id": "/api/v2/shop/cms-plugin/collections/@integer@",
-          "@type": "Collection",
-          "id": "@integer@",
-          "code": "collection2-code"
-        }
-      ],
-      "channels": [
-        "/api/v2/shop/channels/code"
-      ],
-      "contentElements": [],
-      "products": [],
-      "taxons": [],
-      "productsInTaxons": []
+      "name": "block2-name",
+      "enabled": true
     },
     {
       "@id": "/api/v2/shop/cms-plugin/blocks/@integer@",
       "@type": "Block",
       "id": "@integer@",
       "code": "block3-code",
-      "enabled": false,
-      "collections": [
-        {
-          "@id": "/api/v2/shop/cms-plugin/collections/@integer@",
-          "@type": "Collection",
-          "id": "@integer@",
-          "code": "collection3-code"
-        }
-      ],
-      "channels": [
-        "/api/v2/shop/channels/code"
-      ],
-      "contentElements": [],
-      "products": [],
-      "taxons": [],
-      "productsInTaxons": []
+      "name": "block3-name",
+      "enabled": true
     }
   ],
   "hydra:totalItems": 3

diff --git a/tests/Functional/Responses/Expected/Api/CollectionTest/test_it_get_collection_by_id.json b/tests/Functional/Responses/Expected/Api/CollectionTest/test_it_get_collection_by_id.json
@@ -3,5 +3,9 @@
   "@id": "/api/v2/shop/cms-plugin/collections/@integer@",
   "@type": "Collection",
   "id": "@integer@",
-  "code": "collection1-code"
+  "code": "collection1-code",
+  "type": "page",
+  "pages": [],
+  "blocks": [],
+  "media": []
 }