Skip to content

Commit 3490981

Browse files
author
Cari Spruiell
committed
MC-2346: Can Input Value 1 Into Default Column Grid Size On Store Configuration
- correct error message and add test
1 parent e6a0a4c commit 3490981

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/ColumnData.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
<data key="defaultMaxGridSize">16</data>
177177
<data key="gridSizeErrorNegative">-8</data>
178178
<data key="gridSizeErrorZero">0</data>
179+
<data key="gridSizeErrorOne">1</data>
179180
<data key="gridSizeErrorFloat">12.5</data>
180181
<data key="gridSize_3">3</data>
181182
<data key="gridSize_5">5</data>
@@ -184,7 +185,7 @@
184185
<data key="gridSize_50">50</data>
185186
<data key="invalidDefaultGridSizeErrorMessage">Default grid size must be less than the maximum grid size.</data>
186187
<data key="invalidDigitErrorMessage">Please enter a valid number in this field.</data>
187-
<data key="greaterThanOneErrorMessage">Please enter a number greater than 1 in this field.</data>
188+
<data key="greaterThanOneErrorMessage">Please enter a number 2 or greater in this field.</data>
188189
</entity>
189190
<entity name="PageBuilderColumnDuplicate" type="pagebuilder_column">
190191
<data key="cannotDuplicateColumnErrorMessage">There is no free space within the column group to perform this action</data>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,16 @@
8585
<argument name="errorMessageSelector" value="{{ContentManagementSection.ColumnGridDefaultInputFieldError}}"/>
8686
<argument name="errorMessage" value="{{PageBuilderGridSize.greaterThanOneErrorMessage}}"/>
8787
</actionGroup>
88+
<!-- Enter Invalid Default Grid Size One -->
89+
<comment userInput="Enter Invalid Default Grid Size One" stepKey="commentDefaultOne"/>
90+
<actionGroup ref="updateDefaultGridSizeConfig" stepKey="enterInvalidDefaultGridSizeOne">
91+
<argument name="gridSize" value="{{PageBuilderGridSize.gridSizeErrorOne}}"/>
92+
</actionGroup>
93+
<actionGroup ref="saveStoreConfigurationAndValidateFieldError" stepKey="saveStoreConfigurationAndValidateFieldErrorOne">
94+
<argument name="inputFieldError" value="{{ContentManagementSection.ColumnGridDefaultInputField}}"/>
95+
<argument name="errorMessageSelector" value="{{ContentManagementSection.ColumnGridDefaultInputFieldError}}"/>
96+
<argument name="errorMessage" value="{{PageBuilderGridSize.greaterThanOneErrorMessage}}"/>
97+
</actionGroup>
8898
<!-- Enter Invalid Default Grid Size Float -->
8999
<comment userInput="Enter Invalid Default Grid Size Float" stepKey="commentFloatNumber"/>
90100
<actionGroup ref="updateDefaultGridSizeConfig" stepKey="enterInvalidDefaultGridSizeFloat">
@@ -119,6 +129,16 @@
119129
<argument name="errorMessageSelector" value="{{ContentManagementSection.ColumnGridMaxInputFieldError}}"/>
120130
<argument name="errorMessage" value="{{PageBuilderGridSize.greaterThanOneErrorMessage}}"/>
121131
</actionGroup>
132+
<!-- Enter Invalid Max Default Grid Size One -->
133+
<comment userInput="Enter Invalid Max Default Grid Size One" stepKey="commentMaxOne"/>
134+
<actionGroup ref="updateMaxGridSizeConfig" stepKey="enterInvalidMaxGridSizeOne">
135+
<argument name="gridSize" value="{{PageBuilderGridSize.gridSizeErrorOne}}"/>
136+
</actionGroup>
137+
<actionGroup ref="saveStoreConfigurationAndValidateFieldError" stepKey="saveStoreConfigurationAndValidateFieldErrorMaxOne">
138+
<argument name="inputFieldError" value="{{ContentManagementSection.ColumnGridMaxInputField}}"/>
139+
<argument name="errorMessageSelector" value="{{ContentManagementSection.ColumnGridMaxInputFieldError}}"/>
140+
<argument name="errorMessage" value="{{PageBuilderGridSize.greaterThanOneErrorMessage}}"/>
141+
</actionGroup>
122142
<!-- Enter Invalid Max Default Grid Size Float -->
123143
<comment userInput="Enter Invalid Max Default Grid Size Float" stepKey="commentFloatNumberMax"/>
124144
<actionGroup ref="updateMaxGridSizeConfig" stepKey="enterInvalidDefaultGridSizeFloatMax">

app/code/Magento/PageBuilder/view/adminhtml/web/js/system/config/validator-rules-mixin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ define([
3232
function (value) {
3333
return !(value <= 1);
3434
},
35-
$.mage.__('Please enter a number greater than 1 in this field.')
35+
$.mage.__('Please enter a number 2 or greater in this field.')
3636
);
3737

3838
$.validator.addMethod(

0 commit comments

Comments
 (0)