Skip to content

Commit 02ead51

Browse files
committed
MC-3723: Advanced properties saving when invalid value is specified
- update margins test - remove invalid cases to new test - remove redundant cases
1 parent 3811e43 commit 02ead51

File tree

1 file changed

+22
-150
lines changed

1 file changed

+22
-150
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest.xml

Lines changed: 22 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@
10911091
<annotations>
10921092
<features value="PageBuilder"/>
10931093
<stories value="Advanced Configuration"/>
1094-
<title value="Functional - Invalid Border Width"/>
1094+
<title value="Invalid - Border Width"/>
10951095
<description value="A user cannot add an invalid value for border width"/>
10961096
<severity value="MAJOR"/>
10971097
<useCaseId value="MAGETWO-83415"/>
@@ -1928,31 +1928,27 @@
19281928
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
19291929
<argument name="contentType" value="PageBuilderTextContentType"/>
19301930
</actionGroup>
1931-
<!-- Add A Row For Each Text Margins Test -->
1932-
<comment userInput="Add Rows" stepKey="commentAddRows"/>
1933-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowIntoStage1">
1934-
<argument name="contentType" value="PageBuilderRowContentType"/>
1935-
</actionGroup>
1936-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowIntoStage2">
1937-
<argument name="contentType" value="PageBuilderRowContentType"/>
1938-
</actionGroup>
1939-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowIntoStage3">
1940-
<argument name="contentType" value="PageBuilderRowContentType"/>
1941-
</actionGroup>
1942-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowIntoStage4">
1943-
<argument name="contentType" value="PageBuilderRowContentType"/>
1944-
</actionGroup>
1945-
<!-- Add Margins: Empty -->
1946-
<comment userInput="Add Margins: Empty" stepKey="commentAddMarginsEmpty"/>
19471931
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
19481932
<argument name="group" value="PageBuilderTextContentType"/>
19491933
</actionGroup>
1950-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
1934+
<!-- Add Text to Stage -->
1935+
<comment userInput="Add Text to Stage" stepKey="commentAddTextToStage"/>
1936+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage">
1937+
<argument name="contentType" value="PageBuilderTextContentType"/>
1938+
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1939+
<argument name="contentTypeIndex" value="1"/>
1940+
</actionGroup>
1941+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage2">
19511942
<argument name="contentType" value="PageBuilderTextContentType"/>
19521943
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1953-
<argument name="containerTargetIndex" value="1"/>
19541944
<argument name="contentTypeIndex" value="1"/>
19551945
</actionGroup>
1946+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
1947+
<!-- Add Margins: Empty -->
1948+
<comment userInput="Add Margins: Empty" stepKey="commentAddMarginsEmpty"/>
1949+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup2">
1950+
<argument name="group" value="PageBuilderTextContentType"/>
1951+
</actionGroup>
19561952
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
19571953
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage1">
19581954
<argument name="contentType" value="PageBuilderTextContentType"/>
@@ -1965,58 +1961,12 @@
19651961
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
19661962
</actionGroup>
19671963
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
1968-
<!-- Add Margins: 0 -->
1969-
<comment userInput="Add Margins: 0" stepKey="commentAddMargins0"/>
1970-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage2">
1971-
<argument name="contentType" value="PageBuilderTextContentType"/>
1972-
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1973-
<argument name="containerTargetIndex" value="2"/>
1974-
<argument name="contentTypeIndex" value="2"/>
1975-
</actionGroup>
1976-
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit1"/>
1977-
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage2">
1978-
<argument name="contentType" value="PageBuilderTextContentType"/>
1979-
<argument name="contentTypeIndex" value="2"/>
1980-
</actionGroup>
1981-
<actionGroup ref="addTextToTinyMCE" stepKey="enterText2">
1982-
<argument name="property" value="PageBuilderTextProperty"/>
1983-
</actionGroup>
1984-
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMargins2">
1985-
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
1986-
</actionGroup>
1987-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
1988-
<!-- Add Margins: 1 -->
1989-
<comment userInput="Add Margins: 1" stepKey="commentAddMargins1"/>
1990-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage3">
1991-
<argument name="contentType" value="PageBuilderTextContentType"/>
1992-
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1993-
<argument name="containerTargetIndex" value="3"/>
1994-
<argument name="contentTypeIndex" value="3"/>
1995-
</actionGroup>
1996-
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit2"/>
1997-
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage3">
1998-
<argument name="contentType" value="PageBuilderTextContentType"/>
1999-
<argument name="contentTypeIndex" value="3"/>
2000-
</actionGroup>
2001-
<actionGroup ref="addTextToTinyMCE" stepKey="enterText3">
2002-
<argument name="property" value="PageBuilderTextProperty"/>
2003-
</actionGroup>
2004-
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMargins3">
2005-
<argument name="property" value="PageBuilderMarginsProperty1"/>
2006-
</actionGroup>
2007-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
1964+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor2"/>
20081965
<!-- Add Margins: Unique -->
20091966
<comment userInput="Add Margins: Unique" stepKey="commentAddMarginsUnique"/>
2010-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage4">
2011-
<argument name="contentType" value="PageBuilderTextContentType"/>
2012-
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
2013-
<argument name="containerTargetIndex" value="4"/>
2014-
<argument name="contentTypeIndex" value="4"/>
2015-
</actionGroup>
2016-
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit4"/>
20171967
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage4">
20181968
<argument name="contentType" value="PageBuilderTextContentType"/>
2019-
<argument name="contentTypeIndex" value="4"/>
1969+
<argument name="contentTypeIndex" value="2"/>
20201970
</actionGroup>
20211971
<actionGroup ref="addTextToTinyMCE" stepKey="enterText4">
20221972
<argument name="property" value="PageBuilderTextProperty"/>
@@ -2025,59 +1975,21 @@
20251975
<argument name="property" value="PageBuilderMarginsPropertyUnique"/>
20261976
</actionGroup>
20271977
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings4"/>
2028-
<!-- Add Margins: Invalid -->
2029-
<comment userInput="Add Margins: Invalid" stepKey="commentAddMarginsInvalid"/>
2030-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage5">
2031-
<argument name="contentType" value="PageBuilderTextContentType"/>
2032-
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
2033-
<argument name="containerTargetIndex" value="5"/>
2034-
<argument name="contentTypeIndex" value="5"/>
2035-
</actionGroup>
2036-
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit5"/>
2037-
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage5">
2038-
<argument name="contentType" value="PageBuilderTextContentType"/>
2039-
<argument name="contentTypeIndex" value="5"/>
2040-
</actionGroup>
2041-
<actionGroup ref="addTextToTinyMCE" stepKey="enterText5">
2042-
<argument name="property" value="PageBuilderTextProperty"/>
2043-
</actionGroup>
2044-
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMargins5">
2045-
<argument name="property" value="PageBuilderMarginsProperty_NonNumeric"/>
2046-
</actionGroup>
2047-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings5"/>
1978+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor3"/>
20481979
<!-- Stage: Check Margins: Empty -->
20491980
<comment userInput="Stage: Check Margins: Empty" stepKey="commentStageCheckEmpty"/>
20501981
<actionGroup ref="validateAdvancedStyleWithNoMargins" stepKey="validateStageEmpty">
20511982
<argument name="page" value="TextOnStage"/>
20521983
<argument name="index" value="1"/>
20531984
</actionGroup>
2054-
<!-- Stage: Check Margins: 0 -->
2055-
<comment userInput="Stage: Check Margins: 0" stepKey="commentStageCheck0"/>
2056-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage0">
2057-
<argument name="page" value="TextOnStage"/>
2058-
<argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
2059-
<argument name="index" value="2"/>
2060-
</actionGroup>
2061-
<!-- Stage: Check Margins: 1 -->
2062-
<comment userInput="Stage: Check Margins: 1" stepKey="commentStageCheck1"/>
2063-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage1">
2064-
<argument name="page" value="TextOnStage"/>
2065-
<argument name="margin" value="PageBuilderMarginsProperty1"/>
2066-
<argument name="index" value="3"/>
2067-
</actionGroup>
20681985
<!-- Stage: Check Margins: Unique -->
20691986
<comment userInput="Stage: Check Margins: Unique" stepKey="commentStageCheckUnique"/>
20701987
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStageUnique">
20711988
<argument name="page" value="TextOnStage"/>
20721989
<argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
2073-
<argument name="index" value="4"/>
2074-
</actionGroup>
2075-
<!-- Stage: Check Margins: Invalid -->
2076-
<comment userInput="Stage: Check Margins: Invalid" stepKey="commentStageCheckInvalid"/>
2077-
<actionGroup ref="validateAdvancedStyleWithNoMargins" stepKey="validateStageInvalid">
2078-
<argument name="page" value="TextOnStage"/>
2079-
<argument name="index" value="5"/>
1990+
<argument name="index" value="2"/>
20801991
</actionGroup>
1992+
<!-- Validate Stage After Save -->
20811993
<comment userInput="Validate Stage After Save" stepKey="commentStageAfterSave"/>
20821994
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
20831995
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -2087,32 +1999,12 @@
20871999
<argument name="page" value="TextOnStage"/>
20882000
<argument name="index" value="1"/>
20892001
</actionGroup>
2090-
<!-- Stage: Check Margins: 0 -->
2091-
<comment userInput="Stage: Check Margins: 0" stepKey="commentStageCheck02"/>
2092-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage02">
2093-
<argument name="page" value="TextOnStage"/>
2094-
<argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
2095-
<argument name="index" value="2"/>
2096-
</actionGroup>
2097-
<!-- Stage: Check Margins: 1 -->
2098-
<comment userInput="Stage: Check Margins: 1" stepKey="commentStageCheck12"/>
2099-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage12">
2100-
<argument name="page" value="TextOnStage"/>
2101-
<argument name="margin" value="PageBuilderMarginsProperty1"/>
2102-
<argument name="index" value="3"/>
2103-
</actionGroup>
21042002
<!-- Stage: Check Margins: Unique -->
21052003
<comment userInput="Stage: Check Margins: Unique" stepKey="commentStageCheckUnique2"/>
21062004
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStageUnique2">
21072005
<argument name="page" value="TextOnStage"/>
21082006
<argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
2109-
<argument name="index" value="4"/>
2110-
</actionGroup>
2111-
<!-- Stage: Check Margins: Invalid -->
2112-
<comment userInput="Stage: Check Margins: Invalid" stepKey="commentStageCheckInvalid2"/>
2113-
<actionGroup ref="validateAdvancedStyleWithNoMargins" stepKey="validateStageInvalid2">
2114-
<argument name="page" value="TextOnStage"/>
2115-
<argument name="index" value="5"/>
2007+
<argument name="index" value="2"/>
21162008
</actionGroup>
21172009
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
21182010
<argument name="contentType" value="PageBuilderTextContentType"/>
@@ -2123,32 +2015,12 @@
21232015
<argument name="page" value="TextOnStorefront"/>
21242016
<argument name="index" value="1"/>
21252017
</actionGroup>
2126-
<!-- Storefront: Check Margins: 0 -->
2127-
<comment userInput="Storefront: Check Margins: 0" stepKey="commentStorefrontCheck0"/>
2128-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStorefront0">
2129-
<argument name="page" value="TextOnStorefront"/>
2130-
<argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
2131-
<argument name="index" value="2"/>
2132-
</actionGroup>
2133-
<!-- Storefront: Check Margins: 1 -->
2134-
<comment userInput="Storefront: Check Margins: 1" stepKey="commentStorefrontCheck1"/>
2135-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStorefront1">
2136-
<argument name="page" value="TextOnStorefront"/>
2137-
<argument name="margin" value="PageBuilderMarginsProperty1"/>
2138-
<argument name="index" value="3"/>
2139-
</actionGroup>
21402018
<!-- Storefront: Check Margins: Unique -->
21412019
<comment userInput="Storefront: Check Margins: Unique" stepKey="commentStorefrontCheckUnique"/>
21422020
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStorefrontUnique">
21432021
<argument name="page" value="TextOnStorefront"/>
21442022
<argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
2145-
<argument name="index" value="4"/>
2146-
</actionGroup>
2147-
<!-- Storefront: Check Margins: Invalid -->
2148-
<comment userInput="Storefront: Check Margins: Invalid" stepKey="commentStorefrontCheckInvalid"/>
2149-
<actionGroup ref="validateAdvancedStyleWithNoMargins" stepKey="validateStorefrontInvalid">
2150-
<argument name="page" value="TextOnStorefront"/>
2151-
<argument name="index" value="5"/>
2023+
<argument name="index" value="2"/>
21522024
</actionGroup>
21532025
</test>
21542026
<test name="AdvancedConfigurationFunctionalMargins500">

0 commit comments

Comments
 (0)