Merge branch 'MC-39899' of github.com:magento-lynx/magento2ce into MC-39899

Author: eliseacornejo

app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml

@@ -44,9 +44,9 @@
             <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
         </after>
         <see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
-        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
-        <see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
-        <see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
+        <see userInput="$$product.name$$" stepKey="seeProductName"/>
+        <see userInput="$$simple1.name$$" stepKey="seeSimple1ProductName"/>
+        <see userInput="$$simple2.name$$" stepKey="seeSimple2ProductName"/>
     </test>
     <test name="AdvanceCatalogSearchBundleByNameMysqlTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
         <annotations>
@@ -155,9 +155,9 @@
             <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
         </after>
         <see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
-        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
-        <see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
-        <see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
+        <see userInput="$$product.name$$" stepKey="seeProductName"/>
+        <see userInput="$$simple1.name$$" stepKey="seeSimple1ProductName"/>
+        <see userInput="$$simple2.name$$" stepKey="seeSimple2ProductName"/>
     </test>
     <test name="AdvanceCatalogSearchBundleByDescriptionMysqlTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
         <annotations>
@@ -316,9 +316,9 @@
             <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
         </after>
         <see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
-        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
-        <see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
-        <see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
+        <see userInput="$$product.name$$" stepKey="seeProductName"/>
+        <see userInput="$$simple1.name$$" stepKey="seeSimple1ProductName"/>
+        <see userInput="$$simple2.name$$"  stepKey="seeSimple2ProductName"/>
     </test>
     <test name="AdvanceCatalogSearchBundleByPriceMysqlTest" extends="AdvanceCatalogSearchSimpleProductByPriceTest">
         <annotations>

app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnCatalogPriceRuleFormActionGroup.xml

@@ -18,7 +18,7 @@
 
         <grabMultiple selector="{{AdminNewCatalogPriceRule.customerGroupsOptions}}" stepKey="customerGroups"/>
         <assertNotContains stepKey="assertCustomerGroupNotInOptions">
-            <actualResult type="variable">customerGroups</actualResult>
+            <actualResult type="arrayVariable">customerGroups</actualResult>
             <expectedResult type="string">{{customerGroup.code}}</expectedResult>
         </assertNotContains>
     </actionGroup>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontUpdateProductQtyMiniShoppingCartActionGroup.xml

@@ -21,7 +21,7 @@
 
         <!-- Clearing QTY field -->
         <doubleClick selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" stepKey="doubleClickOnQtyInput"/>
-        <pressKey selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" parameterArray="[\WebDriverKeys::DELETE]" stepKey="clearQty"/>
+        <pressKey selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::DELETE]" stepKey="clearQty"/>
         <!-- Clearing QTY field -->
 
         <fillField selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}"  userInput="{{quote.qty}}" stepKey="changeQty"/>

app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnProductFormActionGroup.xml

@@ -20,9 +20,9 @@
         <waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty1PriceDiscountAnd10percent"/>
         <grabMultiple selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelectOptions('0')}}" stepKey="customerGroups"/>
-        
+
         <assertNotContains stepKey="assertCustomerGroupNotInOptions">
-            <actualResult type="variable">customerGroups</actualResult>
+            <actualResult type="arrayVariable">customerGroups</actualResult>
             <expectedResult type="string">{{customerGroup.code}}</expectedResult>
         </assertNotContains>
     </actionGroup>

app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml

@@ -135,9 +135,9 @@
             <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
         </after>
         <see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
-        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
-        <see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
-        <see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
+        <see userInput="$$product.name$$" stepKey="seeProductName"/>
+        <see userInput="$$simple1.name$$" stepKey="seeSimple1ProductName"/>
+        <see userInput="$$simple2.name$$" stepKey="seeSimple2ProductName"/>
     </test>
     <test name="AdvanceCatalogSearchGroupedProductByDescriptionMysqlTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
         <annotations>

app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AssertCustomerGroupNotOnCartPriceRuleFormActionGroup.xml

@@ -18,7 +18,7 @@
 
         <grabMultiple selector="{{AdminCartPriceRulesFormSection.customerGroupsOptions}}" stepKey="customerGroups"/>
         <assertNotContains stepKey="assertCustomerGroupNotInOptions">
-            <actualResult type="variable">customerGroups</actualResult>
+            <actualResult type="arrayVariable">customerGroups</actualResult>
             <expectedResult type="string">{{customerGroup.code}}</expectedResult>
         </assertNotContains>
     </actionGroup>