MQE-1584: Stabilize 2.2 XSD schema fix branches

Author: soumyau

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

@@ -42,6 +42,7 @@
         <element name="requiredSkuIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=sku]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
         <element name="customAttributeDropdownField" type="select" selector="select[name='product[{{attributeCode}}]']" parameterized="true"/>
         <element name="customAttributeInputField" type="select" selector="input[name='product[{{attributeCode}}]']" parameterized="true"/>
+        <element name="customAttributeSelectOptions" type="select" selector="select[name='product[{{attributeCode}}]'] option" parameterized="true"/>
     </section>
     <section name="ProductInWebsitesSection">
         <element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/>

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

@@ -53,12 +53,27 @@
         <!--Go to Product edit page-->
         <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToProductEditPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <!--Click on attribute dropdown-->
-        <click selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" stepKey="clickOnAttributeDropdown"/>
+
+        <!-- Grab attribute dropdown options -->
+        <grabMultiple selector="{{AdminProductFormSection.customAttributeSelectOptions($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" stepKey="clickOnAttributeDropdown" />
+
         <!--Check attribute dropdown options-->
-        <see selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" userInput="admin_option_1" stepKey="seeFirstAdminOption"/>
-        <see selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" userInput="admin_option_2" stepKey="seeSecondAdminOption"/>
-        <dontSee selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" userInput="option1" stepKey="dontSeeFirstStoreOption"/>
-        <dontSee selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" userInput="option2" stepKey="dontSeeSecondStoreOption"/>
+        <assertContains stepKey="seeFirstAdminOption">
+            <actualResult type="variable">clickOnAttributeDropdown</actualResult>
+            <expectedResult type="string">admin_option_1</expectedResult>
+        </assertContains>
+        <assertContains stepKey="seeSecondAdminOption">
+            <actualResult type="variable">clickOnAttributeDropdown</actualResult>
+            <expectedResult type="string">admin_option_2</expectedResult>
+        </assertContains>
+
+        <assertNotContains stepKey="dontSeeFirstStoreOption">
+            <actualResult type="variable">clickOnAttributeDropdown</actualResult>
+            <expectedResult type="string">option1</expectedResult>
+        </assertNotContains>
+        <assertNotContains stepKey="dontSeeSecondStoreOption">
+            <actualResult type="variable">clickOnAttributeDropdown</actualResult>
+            <expectedResult type="string">option2</expectedResult>
+        </assertNotContains>
     </test>
 </tests>