MAGETWO-36129: Update Content in Magento 2 by Modules - part 1

- fixed tests

Author: Dmytro Vilchynskyi

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

@@ -106,7 +106,7 @@ public function execute()
                         ->setName($name)
                         ->getAttributeSet();
                 } catch (AlreadyExistsException $alreadyExists) {
-                    $this->messageManager->addError(__('Product Template named \'%1\' already exists.', $name));
+                    $this->messageManager->addError(__('An attribute set named \'%1\' already exists.', $name));
                     $this->messageManager->setAttributeData($data);
                     return $resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
                 } catch (\Magento\Framework\Exception\LocalizedException $e) {

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php

@@ -77,7 +77,7 @@ public function execute()
             $attributeSet->setEntityTypeId($this->_entityTypeId)->load($setName, 'attribute_set_name');
             if ($attributeSet->getId()) {
                 $setName = $this->_objectManager->get('Magento\Framework\Escaper')->escapeHtml($setName);
-                $this->messageManager->addError(__('Product Template named \'%1\' already exists.', $setName));
+                $this->messageManager->addError(__('An attribute set named \'%1\' already exists.', $setName));
 
                 $layout = $this->layoutFactory->create();
                 $layout->initMessages();

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

@@ -156,7 +156,7 @@ public function testCreateThrowsExceptionIfAttributeSetWithGivenNameAlreadyExist
         $entityTypeCode = 'catalog_product';
         $entityType = $this->getEntityTypeByCode($entityTypeCode);
         $attributeSetName = 'Default';
-        $expectedMessage = 'Product template named "Default" already exists.';
+        $expectedMessage = 'An attribute set "Default" already exists.';
 
         $arguments = [
             'attributeSet' => [

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php

@@ -36,7 +36,7 @@ public function processAssert(CatalogProductSetIndex $productSetPage, CatalogAtt
         $productSetPage->open();
         \PHPUnit_Framework_Assert::assertFalse(
             $productSetPage->getGrid()->isRowVisible($filterAttributeSet),
-            'Product Template named "' . $filterAttributeSet['set_name'] . '" is present in Product Template grid.'
+            'An attribute set "' . $filterAttributeSet['set_name'] . '" is present in Product Template grid.'
         );
     }