Merge remote-tracking branch 'origin/MAGETWO-28011' into MAGETWO-28011

Author: akaplya

dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementCustomAttributesTest.php

@@ -270,7 +270,7 @@ public function testUpdateCustomerWithImageAttribute()
         $mediaDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::MEDIA);
         $customerMediaPath = $mediaDirectory->getAbsolutePath(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
         $previousImagePath =
-            $previousCustomerData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES][1][AttributeValue::VALUE];
+            $previousCustomerData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES][0][AttributeValue::VALUE];
         $this->assertFalse(file_exists($customerMediaPath . $previousImagePath));
     }
 }

dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php

@@ -80,7 +80,7 @@ public function getAttributeMetadataDataProvider()
                     AttributeMetadata::NOTE             => '',
                     AttributeMetadata::SYSTEM           => true,
                     AttributeMetadata::USER_DEFINED     => false,
-                    AttributeMetadata::BACKEND_TYPE     => 'varchar',
+                    AttributeMetadata::BACKEND_TYPE     => 'static',
                     AttributeMetadata::SORT_ORDER       => 40
                 ],
             ],
@@ -106,7 +106,7 @@ public function getAttributeMetadataDataProvider()
                     AttributeMetadata::NOTE             => '',
                     AttributeMetadata::SYSTEM           => false,
                     AttributeMetadata::USER_DEFINED     => false,
-                    AttributeMetadata::BACKEND_TYPE     => 'int',
+                    AttributeMetadata::BACKEND_TYPE     => 'static',
                     AttributeMetadata::SORT_ORDER       => 110
                 ],
             ],
@@ -187,9 +187,8 @@ public function testGetCustomAttributesMetadata()
 
         $attributeMetadata = $this->_webApiCall($serviceInfo);
 
-        //Default custom attribute code 'disable_auto_group_change'
-        $this->assertCount(1, $attributeMetadata);
-        $this->assertEquals('disable_auto_group_change', $attributeMetadata[0]['attribute_code']);
+        // There are no default custom attributes.
+        $this->assertCount(0, $attributeMetadata);
     }
 
     /**