Fix integration tests

Author: jissereitsma

DataLayer/Mapper/CartItemDataMapper.php

@@ -120,7 +120,7 @@ private function getPriceDiscount(CartItem $cartItem, float $price): float
     private function parseDataLayerMapping(CartItem $cartItem, array $data): array
     {
         if (empty($this->dataLayerMapping)) {
-            return [];
+            return $data;
         }
 
         foreach ($this->dataLayerMapping as $tagName => $tagValue) {

DataLayer/Mapper/CategoryDataMapper.php

@@ -40,12 +40,12 @@ public function mapByCategory(CategoryInterface $category): array
         $categoryData = [];
         $categoryFields = $this->getCategoryFields();
         foreach ($categoryFields as $categoryAttributeCode) {
-            $dataLayerKey = $prefix . $categoryAttributeCode;
             $attributeValue = $this->getAttributeValue->getCategoryAttributeValue($category, $categoryAttributeCode);
             if (empty($attributeValue)) {
                 continue;
             }
 
+            $dataLayerKey = $prefix . $categoryAttributeCode;
             $categoryData[$dataLayerKey] = $attributeValue;
         }
 
@@ -59,7 +59,7 @@ public function mapByCategory(CategoryInterface $category): array
      */
     private function getCategoryFields(): array
     {
-        return array_filter(array_merge(['id', 'name'], $this->config->getCategoryEavAttributeCodes()));
+        return array_unique(array_merge(['id', 'name'], $this->config->getCategoryEavAttributeCodes()));
     }
 
     /**
@@ -71,7 +71,7 @@ private function getCategoryFields(): array
     private function parseDataLayerMapping(CategoryInterface $category, array $data): array
     {
         if (empty($this->dataLayerMapping)) {
-            return [];
+            return $data;
         }
 
         foreach ($this->dataLayerMapping as $tagName => $tagValue) {

DataLayer/Mapper/CustomerDataMapper.php

@@ -75,7 +75,7 @@ private function getCustomerFields(): array
     private function parseDataLayerMapping(CustomerInterface $customer, array $data): array
     {
         if (empty($this->dataLayerMapping)) {
-            return [];
+            return $data;
         }
 
         foreach ($this->dataLayerMapping as $tagName => $tagValue) {

DataLayer/Mapper/OrderDataMapper.php

@@ -124,7 +124,7 @@ protected function getPaymentType(OrderInterface $order): string
     private function parseDataLayerMapping(OrderInterface $order, array $data): array
     {
         if (empty($this->dataLayerMapping)) {
-            return [];
+            return $data;
         }
 
         foreach ($this->dataLayerMapping as $tagName => $tagValue) {

DataLayer/Mapper/OrderItemDataMapper.php

@@ -116,7 +116,7 @@ private function getPrice(OrderItemInterface $orderItem): float
     private function parseDataLayerMapping(OrderItemInterface $orderItem, array $data): array
     {
         if (empty($this->dataLayerMapping)) {
-            return [];
+            return $data;
         }
 
         foreach ($this->dataLayerMapping as $tagName => $tagValue) {

DataLayer/Tag/Category/CurrentCategory.php

@@ -2,6 +2,7 @@
 
 namespace Yireo\GoogleTagManager2\DataLayer\Tag\Category;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Yireo\GoogleTagManager2\DataLayer\Mapper\CategoryDataMapper;
 use Yireo\GoogleTagManager2\Api\Data\MergeTagInterface;
@@ -27,6 +28,7 @@ public function __construct(
     /**
      * @return string[]
      * @throws NoSuchEntityException
+     * @throws LocalizedException
      */
     public function merge(): array
     {

Test/Integration/DataLayer/Event/ViewCartTest.php

@@ -55,6 +55,7 @@ public function testValidViewCartEvent()
         $this->assertEquals('USD', $data['ecommerce']['currency']);
         $this->assertNotEquals(0.0, $data['ecommerce']['value']);
         $this->assertNotEmpty($data['ecommerce']['items'], 'No ecommerce items found');
-        $this->assertEquals(1, (int)$data['ecommerce']['items'][0]['quantity']);
+        $this->assertArrayHasKey('quantity', $data['ecommerce']['items'][0], json_encode($data));
+        $this->assertEquals(1, (int)$data['ecommerce']['items'][0]['quantity'], json_encode($data));
     }
 }

Test/Integration/DataLayer/Mapper/CategoryDataMapperTest.php

@@ -24,7 +24,9 @@ public function testMapByCategory()
         $category = $this->getCategoryByName('Category 999');
         $categoryDataMapper = ObjectManager::getInstance()->get(CategoryDataMapper::class);
         $categoryData = $categoryDataMapper->mapByCategory($category);
-        $this->assertEquals('Category 999', $categoryData['category_name']);
-        $this->assertEquals($category->getId(), $categoryData['category_id']);
+        $this->assertArrayHasKey('category_name', $categoryData, json_encode($categoryData));
+        $this->assertEquals('Category 999', $categoryData['category_name'], json_encode($categoryData));
+        $this->assertArrayHasKey('category_id', $categoryData, json_encode($categoryData));
+        $this->assertEquals($category->getId(), $categoryData['category_id'], json_encode($categoryData));
     }
 }