REST API multiselect attribute BC break between 2.1.8 and 2.3.0.

Add conditions for multiselect attribute validation. REST API multiselect attribute BC break between 2.1.8 and 2.3.0. Create unit test for app/code/Magento/Eav/Model/TypeLocator/SimpleType.php. REST API multiselect attribute BC break between 2.1.8 and 2.3.0. Code refactoring. REST API multiselect attribute BC break between 2.1.8 and 2.3.0. Code refactoring. REST API multiselect attribute BC break between 2.1.8 and 2.3.0. Change unit test functionality for app/code/Magento/Eav/Model/TypeLocator/SimpleType.php. REST API multiselect attribute BC break between 2.1.8 and 2.3.0. Create api-functional test for the following case REST API multiselect attribute BC break between 2.1.8 and 2.3.0. Remove ObjectManager and setUp method.
magento · May 10, 2019 · a8bcd7d · a8bcd7d
1 parent 7755eef
commit a8bcd7d
Show file tree

Hide file tree

Showing 3 changed files with 226 additions and 11 deletions.
diff --git a/app/code/Magento/Eav/Model/TypeLocator/SimpleType.php b/app/code/Magento/Eav/Model/TypeLocator/SimpleType.php
@@ -50,6 +50,11 @@ public function getType($attributeCode, $entityType)
         } catch (NoSuchEntityException $exception) {
             return TypeProcessor::NORMALIZED_ANY_TYPE;
         }
+
+        if ($attribute->getFrontendInput() === 'multiselect') {
+            return TypeProcessor::NORMALIZED_ANY_TYPE;
+        }
+
         $backendType = $attribute->getBackendType();
         $backendTypeMap = [
             'static' => TypeProcessor::NORMALIZED_ANY_TYPE,

diff --git a/app/code/Magento/Eav/Test/Unit/Model/TypeLocator/SimpleTypeTest.php b/app/code/Magento/Eav/Test/Unit/Model/TypeLocator/SimpleTypeTest.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Eav\Test\Unit\Model\TypeLocator;
+
+use Magento\Eav\Model\TypeLocator\SimpleType;
+use Magento\Eav\Model\AttributeRepository;
+use Magento\Framework\Webapi\CustomAttribute\ServiceTypeListInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Framework\Reflection\TypeProcessor;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Class SimpleTypeTest
+ *
+ * @package Magento\Eav\Test\Unit\Model\TypeLocator
+ */
+class SimpleTypeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test testGetType method
+     * @return void
+     */
+    public function testGetTypeWithNonexistentAttribute()
+    {
+        $getException = new NoSuchEntityException();
+        $expected = TypeProcessor::NORMALIZED_ANY_TYPE;
+
+        /** @var AttributeRepository|\PHPUnit_Framework_MockObject_MockObject $attributeRepositoryMock */
+        $attributeRepositoryMock = $this->createMock(AttributeRepository::class);
+        $attributeRepositoryMock->expects($this->any())
+                                ->method('get')
+                                ->willThrowException($getException);
+
+        /** @var ServiceTypeListInterface|\PHPUnit_Framework_MockObject_MockObject $serviceTypeListMock */
+        $serviceTypeListMock = $this->createMock(ServiceTypeListInterface::class);
+
+        /** @var SimpleType|\PHPUnit_Framework_MockObject_MockObject $simpleType */
+        $simpleType = new SimpleType(
+            $attributeRepositoryMock,
+            $serviceTypeListMock
+        );
+
+        $this->assertSame($expected, $simpleType->getType('testAttributeCode', 'testEntityType'));
+    }
+
+    /**
+     * Test testGetType method
+     * @return void
+     */
+    public function testGetTypeWithMultiselectFrontendInput()
+    {
+        $getFrontendInputReturn = 'multiselect';
+        $expected = TypeProcessor::NORMALIZED_ANY_TYPE;
+
+        /** @var Attribute|\PHPUnit_Framework_MockObject_MockObject $attributeMock */
+        $attributeMock = $this->createMock(Attribute::class);
+        $attributeMock->expects($this->any())
+                      ->method('getFrontendInput')
+                      ->willReturn($getFrontendInputReturn);
+
+        /** @var AttributeRepository|\PHPUnit_Framework_MockObject_MockObject $attributeRepositoryMock */
+        $attributeRepositoryMock = $this->createMock(AttributeRepository::class);
+        $attributeRepositoryMock->expects($this->any())
+                                ->method('get')
+                                ->willReturn($attributeMock);
+
+        /** @var ServiceTypeListInterface|\PHPUnit_Framework_MockObject_MockObject $serviceTypeListMock */
+        $serviceTypeListMock = $this->createMock(ServiceTypeListInterface::class);
+
+        /** @var SimpleType|\PHPUnit_Framework_MockObject_MockObject $simpleType */
+        $simpleType = new SimpleType(
+            $attributeRepositoryMock,
+            $serviceTypeListMock
+        );
+
+        $this->assertSame($expected, $simpleType->getType('testAttributeCode', 'testEntityType'));
+    }
+
+    /**
+     * Test testGetType method
+     * @return void
+     */
+    public function testGetTypeWithBackendTypeInMap()
+    {
+        $getFrontendInputReturn = 'textarea';
+        $getBackendTypeReturn = 'text';
+        $expected = TypeProcessor::NORMALIZED_STRING_TYPE;
+
+        /** @var Attribute|\PHPUnit_Framework_MockObject_MockObject $attributeMock */
+        $attributeMock = $this->createMock(Attribute::class);
+        $attributeMock->expects($this->any())
+                      ->method('getFrontendInput')
+                      ->willReturn($getFrontendInputReturn);
+        $attributeMock->expects($this->any())
+                      ->method('getBackendType')
+                      ->willReturn($getBackendTypeReturn);
+
+        /** @var AttributeRepository|\PHPUnit_Framework_MockObject_MockObject $attributeRepositoryMock */
+        $attributeRepositoryMock = $this->createMock(AttributeRepository::class);
+        $attributeRepositoryMock->expects($this->any())
+                                ->method('get')
+                                ->willReturn($attributeMock);
+
+        /** @var ServiceTypeListInterface|\PHPUnit_Framework_MockObject_MockObject $serviceTypeListMock */
+        $serviceTypeListMock = $this->createMock(ServiceTypeListInterface::class);
+
+        /** @var SimpleType|\PHPUnit_Framework_MockObject_MockObject $simpleType */
+        $simpleType = new SimpleType(
+            $attributeRepositoryMock,
+            $serviceTypeListMock
+        );
+
+        $this->assertSame($expected, $simpleType->getType('testAttributeCode', 'testEntityType'));
+    }
+
+    /**
+     * Test testGetType method
+     * @return void
+     */
+    public function testGetTypeWithBackendTypeNotInMap()
+    {
+        $getFrontendInputReturn = 'textarea';
+        $getBackendTypeReturn = 'testBackendTypeNotInMap';
+        $expected = TypeProcessor::NORMALIZED_ANY_TYPE;
+
+        /** @var Attribute|\PHPUnit_Framework_MockObject_MockObject $attributeMock */
+        $attributeMock = $this->createMock(Attribute::class);
+        $attributeMock->expects($this->any())
+                      ->method('getFrontendInput')
+                      ->willReturn($getFrontendInputReturn);
+        $attributeMock->expects($this->any())
+                      ->method('getBackendType')
+                      ->willReturn($getBackendTypeReturn);
+
+        /** @var AttributeRepository|\PHPUnit_Framework_MockObject_MockObject $attributeRepositoryMock */
+        $attributeRepositoryMock = $this->createMock(AttributeRepository::class);
+        $attributeRepositoryMock->expects($this->any())
+                                ->method('get')
+                                ->willReturn($attributeMock);
+
+        /** @var ServiceTypeListInterface|\PHPUnit_Framework_MockObject_MockObject $serviceTypeListMock */
+        $serviceTypeListMock = $this->createMock(ServiceTypeListInterface::class);
+
+        /** @var SimpleType|\PHPUnit_Framework_MockObject_MockObject $simpleType */
+        $simpleType = new SimpleType(
+            $attributeRepositoryMock,
+            $serviceTypeListMock
+        );
+
+        $this->assertSame($expected, $simpleType->getType('testAttributeCode', 'testEntityType'));
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
@@ -1561,40 +1561,95 @@ public function testUpdateStatus()
      * Test saving product with custom attribute of multiselect type
      *
      * 1. Create multi-select attribute
-     * 2. Create product and set 2 options out of 3 to multi-select attribute
-     * 3. Verify that 2 options are selected
-     * 4. Unselect all options
-     * 5. Verify that non options are selected
+     * 2. Create product
+     * 3. Set 2 options out of 3 to multi-select attribute in string format
+     * 4. Verify that 2 options are selected
      *
      * @magentoApiDataFixture Magento/Catalog/_files/multiselect_attribute.php
      */
-    public function testUpdateMultiselectAttributes()
+    public function testUpdateMultiselectAttributesWithStringValue()
     {
         $multiselectAttributeCode = 'multiselect_attribute';
         $multiselectOptions = $this->getAttributeOptions($multiselectAttributeCode);
-        $option1 = $multiselectOptions[1]['value'];
-        $option2 = $multiselectOptions[2]['value'];
+        $option1Value = $multiselectOptions[1]['value'];
+        $option2Value = $multiselectOptions[2]['value'];
 
         $productData = $this->getSimpleProductData();
+
+        $multiselectValue = "{$option1Value},{$option2Value}";
+        $productData['custom_attributes'] = [
+            ['attribute_code' => $multiselectAttributeCode, 'value' => $multiselectValue]
+        ];
+        $this->saveProduct($productData, 'all');
+
+        $expectedMultiselectValue = "{$option1Value},{$option2Value}";
+        $this->assertMultiselectValue(
+            $productData[ProductInterface::SKU],
+            $multiselectAttributeCode,
+            $expectedMultiselectValue
+        );
+    }
+
+    /**
+     * Test saving product with custom attribute of multiselect type
+     *
+     * 1. Create multi-select attribute
+     * 2. Create product
+     * 3. Set 2 options out of 3 to multi-select attribute in array format
+     * 4. Verify that 2 options are selected
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/multiselect_attribute.php
+     */
+    public function testUpdateMultiselectAttributesWithArrayValue()
+    {
+        $multiselectAttributeCode = 'multiselect_attribute';
+        $multiselectOptions = $this->getAttributeOptions($multiselectAttributeCode);
+        $option1Value = $multiselectOptions[1]['value'];
+        $option2Value = $multiselectOptions[2]['value'];
+
+        $productData = $this->getSimpleProductData();
+
+        $multiselectValue = ["{$option1Value}", "{$option2Value}"];
         $productData['custom_attributes'] = [
-            ['attribute_code' => $multiselectAttributeCode, 'value' => "{$option1},{$option2}"]
+            ['attribute_code' => $multiselectAttributeCode, 'value' => $multiselectValue]
         ];
         $this->saveProduct($productData, 'all');
 
+        $expectedMultiselectValue = "{$option1Value},{$option2Value}";
         $this->assertMultiselectValue(
             $productData[ProductInterface::SKU],
             $multiselectAttributeCode,
-            "{$option1},{$option2}"
+            $expectedMultiselectValue
         );
+    }
 
+    /**
+     * Test saving product with custom attribute of multiselect type
+     *
+     * 1. Create multi-select attribute
+     * 2. Create product
+     * 3. Unselect all options
+     * 4. Verify that non options are selected
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/multiselect_attribute.php
+     */
+    public function testUpdateMultiselectAttributesWithEmptyValue()
+    {
+        $multiselectAttributeCode = 'multiselect_attribute';
+
+        $productData = $this->getSimpleProductData();
+
+        $multiselectValue = "";
         $productData['custom_attributes'] = [
-            ['attribute_code' => $multiselectAttributeCode, 'value' => ""]
+            ['attribute_code' => $multiselectAttributeCode, 'value' => $multiselectValue]
         ];
         $this->saveProduct($productData, 'all');
+
+        $expectedMultiselectValue = "";
         $this->assertMultiselectValue(
             $productData[ProductInterface::SKU],
             $multiselectAttributeCode,
-            ""
+            $expectedMultiselectValue
         );
     }