Skip to content

Commit 3020ac7

Browse files
committed
Resolve Wrong message in confirmation popup when delete customer group issue25661
1 parent 6da226d commit 3020ac7

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerGroupActionGroup.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<arguments>
1616
<argument name="customerGroupName" type="string"/>
1717
</arguments>
18-
18+
1919
<amOnPage url="{{AdminCustomerGroupsIndexPage.url}}" stepKey="goToAdminCustomerGroupIndexPage"/>
2020
<waitForPageLoad time="30" stepKey="waitForCustomerGroupIndexPageLoad"/>
2121
<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerGroupIndexPage"/>
@@ -24,6 +24,8 @@
2424
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
2525
<click selector="{{AdminCustomerGroupGridActionsSection.selectButton(customerGroupName)}}" stepKey="clickSelectButton"/>
2626
<click selector="{{AdminCustomerGroupGridActionsSection.deleteAction(customerGroupName)}}" stepKey="clickOnDeleteItem"/>
27+
<waitForElementVisible selector="{{AdminGridConfirmActionSection.message}}" stepKey="waitForConfirmModal"/>
28+
<see selector="{{AdminGridConfirmActionSection.message}}" userInput="Are you sure you want to delete a {{customerGroupName}} record?" stepKey="seeRemoveMessage"/>
2729
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDeleteCustomerGroup"/>
2830
<seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
2931
</actionGroup>

app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</array>
3131
</entity>
3232
<entity name="CustomCustomerGroup" type="customerGroup">
33-
<data key="code" unique="suffix">Group </data>
33+
<data key="code" unique="suffix">Group-</data>
3434
<data key="tax_class_id">3</data>
3535
<data key="tax_class_name">Retail Customer</data>
3636
</entity>

app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ public function prepareDataSource(array $dataSource)
9797
),
9898
'label' => __('Delete'),
9999
'confirm' => [
100-
'title' => __('Delete %1', $this->escaper->escapeJs($title)),
100+
'title' => __('Delete %1', $this->escaper->escapeHtml($title)),
101101
'message' => __(
102102
'Are you sure you want to delete a %1 record?',
103-
$this->escaper->escapeJs($title)
103+
$this->escaper->escapeHtml($title)
104104
)
105105
],
106106
'post' => true,

0 commit comments

Comments
 (0)