Merge remote-tracking branch 'origin/MC-18165' into 2.3-develop-pr80

Author: zakdma

app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml

@@ -129,18 +129,17 @@
             <magentoCLI command="config:set {{MinimalQueryLengthDefaultConfigData.path}} {{MinimalQueryLengthDefaultConfigData.value}}" after="deleteCategory" stepKey="setMinimalQueryLengthToFour"/>
         </after>
 
-        <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,2); return ret;" before="searchStorefront" stepKey="getFirstTwoLetters"/>
-        <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,{{MinimalQueryLengthFourConfigData.value}}); return ret;" after="getFirstTwoLetters" stepKey="getFirstConfigLetters"/>
+        <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,{{MinimalQueryLengthFourConfigData.value}} - 1); return ret;" before="searchStorefront" stepKey="getFirstLessThenConfigLetters"/>
 
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" after="checkEmpty" stepKey="searchStorefrontConfigLetters">
-            <argument name="phrase" value="$getFirstConfigLetters"/>
+            <argument name="phrase" value="$createSimpleProduct.name$"/>
         </actionGroup>
         <actionGroup ref="StorefrontQuickSearchTooShortStringActionGroup" after="searchStorefrontConfigLetters" stepKey="checkCannotSearchWithTooShortString">
-            <argument name="phrase" value="$getFirstTwoLetters"/>
+            <argument name="phrase" value="$getFirstLessThenConfigLetters"/>
             <argument name="minQueryLength" value="{{MinimalQueryLengthFourConfigData.value}}"/>
         </actionGroup>
         <actionGroup ref="StorefrontQuickSearchRelatedSearchTermsAppearsActionGroup" after="checkCannotSearchWithTooShortString" stepKey="checkRelatedSearchTerm">
-            <argument name="term" value="$getFirstConfigLetters"/>
+            <argument name="term" value="$createSimpleProduct.name$"/>
         </actionGroup>
     </test>