ACP2E-125: Cover MC-38156 with autotest

Author: veloraven

app/code/Magento/Catalog/Test/Mftf/ActionGroup/NavigateToEditProductSystemAttributeActionGroup.xml renamed to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminNavigateToProductAttributeEditPageActionGroup.xml

@@ -8,19 +8,19 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="NavigateToEditProductSystemAttributeActionGroup">
+    <actionGroup name="AdminNavigateToProductAttributeEditPageActionGroup">
         <annotations>
-            <description>Goes to the Product Attributes grid page. Filters the grid based on the provided Product Attribute Label. Clicks on the 1st row.</description>
+            <description>Navigate to the given product attribute edit page by attribute label</description>
         </annotations>
         <arguments>
             <argument name="ProductAttributeLabel" type="string"/>
         </arguments>
 
         <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-        <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="{{ProductAttributeLabel}}" stepKey="navigateToAttributeEditPage1"/>
-        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="navigateToAttributeEditPage2"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="navigateToAttributeEditPage3"/>
-        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="{{ProductAttributeLabel}}" stepKey="fillTheAttributesFilterByLabel"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickTheSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchToComplete"/>
+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnTheFirstSearchResultRow"/>
+        <waitForPageLoad stepKey="waitForAttribiteEditPageToLoad"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Catalog/Test/Mftf/Test/AdminEditMediaGalleryProductAttributeScopeTest.xml renamed to app/code/Magento/Catalog/Test/Mftf/Test/AdminScopeSelectionShouldBeDisabledOnMediaGalleryProductAttributeEditTest.xml

@@ -7,28 +7,31 @@
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminEditMediaGalleryProductAttributeScopeTest">
+    <test name="AdminScopeSelectionShouldBeDisabledOnMediaGalleryProductAttributeEditTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Attributes Updating"/>
             <group value="Catalog"/>
-            <title value="Admin is not able to change Scope of Media Gallery product attribute"/>
-            <description value="Admin is not able to change Scope of Media Gallery product attribute"/>
+            <title value="Admin should not able to change Scope of Media Gallery product attribute"/>
+            <description value="Admin should not able to change Scope of Media Gallery product attribute"/>
             <severity value="MAJOR"/>
             <useCaseId value="MC-38156"/>
-            <testCaseId value="MC-40774"/>
+            <testCaseId value="AC-1337"/>
         </annotations>
         <before>
-            <actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAdmin"/>
         </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
 
-        <actionGroup ref="NavigateToEditProductSystemAttributeActionGroup" stepKey="navigateToMediaGalleryProductAttribute">
+        <actionGroup ref="AdminNavigateToProductAttributeEditPageActionGroup" stepKey="navigateToMediaGalleryProductAttribute">
             <argument name="ProductAttributeLabel" value="Media Gallery"/>
         </actionGroup>
 
         <click selector="{{AdvancedAttributePropertiesSection.AdvancedAttributePropertiesSectionToggle}}" stepKey="clickAdvancedAttributePropertiesSectionToggle"/>
 
-        <assertElementContainsAttribute stepKey="assertElementContainsAttribute">
+        <assertElementContainsAttribute stepKey="assertTheScopeSelectionIsDisabled">
             <expectedResult selector="{{AdvancedAttributePropertiesSection.Scope}}" attribute="disabled" type="string"></expectedResult>
         </assertElementContainsAttribute>