MQE-683: [Deprecation] Only use more nested assertion syntax

- Fixed additional edge cases

Author: KevinBKozan

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

@@ -66,7 +66,9 @@
         <!-- Check attribute data -->
         <grabValueFrom selector="{{DropdownAttributeOptionsSection.nthOptionAdminLabel('2')}}"
                        stepKey="secondOptionAdminLabel"/>
-        <assertEquals actual="$secondOptionAdminLabel" expected="'Fish &amp; Chips'"
-                      stepKey="assertSecondOption"/>
+        <assertEquals stepKey="assertSecondOption">
+			<actualResult type="const">$secondOptionAdminLabel</actualResult>
+			<expectedResult type="const">'Fish &amp; Chips'</expectedResult>
+        </assertEquals>
     </test>
 </tests>

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

@@ -106,8 +106,10 @@
         <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection"/>
         <grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
                       stepKey="grabTextFromCategory"/>
-        <assertRegExp expected="/\(4\)$/" expectedType="string" actual="$grabTextFromCategory" actualType="variable"
-                      message="wrongCountProductOnAllStoreViews" stepKey="checkCountProducts"/>
+        <assertRegExp message="wrongCountProductOnAllStoreViews" stepKey="checkCountProducts">
+			<actualResult type="variable">$grabTextFromCategory</actualResult>
+			<expectedResult type="string">/\(4\)$/</expectedResult>
+        </assertRegExp>
         <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct0.name$$)}}"
              userInput="$$createProduct0.name$$" stepKey="seeProductName"/>
         <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct1.name$$)}}"
@@ -124,8 +126,10 @@
         </actionGroup>
         <grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
                       stepKey="grabTextFromCategory1"/>
-        <assertRegExp expected="/\(2\)$/" expectedType="string" actual="$grabTextFromCategory1" actualType="variable"
-                      message="wrongCountProductOnWebsite1" stepKey="checkCountProducts1"/>
+        <assertRegExp message="wrongCountProductOnWebsite1" stepKey="checkCountProducts1">
+			<actualResult type="variable">$grabTextFromCategory1</actualResult>
+			<expectedResult type="string">/\(2\)$/</expectedResult>
+        </assertRegExp>
         <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection1"/>
         <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct1.name$$)}}"
              userInput="$$createProduct1.name$$" stepKey="seeProductName4"/>
@@ -144,8 +148,10 @@
         <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection2"/>
         <grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
                       stepKey="grabTextFromCategory2"/>
-        <assertRegExp expected="/\(2\)$/" expectedType="string" actual="$grabTextFromCategory2" actualType="variable"
-                      message="wrongCountProductOnWebsite2" stepKey="checkCountProducts2"/>
+        <assertRegExp message="wrongCountProductOnWebsite2" stepKey="checkCountProducts2">
+			<actualResult type="variable">$grabTextFromCategory2</actualResult>
+			<expectedResult type="string">/\(2\)$/</expectedResult>
+        </assertRegExp>
         <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct2.name$$)}}"
              userInput="$$createProduct2.name$$" stepKey="seeProductName6"/>
         <see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct12.name$$)}}"

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml

@@ -70,9 +70,10 @@
         <see userInput="Hello CMS Page!" stepKey="seeContent2"/>
         <!--see widget on Storefront-->
         <grabAttributeFrom selector=".widget a" userInput="href" stepKey="dataHref" />
-        <assertRegExp expected="|$$createPreReqCategory.name$$.html|i"
-                      expectedType="string" actual="$dataHref" actualType="variable"
-                      stepKey="seeProductLinkInCategory"/>
+        <assertRegExp stepKey="seeProductLinkInCategory">
+			<actualResult type="variable">$dataHref</actualResult>
+			<expectedResult type="string">|$$createPreReqCategory.name$$.html|i</expectedResult>
+        </assertRegExp>
         <after>
             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCatalog" />
             <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml

@@ -76,9 +76,10 @@
         <waitForPageLoad stepKey="wait8" />
         <!--see widget on Storefront-->
         <grabAttributeFrom selector=".widget a" userInput="href" stepKey="dataHref" />
-        <assertRegExp expected="|$$createPreReqCategory.name$$/$$createPreReqProduct.name$$.html|i"
-                      expectedType="string" actual="$dataHref" actualType="variable"
-                      stepKey="seeProductLinkInCategory"/>
+        <assertRegExp stepKey="seeProductLinkInCategory">
+			<actualResult type="variable">$dataHref</actualResult>
+			<expectedResult type="string">|$$createPreReqCategory.name$$/$$createPreReqProduct.name$$.html|i</expectedResult>
+        </assertRegExp>
         <after>
             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCatalog" />
             <deleteData createDataKey="createPreReqProduct" stepKey="deletePreReqProduct" />