Skip to content

Commit 38dc81a

Browse files
committed
#557: User Access Row Action Panel with 2+ Level Nesting
- Code Review Feedback/Amends
1 parent a9c32b2 commit 38dc81a

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeContainerActionGroup/VerifyAffordanceSizeActionGroup.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<description>Verifies the size of the affordance on Container content types.</description>
1212
</annotations>
1313
<arguments>
14-
<argument name="affordanceSize" defaultValue="{{PageBuilderRowAffordanceWidth.borderWidth}}" type="string"/>
14+
<argument name="expectedAffordanceSize" defaultValue="{{PageBuilderRowAffordanceWidth.borderWidth}}" type="string"/>
1515
<argument name="index" defaultValue="1" type="string"/>
1616
<argument name="section" defaultValue="RowOnStage"/>
1717
</arguments>
18-
<waitForElementVisible selector="{{section.affordance(index)}}" stepKey="waitForElementVisible"/>
19-
<executeJS function="return parseInt(window.getComputedStyle({{section.affordanceJS(index)}}).borderWidth, 10)" stepKey="executeJS"/>
20-
<assertEquals stepKey="assertEquals">
18+
<waitForElementVisible selector="{{section.affordance(index)}}" stepKey="waitForAffordanceVisible"/>
19+
<executeJS function="return parseInt(window.getComputedStyle({{section.affordanceJS(index)}}).borderWidth, 10)" stepKey="actualAffordanceSize"/>
20+
<assertEquals stepKey="assertActualAffordanceSizeEqualsExpected">
2121
<expectedResult type="int">{{affordanceSize}}</expectedResult>
2222
<actualResult type="variable">executeJS</actualResult>
2323
</assertEquals>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefrontSection.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<element name="base" type="text" selector="(//div[@data-content-type=&quot;row&quot;])[{{arg1}}]/div" parameterized="true"/>
1212
<element name="baseCSS" type="text" selector="[data-content-type=row]"/>
1313
<element name="baseJS" type="text" selector="(document.querySelectorAll('[data-content-type=row]')[{{arg1}} - 1]).querySelector('div')" parameterized="true"/>
14-
<element name="affordance" type="text" selector="(//div[contains(@class,'pagebuilder-affordance-row') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]" parameterized="true"/>
15-
<element name="affordanceCSS" type="text" selector="div.pagebuilder-affordance-row.pagebuilder-content-type"/>
1614
<element name="elementChildren" type="text" selector="(//div[@data-content-type=&quot;row&quot;])[{{arg1}}]/div" parameterized="true"/>
1715
<element name="innerCSS" type="text" selector="[data-content-type=row] [data-element=inner]"/>
1816
<element name="inner" type="text" selector="(//div[@data-content-type=&quot;row&quot;])[{{arg1}}]//div[@data-element=&quot;inner&quot;]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderContainerTest/PageBuilderVerifyContainerAffordanceTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
3232
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3333
</after>
34+
<!-- Configure CMS Block -->
3435
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3536
<argument name="contentType" value="PageBuilderColumnContentType"/>
3637
</actionGroup>
@@ -70,6 +71,7 @@
7071
<seeNumberOfElements selector="{{RowOnStage.affordanceCSS}}" userInput="3" stepKey="seeNumberOfAffordance"/>
7172
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
7273
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
74+
<!-- Configure CMS Page -->
7375
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
7476
<argument name="CMSPage" value="$$createCMSPage$$"/>
7577
</actionGroup>
@@ -96,6 +98,6 @@
9698
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStorefrontForCreatedPage">
9799
<argument name="page" value="$$createCMSPage.identifier$$"/>
98100
</actionGroup>
99-
<dontSeeElementInDOM selector="{{RowOnStorefront.affordanceCSS}}" stepKey="dontSeeAffordanceInDOM"/>
101+
<dontSeeElementInDOM selector="{{RowOnStage.affordanceCSS}}" stepKey="dontSeeAffordanceInDOM"/>
100102
</test>
101103
</tests>

0 commit comments

Comments
 (0)