MC-18280: Dynamic Block based on segment not displaying correctly for visitor

Author: svitja

app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateAndSaveWidgetActionGroup.xml

@@ -12,7 +12,7 @@
         <annotations>
             <description>EXTENDS: AdminCreateWidgetActionGroup. Clicks on Save. Validates that the Success Message is present and correct.</description>
         </annotations>
-        
+
         <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
         <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
     </actionGroup>

app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml

@@ -30,7 +30,32 @@
        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
        <click selector="{{AdminNewWidgetSection.widgetOptions}}" stepKey="clickWidgetOptions"/>
    </actionGroup>
-
+    <actionGroup name="AdminFillSpecificPageWidgetMainFieldsActionGroup">
+        <annotations>
+            <description>Fill widget main fields and widget layout by index for specified page DisplayOn option</description>
+        </annotations>
+        <arguments>
+            <argument name="widget" type="entity" defaultValue="ProductsListWidget"/>
+            <argument name="index" type="string" defaultValue="0"/>
+        </arguments>
+        <selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widget.type}}" stepKey="setWidgetType"/>
+        <selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widget.design_theme}}" stepKey="setWidgetDesignTheme"/>
+        <click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
+        <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" userInput="{{widget.store_ids[0]}}" stepKey="setWidgetStoreIds"/>
+        <fillField selector="{{AdminNewWidgetSection.widgetSortOrder}}" userInput="{{widget.sort_order}}" stepKey="fillSortOrder"/>
+        <click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate"/>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.selectDisplayOn}}" stepKey="waitForSelectElement"/>
+        <selectOption selector="{{AdminNewWidgetSection.displayOnByIndex(index)}}" userInput="{{widget.display_on}}" stepKey="setDisplayOn"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+        <selectOption selector="{{AdminNewWidgetSection.layoutByIndex(index)}}" userInput="{{widget.page}}" stepKey="selectPage"/>
+        <selectOption selector="{{AdminNewWidgetSection.templateByIndex(index)}}" userInput="{{widget.template}}" stepKey="selectTemplate"/>
+        <scrollTo selector="{{AdminNewWidgetSection.containerByIndex(index)}}" stepKey="scrollToSelectContainerElement"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad1"/>
+        <selectOption selector="{{AdminNewWidgetSection.containerByIndex(index)}}" userInput="{{widget.container}}" stepKey="setContainer"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad2"/>
+    </actionGroup>
    <!--Create Product List Widget-->
    <actionGroup name="AdminCreateProductsListWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
        <annotations>
@@ -54,7 +79,7 @@
        <annotations>
            <description>EXTENDS: AdminCreateWidgetActionGroup. Creates a Dynamic Block Rotate Widget.</description>
        </annotations>
-       
+
        <selectOption selector="{{AdminNewWidgetSection.displayMode}}" userInput="{{widget.display_mode}}" stepKey="selectDisplayMode"/>
        <selectOption selector="{{AdminNewWidgetSection.restrictTypes}}" userInput="{{widget.restrict_type}}" stepKey="selectRestrictType"/>
        <click selector="{{AdminNewWidgetSection.saveAndContinue}}" stepKey="clickSaveWidget"/>

app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml

@@ -14,9 +14,14 @@
         <element name="continue" type="button" selector="#continue_button"/>
         <element name="widgetTitle" type="input" selector="#title"/>
         <element name="widgetStoreIds" type="select" selector="#store_ids"/>
+        <element name="widgetSortOrder" type="input" selector="#sort_order"/>
         <element name="addLayoutUpdate" type="button" selector=".action-default.scalable.action-add"/>
         <element name="selectDisplayOn" type="select" selector="#widget_instance[0][page_group]"/>
         <element name="selectContainer" type="select" selector="#all_pages_0>table>tbody>tr>td:nth-child(1)>div>div>select"/>
+        <element name="displayOnByIndex" type="select" selector="select[name='widget_instance[{{index}}][page_group]']" parameterized="true"/>
+        <element name="layoutByIndex" type="select" selector="select[name='widget_instance[{{index}}][pages][layout_handle]']" parameterized="true"/>
+        <element name="containerByIndex" type="select" selector="select[name='widget_instance[{{index}}][pages][block]']" parameterized="true"/>
+        <element name="templateByIndex" type="select" selector="select[name='widget_instance[{{index}}][pages][template]']" parameterized="true"/>
         <element name="selectTemplate" type="select" selector=".widget-layout-updates .block_template_container .select"/>
         <element name="widgetOptions" type="select" selector="#widget_instace_tabs_properties_section"/>
         <element name="addNewCondition" type="select" selector=".rule-param.rule-param-new-child"/>