Merge remote-tracking branch 'origin/MAGETWO-58652-Multiselect' into okapis-mainline-2.2-pr

# Conflicts:
#	dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php

Author: cspruiell

app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator/SimpleType.php

@@ -28,10 +28,14 @@ class SimpleType
      */
     public function getType($attribute)
     {
-        if (in_array($attribute->getAttributeCode(), $this->anyTypeAttributes)) {
+        $arrayFrontendInputs = ['multiselect'];
+        $frontendInput = $attribute->getFrontendInput();
+        if (in_array($attribute->getAttributeCode(), $this->anyTypeAttributes)
+            || in_array($frontendInput, $arrayFrontendInputs)
+        ) {
             return TypeProcessor::NORMALIZED_ANY_TYPE;
         }
-        $frontendInput = $attribute->getFrontendInput();
+
         $backendType = $attribute->getBackendType();
         $backendTypeMap = [
             'static' => TypeProcessor::NORMALIZED_ANY_TYPE,
@@ -41,11 +45,6 @@ public function getType($attribute)
             'datetime' => TypeProcessor::NORMALIZED_STRING_TYPE,
             'decimal' => TypeProcessor::NORMALIZED_DOUBLE_TYPE,
         ];
-        $arrayFrontendInputs = ['multiselect'];
-        $type = $backendTypeMap[$backendType];
-        if (in_array($frontendInput, $arrayFrontendInputs)) {
-            $type .= '[]';
-        }
-        return $type;
+        return $backendTypeMap[$backendType];
     }
 }

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php

@@ -1296,4 +1296,86 @@ public function testUpdateStatus()
         // Price should be updated
         $this->assertEquals(200, $response['price']);
     }
+
+    /**
+     * 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
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/multiselect_attribute.php
+     */
+    public function testUpdateMultiselectAttributes()
+    {
+        $multiselectAttributeCode = 'multiselect_attribute';
+        $multiselectOptions = $this->getAttributeOptions($multiselectAttributeCode);
+        $option1 = $multiselectOptions[1]['value'];
+        $option2 = $multiselectOptions[2]['value'];
+
+        $productData = $this->getSimpleProductData();
+        $productData['custom_attributes'] = [
+            ['attribute_code' => $multiselectAttributeCode, 'value' => "{$option1},{$option2}"]
+        ];
+        $this->saveProduct($productData, 'all');
+
+        $this->assertMultiselectValue(
+            $productData[ProductInterface::SKU],
+            $multiselectAttributeCode,
+            "{$option1},{$option2}"
+        );
+
+        $productData['custom_attributes'] = [
+            ['attribute_code' => $multiselectAttributeCode, 'value' => ""]
+        ];
+        $this->saveProduct($productData, 'all');
+        $this->assertMultiselectValue(
+            $productData[ProductInterface::SKU],
+            $multiselectAttributeCode,
+            ""
+        );
+    }
+
+    /**
+     * @param string $attributeCode
+     * @return array|bool|float|int|string
+     */
+    private function getAttributeOptions($attributeCode)
+    {
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/products/attributes/' . $attributeCode . '/options',
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => 'catalogProductAttributeOptionManagementV1',
+                'serviceVersion' => 'V1',
+                'operation' => 'catalogProductAttributeOptionManagementV1getItems',
+            ],
+        ];
+
+        return $this->_webApiCall($serviceInfo, ['attributeCode' => $attributeCode]);
+    }
+
+    /**
+     * @param string $productSku
+     * @param string $multiselectAttributeCode
+     * @param string $expectedMultiselectValue
+     */
+    private function assertMultiselectValue($productSku, $multiselectAttributeCode, $expectedMultiselectValue)
+    {
+        $response = $this->getProduct($productSku, 'all');
+        $customAttributes = $response['custom_attributes'];
+        $this->assertNotEmpty($customAttributes);
+        $multiselectValue = null;
+        foreach ($customAttributes as $customAttribute) {
+            if ($customAttribute['attribute_code'] == $multiselectAttributeCode) {
+                $multiselectValue = $customAttribute['value'];
+                break;
+            }
+        }
+        $this->assertEquals($expectedMultiselectValue, $multiselectValue);
+    }
 }