MAGETWO-43725: Pull request processing

Author: Ievgen Shakhsuvarov

app/code/Magento/Eav/Model/Entity/Attribute/Group.php

@@ -66,8 +66,12 @@ public function beforeSave()
         if (!$this->getAttributeGroupCode()) {
             $groupName = $this->getAttributeGroupName();
             if ($groupName) {
-                // in the following code md5 is not used for security purposes
-                $this->setAttributeGroupCode(md5($groupName));
+                $attributeGroupCode = trim(preg_replace('/[^a-z0-9]+/', '-', strtolower($groupName)), '-');
+                if (empty($attributeGroupCode)) {
+                    // in the following code md5 is not used for security purposes
+                    $attributeGroupCode = md5($groupName);
+                }
+                $this->setAttributeGroupCode($attributeGroupCode);
             }
         }
         return parent::beforeSave();

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php

@@ -39,12 +39,26 @@ protected function setUp()
         $this->model = $objectManager->getObject('Magento\Eav\Model\Entity\Attribute\Group', $constructorArguments);
     }
 
-    public function testBeforeSaveGeneratesGroupCodeBasedOnGroupName()
+    /**
+     * @dataProvider attributeGroupCodeDataProvider
+     * @param string $groupName
+     * @param string $groupCode
+     */
+    public function testBeforeSaveGeneratesGroupCodeBasedOnGroupName($groupName, $groupCode)
     {
-        $groupName = 'General';
-        $expectedGroupCode = md5($groupName);
         $this->model->setAttributeGroupName($groupName);
         $this->model->beforeSave();
-        $this->assertEquals($expectedGroupCode, $this->model->getAttributeGroupCode());
+        $this->assertEquals($groupCode, $this->model->getAttributeGroupCode());
+    }
+
+    /**
+     * @return array
+     */
+    public function attributeGroupCodeDataProvider()
+    {
+        return [
+            ['General Group', 'general-group'],
+            ['///', md5('///')],
+        ];
     }
 }