Skip to content

Commit fcc99e1

Browse files
committed
Merge remote-tracking branch 'origin/MC-37544' into 2.4-develop-sidecar-pr5
2 parents bcadedb + 240d32a commit fcc99e1

File tree

4 files changed

+32
-0
lines changed

4 files changed

+32
-0
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminCategoryOpenDesignSectionActionGroup">
11+
<waitForElementVisible selector="{{CategoryDesignSection.DesignTab}}" stepKey="waitForDesignSection"/>
12+
<conditionalClick selector="{{CategoryDesignSection.DesignTab}}" dependentSelector="{{CategoryDesignSection.LayoutDropdown}}" visible="false" stepKey="openDesignSection"/>
13+
<waitForPageLoad stepKey="waitForDesignSectionLoad"/>
14+
</actionGroup>
15+
</actionGroups>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminCategoryOpenScheduleDesignUpdateSectionActionGroup">
11+
<waitForElementVisible selector="{{AdminCategoryScheduleDesignUpdateSection.sectionHeader}}" stepKey="waitForScheduleDesignUpdateSection"/>
12+
<conditionalClick selector="{{AdminCategoryScheduleDesignUpdateSection.sectionHeader}}" dependentSelector="{{AdminCategoryScheduleDesignUpdateSection.customDesignFrom}}" visible="false" stepKey="openScheduleDesignUpdateSection"/>
13+
<waitForPageLoad stepKey="waitForScheduleDesignUpdateSectionLoad"/>
14+
</actionGroup>
15+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
<section name="AdminCategoryScheduleDesignUpdateSection">
1111
<element name="sectionHeader" type="button" selector="div[data-index='schedule_design_update'] .fieldset-wrapper-title" timeout="30"/>
1212
<element name="sectionBody" type="text" selector="div[data-index='schedule_design_update'] .admin__fieldset-wrapper-content"/>
13+
<element name="customDesignFrom" type="input" selector="div[data-index='schedule_design_update'] input[name='custom_design_from']"/>
1314
</section>
1415
</sections>

app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
<section name="StorefrontHeaderSection">
1111
<element name="welcomeMessage" type="text" selector=".greet.welcome"/>
1212
<element name="logoLink" type="button" selector=".header .logo"/>
13+
<element name="logoImage" type="button" selector=".header .logo > img[src*='{{filename}}']" parameterized="true"/>
1314
</section>
1415
</sections>

0 commit comments

Comments
 (0)