OP-322: Tests adjustments

BitBagCommerce · Jul 1, 2024 · b547cda · b547cda
1 parent be82c22
commit b547cda
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 90 deletions.
diff --git a/spec/Entity/CollectionTranslationSpec.php b/spec/Entity/CollectionTranslationSpec.php
diff --git a/src/Resources/config/config.yml b/src/Resources/config/config.yml
@@ -15,7 +15,6 @@ parameters:
     bitbag_sylius_cms_plugin.form.type.frequently_asked_question.validation_groups: "%bitbag_validation_group%"
     bitbag_sylius_cms_plugin.form.type.translation.frequently_asked_question.validation_groups: "%bitbag_validation_group%"
     bitbag_sylius_cms_plugin.form.type.collection.validation_groups: "%bitbag_validation_group%"
-    bitbag_sylius_cms_plugin.form.type.translation.collection.validation_groups: "%bitbag_validation_group%"
     bitbag_sylius_cms_plugin.form.type.translation.media.validation_groups: "%bitbag_validation_group%"
     bitbag_sylius_cms_plugin.form.type.media.validation_groups: "%bitbag_validation_group%"
     bitbag_sylius_cms_plugin.uploader.filesystem: bitbag_sylius_cms_plugin_media

diff --git a/src/Resources/config/serialization/Block.xml b/src/Resources/config/serialization/Block.xml
@@ -25,9 +25,6 @@
         <attribute name="taxons">
             <group>shop:cms:read</group>
         </attribute>
-        <attribute name="translations">
-            <group>shop:cms:read</group>
-        </attribute>
         <attribute name="contentElements">
             <group>shop:cms:read</group>
         </attribute>

diff --git a/tests/Functional/Api/CollectionTest.php b/tests/Functional/Api/CollectionTest.php
@@ -28,7 +28,7 @@ public function setUp(): void
     public function test_collection_response(): void
     {
         /** @var CollectionInterface $collection */
-        $collection = $this->getRepository()->findOneByCode('collection1-code', 'en_US');
+        $collection = $this->getRepository()->findOneByCode('collection1-code');
         $this->client->request('GET', '/api/v2/shop/cms-plugin/collections/' . $collection->getId(), [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 

diff --git a/tests/Functional/DataFixtures/ORM/Api/CollectionTest/collection.yml b/tests/Functional/DataFixtures/ORM/Api/CollectionTest/collection.yml
@@ -20,13 +20,10 @@ Sylius\Component\Core\Model\Channel:
 BitBag\SyliusCmsPlugin\Entity\Collection:
   collection1:
     code: 'collection1-code'
-    translations:
-      - '@collection1_translation'
+    name: 'collection1-name'
   collection2:
     code: 'collection2-code'
-    translations:
-      - '@collection2_translation'
+    name: 'collection2-name'
   collection3:
     code: 'collection3-code'
-    translations:
-      - '@collection3_translation'
+    name: 'collection3-name'
diff --git a/...ntegration/DataFixtures/ORM/CollectionRepositoryTest/test_it_finds_collection_by_code.yml b/...ntegration/DataFixtures/ORM/CollectionRepositoryTest/test_it_finds_collection_by_code.yml
@@ -20,13 +20,7 @@ Sylius\Component\Core\Model\Channel:
 BitBag\SyliusCmsPlugin\Entity\Collection:
   collection1:
     code: 'collection1-code'
-    translations:
-      - '@collection1_translation'
   collection2:
     code: 'collection2-code'
-    translations:
-      - '@collection2_translation'
   collection3:
     code: 'collection3-code'
-    translations:
-      - '@collection3_translation'
diff --git a/...ataFixtures/ORM/CollectionRepositoryTest/test_it_finds_collection_by_codes_and_locale.yml b/...ataFixtures/ORM/CollectionRepositoryTest/test_it_finds_collection_by_codes_and_locale.yml
@@ -20,13 +20,7 @@ Sylius\Component\Core\Model\Channel:
 BitBag\SyliusCmsPlugin\Entity\Collection:
   collection1:
     code: 'collection1-code'
-    translations:
-      - '@collection1_translation'
   collection2:
     code: 'collection2-code'
-    translations:
-      - '@collection2_translation'
   collection3:
     code: 'collection3-code'
-    translations:
-      - '@collection3_translation'
diff --git a/...ntegration/DataFixtures/ORM/CollectionRepositoryTest/test_it_finds_collection_by_name.yml b/...ntegration/DataFixtures/ORM/CollectionRepositoryTest/test_it_finds_collection_by_name.yml
@@ -20,13 +20,10 @@ Sylius\Component\Core\Model\Channel:
 BitBag\SyliusCmsPlugin\Entity\Collection:
   collection1:
     code: 'collection1-code'
-    translations:
-      - '@collection1_translation'
+    name: 'collection1-name'
   collection2:
     code: 'collection2-code'
-    translations:
-      - '@collection2_translation'
+    name: 'collection2-name'
   collection3:
     code: 'collection3-code'
-    translations:
-      - '@collection3_translation'
+    name: 'collection3-name'
diff --git a/tests/Integration/Repository/CollectionRepositoryTest.php b/tests/Integration/Repository/CollectionRepositoryTest.php
@@ -14,7 +14,6 @@
 use ApiTestCase\JsonApiTestCase;
 use BitBag\SyliusCmsPlugin\Entity\CollectionInterface;
 use BitBag\SyliusCmsPlugin\Repository\CollectionRepositoryInterface;
-use Doctrine\ORM\QueryBuilder;
 
 final class CollectionRepositoryTest extends JsonApiTestCase
 {
@@ -23,26 +22,14 @@ public function setUp(): void
         parent::setUp();
     }
 
-    public function test_it_creates_list_query_builder(): void
-    {
-        $repository = $this->getRepository();
-
-        $localeCode = 'en_US';
-        $queryBuilder = $repository->createListQueryBuilder($localeCode);
-
-        self::assertInstanceOf(QueryBuilder::class, $queryBuilder);
-        self::assertNotNull($queryBuilder->getQuery());
-    }
-
     public function test_it_finds_collection_by_name_part(): void
     {
         $this->loadFixturesFromFile('CollectionRepositoryTest/test_it_finds_collection_by_name.yml');
 
         $repository = $this->getRepository();
 
-        $phrase = 'translation';
-        $locale = 'en_US';
-        $collections = $repository->findByNamePart($phrase, $locale);
+        $phrase = 'collection';
+        $collections = $repository->findByNamePart($phrase);
 
         self::assertIsArray($collections);
         self::assertCount(3, $collections);
@@ -68,8 +55,7 @@ public function test_it_finds_by_codes_and_locale(): void
         $repository = $this->getRepository();
 
         $codes = 'collection1-code,collection2-code';
-        $localeCode = 'en_US';
-        $collections = $repository->findByCodesAndLocale($codes, $localeCode);
+        $collections = $repository->findByCodes($codes);
 
         self::assertIsArray($collections);
         self::assertCount(2, $collections);

diff --git a/tests/Integration/Repository/PageRepositoryTest.php b/tests/Integration/Repository/PageRepositoryTest.php
@@ -54,8 +54,8 @@ public function test_it_finds_enabled_page_by_collection_code(): void
 
         $pageRepository = $this->getRepository();
 
-        $page1_array = $pageRepository->findByCollectionCode('collection1-code', 'en_US');
-        $page3_array = $pageRepository->findByCollectionCode('collection3-code', 'en_US');
+        $page1_array = $pageRepository->findByCollectionCode('collection1-code');
+        $page3_array = $pageRepository->findByCollectionCode('collection3-code');
 
         self::assertNotEmpty($page1_array);
         self::assertEmpty($page3_array);