MC-29022: Custom attribute values cannot be saved in Admin panel

Author: viktorpetryk

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup.xml

@@ -20,6 +20,6 @@
         <waitForElementVisible selector="{{StorefrontCategorySidebarSection.filterOptionsTitle(attributeLabel)}}" stepKey="waitForAttributeVisible"/>
         <conditionalClick selector="{{StorefrontCategorySidebarSection.filterOptionsTitle(attributeLabel)}}" dependentSelector="{{StorefrontCategorySidebarSection.activeFilterOptions}}" visible="false" stepKey="clickToExpandAttribute"/>
         <waitForElementVisible selector="{{StorefrontCategorySidebarSection.activeFilterOptions}}" stepKey="waitForAttributeOptionsVisible"/>
-        <see selector="{{StorefrontCategorySidebarSection.filterOptionItem}}" userInput="{{attributeOptionLabel}}" stepKey="assertAttributeOptionInLayeredNavigation"/>
+        <see selector="{{StorefrontCategorySidebarSection.activeFilterOptionItem}}" userInput="{{attributeOptionLabel}}" stepKey="assertAttributeOptionInLayeredNavigation"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml

@@ -16,7 +16,7 @@
         <element name="filterOptionByLabel" type="button" selector=" div.filter-options-item div[option-label='{{optionLabel}}']" parameterized="true"/>
         <element name="removeFilter" type="button" selector="div.filter-current .remove"/>
         <element name="activeFilterOptions" type="text" selector=".filter-options-item.active .items"/>
-        <element name="filterOptionItem" type="text" selector=".filter-options-item.active .items li a"/>
+        <element name="activeFilterOptionItem" type="text" selector=".filter-options-item.active .items li a"/>
     </section>
     <section name="StorefrontCategorySidebarMobileSection">
         <element name="shopByButton" type="button" selector="//div[contains(@class, 'filter-title')]/strong[contains(text(), 'Shop By')]"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckCustomAttributeValuesAfterProductSaveTest.xml

@@ -41,20 +41,13 @@
             <!-- Delete created entities -->
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
             <deleteData createDataKey="createMultiSelectProductAttribute" stepKey="deleteMultiSelectProductAttribute"/>
-            <!-- Clear products grid filters -->
-            <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsGridFilters"/>
-            <waitForPageLoad stepKey="waitForCleanProductsFilters"/>
             <!-- Logout from Admin page -->
-            <actionGroup ref="logout" stepKey="logout"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </after>
 
         <!-- Open created product for edit -->
-        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProductInProductsGrid">
-            <argument name="product" value="$createSimpleProduct$"/>
-        </actionGroup>
-        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openProductForEdit">
-            <argument name="product" value="$createSimpleProduct$"/>
-        </actionGroup>
+        <amOnPage url="{{AdminProductEditPage.url($createSimpleProduct.id$)}}" stepKey="goToProductEditPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
 
         <!-- Add created attribute to the product -->
         <actionGroup ref="addProductAttributeInProductModal" stepKey="addAttributeToProduct">