MC-20691: Admin: Update attribute set

Author: IvanPletnyov

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/UpdateTest.php

@@ -15,6 +15,7 @@
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\TestFramework\Eav\Model\AttributeSet;
 use Magento\TestFramework\TestCase\AbstractBackendController;
@@ -80,6 +81,10 @@ public function testUpdateAttributeSetName(): void
         $updateName = 'New attribute set name';
         $postData['attribute_set_name'] = $updateName;
         $this->performRequest((int)$attributeSet->getAttributeSetId(), $postData);
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the attribute set.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
         $updatedAttributeSet = $this->attributeSetRepository->get((int)$attributeSet->getAttributeSetId());
         $this->assertEquals($updateName, $updatedAttributeSet->getAttributeSetName());
         $updatedAttributeSet->setAttributeSetName($currentAttrSetName);
@@ -110,6 +115,10 @@ public function testUpdateAttributeSetWithNewGroup(): void
             $newGroupSortOrder,
         ];
         $this->performRequest($attrSetId, $postData);
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the attribute set.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
         $updatedAttrGroups = $this->getAttributeSetGroupCollection($attrSetId)->getItems();
         $diffGroups = array_diff_key($updatedAttrGroups, $currentAttrGroups);
         $this->assertCount(1, $diffGroups);
@@ -149,6 +158,10 @@ public function testDeleteCustomGroupFromCustomAttributeSet(): void
             $customGroup->getAttributeGroupId()
         ];
         $this->performRequest($attrSetId, $postData);
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the attribute set.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
         $updatedAttrGroups = $this->getAttributeSetGroupCollection($attrSetId)->getItems();
         $diffGroups = array_diff_key($currentAttrGroups, $updatedAttrGroups);
         $this->assertCount(1, $diffGroups);

dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/AttributeSetGroupsTest.php

@@ -98,7 +98,7 @@ protected function setUp()
     }
 
     /**
-     * Check that custom group fro custom attribute set not added to product form modifier meta data.
+     * Check that custom group for custom attribute set not added to product form modifier meta data.
      *
      * @magentoDataFixture Magento/Catalog/_files/attribute_set_based_on_default_with_custom_group.php
      * @magentoDataFixture Magento/Catalog/_files/product_with_test_attribute_set.php

dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_test_attribute_set.php

@@ -11,8 +11,11 @@
 use Magento\Catalog\Model\ProductFactory;
 use Magento\TestFramework\Eav\Model\AttributeSet;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Store\Model\StoreManagerInterface;
 
 $objectManager = Bootstrap::getObjectManager();
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
 /** @var ProductFactory $productFactory */
@@ -26,6 +29,7 @@
     ->setId(1)
     ->setAttributeSetId($customAttributeSet->getAttributeSetId())
     ->setWebsiteIds([1])
+    ->setStoreId($storeManager->getStore('admin')->getId())
     ->setName('Simple Product')
     ->setSku('simple')
     ->setPrice(10)