Skip to content

Commit 929cb06

Browse files
engcom-Charlieengcom-Charlie
authored
Merge branch '2.4-develop' into add-action-group-for-addProductsToOption
2 parents db96694 + a360c06 commit 929cb06

File tree

113 files changed

+2363
-243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+2363
-243
lines changed

‎app/code/Magento/Customer/Block/Account/Navigation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ public function getLinks()
4747
*/
4848
private function compare(SortLinkInterface $firstLink, SortLinkInterface $secondLink): int
4949
{
50-
return $firstLink->getSortOrder() <=> $secondLink->getSortOrder();
50+
return $secondLink->getSortOrder() <=> $firstLink->getSortOrder();
5151
}
5252
}

‎app/code/Magento/Customer/Test/Mftf/Metadata/CustomerExtensionAttributeMeta.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
1111
<operation name="CreateCustomerExtensionAttribute" dataType="customer_extension_attribute" type="create">
12+
<field key="assistance_allowed">integer</field>
1213
<field key="is_subscribed">boolean</field>
1314
<field key="extension_attribute">customer_nested_extension_attribute</field>
1415
</operation>
1516
<operation name="UpdateCustomerExtensionAttribute" dataType="customer_extension_attribute" type="update">
17+
<field key="assistance_allowed">integer</field>
1618
<field key="is_subscribed">boolean</field>
1719
<field key="extension_attribute">customer_nested_extension_attribute</field>
1820
</operation>

‎app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818

1919
class NavigationTest extends TestCase
2020
{
21-
/**
22-
* Stub name top links
23-
*/
24-
private const STUB_TOP_LINKS_NAME_IN_LAYOUT = 'top.links';
25-
2621
/**
2722
* @var ObjectManagerHelper
2823
*/
@@ -67,7 +62,7 @@ protected function setUp(): void
6762
*
6863
* @return void
6964
*/
70-
public function testGetLinksWithCustomerAndWishList(): void
65+
public function testGetLinksWithCustomerAndWishList()
7166
{
7267
$wishListLinkMock = $this->getMockBuilder(WishListLink::class)
7368
->disableOriginalConstructor()
@@ -81,30 +76,30 @@ public function testGetLinksWithCustomerAndWishList(): void
8176

8277
$wishListLinkMock->expects($this->any())
8378
->method('getSortOrder')
84-
->willReturn(30);
79+
->willReturn(100);
8580

8681
$customerAccountLinkMock->expects($this->any())
8782
->method('getSortOrder')
88-
->willReturn(0);
83+
->willReturn(20);
8984

90-
$topLinksNameInLayout = self::STUB_TOP_LINKS_NAME_IN_LAYOUT;
85+
$nameInLayout = 'top.links';
9186

9287
$blockChildren = [
93-
'customerAccountLink' => $customerAccountLinkMock,
94-
'wishListLink' => $wishListLinkMock
88+
'wishListLink' => $wishListLinkMock,
89+
'customerAccountLink' => $customerAccountLinkMock
9590
];
9691

97-
$this->navigation->setNameInLayout($topLinksNameInLayout);
92+
$this->navigation->setNameInLayout($nameInLayout);
9893
$this->layoutMock->expects($this->any())
9994
->method('getChildBlocks')
100-
->with($topLinksNameInLayout)
95+
->with($nameInLayout)
10196
->willReturn($blockChildren);
10297

10398
/* Assertion */
10499
$this->assertEquals(
105100
[
106-
0 => $customerAccountLinkMock,
107-
1 => $wishListLinkMock
101+
0 => $wishListLinkMock,
102+
1 => $customerAccountLinkMock
108103
],
109104
$this->navigation->getLinks()
110105
);

‎app/code/Magento/Customer/view/frontend/layout/customer_account.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,31 @@
2424
<arguments>
2525
<argument name="label" xsi:type="string" translate="true">My Account</argument>
2626
<argument name="path" xsi:type="string">customer/account</argument>
27-
<argument name="sortOrder" xsi:type="number">1</argument>
27+
<argument name="sortOrder" xsi:type="number">250</argument>
2828
</arguments>
2929
</block>
3030
<block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-1" template="Magento_Customer::account/navigation-delimiter.phtml">
3131
<arguments>
32-
<argument name="sortOrder" xsi:type="number">40</argument>
32+
<argument name="sortOrder" xsi:type="number">200</argument>
3333
</arguments>
3434
</block>
3535
<block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-address-link">
3636
<arguments>
3737
<argument name="label" xsi:type="string" translate="true">Address Book</argument>
3838
<argument name="path" xsi:type="string">customer/address</argument>
39-
<argument name="sortOrder" xsi:type="number">50</argument>
39+
<argument name="sortOrder" xsi:type="number">190</argument>
4040
</arguments>
4141
</block>
4242
<block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-edit-link">
4343
<arguments>
4444
<argument name="label" xsi:type="string" translate="true">Account Information</argument>
4545
<argument name="path" xsi:type="string">customer/account/edit</argument>
46-
<argument name="sortOrder" xsi:type="number">60</argument>
46+
<argument name="sortOrder" xsi:type="number">180</argument>
4747
</arguments>
4848
</block>
4949
<block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-2" template="Magento_Customer::account/navigation-delimiter.phtml">
5050
<arguments>
51-
<argument name="sortOrder" xsi:type="number">90</argument>
51+
<argument name="sortOrder" xsi:type="number">130</argument>
5252
</arguments>
5353
</block>
5454
</block>

‎app/code/Magento/Customer/view/frontend/layout/default.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceBlock name="top.links">
11-
<block class="Magento\Customer\Block\Account\Link" name="my-account-link" template="Magento_Customer::account/link/my-account.phtml">
11+
<block class="Magento\Customer\Block\Account\Link" name="my-account-link">
1212
<arguments>
1313
<argument name="label" xsi:type="string" translate="true">My Account</argument>
14-
<argument name="sortOrder" xsi:type="number">1</argument>
14+
<argument name="sortOrder" xsi:type="number">110</argument>
1515
</arguments>
1616
</block>
1717
<block class="Magento\Customer\Block\Account\RegisterLink" name="register-link">
@@ -20,11 +20,7 @@
2020
</arguments>
2121
</block>
2222
<block class="Magento\Customer\Block\Account\AuthorizationLink" name="authorization-link"
23-
template="Magento_Customer::account/link/authorization.phtml">
24-
<arguments>
25-
<argument name="sortOrder" xsi:type="number">30</argument>
26-
</arguments>
27-
</block>
23+
template="Magento_Customer::account/link/authorization.phtml"/>
2824
</referenceBlock>
2925
<referenceContainer name="content">
3026
<block class="Magento\Customer\Block\Account\AuthenticationPopup" name="authentication-popup" as="authentication-popup" template="Magento_Customer::account/authentication-popup.phtml">

‎app/code/Magento/Customer/view/frontend/templates/form/edit.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ use Magento\Customer\Block\Widget\Name;
4747
<span><?= $block->escapeHtml(__('Change Password')) ?></span>
4848
</label>
4949
</div>
50+
<?= $block->getChildHtml('fieldset_edit_info_additional') ?>
5051
</fieldset>
5152

5253
<fieldset class="fieldset password" data-container="change-email-password">

‎app/code/Magento/Customer/view/frontend/templates/form/register.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ $formData = $block->getFormData();
6767
<?php if ($_gender->isEnabled()): ?>
6868
<?= $_gender->setGender($formData->getGender())->toHtml() ?>
6969
<?php endif ?>
70+
<?= $block->getChildHtml('fieldset_create_info_additional') ?>
7071
</fieldset>
7172
<?php if ($block->getShowAddressFields()): ?>
7273
<?php $cityValidationClass = $addressHelper->getAttributeValidationClass('city'); ?>

‎app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<arguments>
1313
<argument name="path" xsi:type="string">downloadable/customer/products</argument>
1414
<argument name="label" xsi:type="string" translate="true">My Downloadable Products</argument>
15-
<argument name="sortOrder" xsi:type="number">20</argument>
15+
<argument name="sortOrder" xsi:type="number">217</argument>
1616
</arguments>
1717
</block>
1818
</referenceBlock>

‎app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Magento\LoginAsCustomer\Model\Resolver;
99

10-
use Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerResultFactory;
10+
use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory;
1111
use Magento\LoginAsCustomerApi\Api\ConfigInterface;
1212
use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
1313
use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
@@ -23,17 +23,17 @@ class IsLoginAsCustomerEnabledResolver implements IsLoginAsCustomerEnabledForCus
2323
private $config;
2424

2525
/**
26-
* @var IsLoginAsCustomerEnabledForCustomerResultFactory
26+
* @var IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory
2727
*/
2828
private $resultFactory;
2929

3030
/**
3131
* @param ConfigInterface $config
32-
* @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
32+
* @param IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
3333
*/
3434
public function __construct(
3535
ConfigInterface $config,
36-
IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
36+
IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
3737
) {
3838
$this->config = $config;
3939
$this->resultFactory = $resultFactory;

‎app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebSiteAndGroupActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminCreateCustomerWithWebSiteAndGroupActionGroup">
12+
<conditionalClick selector="{{AdminCustomerAccountInformationSection.assistanceAllowed}}" dependentSelector="{{AdminCustomerAccountInformationSection.assistanceAllowed}}" visible="true" stepKey="clickAllowAssistance" after="FillEmail"/>
13+
</actionGroup>
14+
</actionGroups>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Data/CustomerData.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="Simple_US_Customer_Assistance_Allowed" type="customer" extends="Simple_US_Customer">
12+
<requiredEntity type="customer_extension_attribute">AssistanceAllowed</requiredEntity>
13+
</entity>
14+
<entity name="Simple_US_CA_Customer_Assistance_Allowed" type="customer" extends="Simple_US_CA_Customer">
15+
<requiredEntity type="customer_extension_attribute">AssistanceAllowed</requiredEntity>
16+
</entity>
17+
</entities>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Data/ExtensionAttributeAssistanceData.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="AssistanceDisallowed" type="customer_extension_attribute">
12+
<data key="assistance_allowed">1</data>
13+
</entity>
14+
<entity name="AssistanceAllowed" type="customer_extension_attribute">
15+
<data key="assistance_allowed">2</data>
16+
</entity>
17+
</entities>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminCustomerAccountInformationSection">
12+
<element name="assistanceAllowed" type="button" selector="//input[@name='customer[extension_attributes][assistance_allowed]']/../label"/>
13+
</section>
14+
</sections>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
2828
stepKey="enableLoginAsCustomerAutoDetection"/>
2929
<magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
30-
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
30+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
3131
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserBefore"/>
3232

3333
<!--Create New Role-->

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
2929
<requiredEntity createDataKey="createCategory"/>
3030
</createData>
31-
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
31+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
3232
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
3333
</before>
3434
<after>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<group value="login_as_customer"/>
2121
</annotations>
2222
<before>
23-
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
23+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
2424
<magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
2525
stepKey="enableLoginAsCustomer"/>
2626
<magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
<argument name="customStore" value="customStoreEN"/>
4343
</actionGroup>
4444
<actionGroup ref="AdminCreateCustomerWithWebSiteAndGroupActionGroup" stepKey="createCustomer">
45-
<argument name="customerData" value="Simple_US_Customer"/>
45+
<argument name="customerData" value="Simple_US_Customer_Assistance_Allowed"/>
4646
<argument name="website" value="{{customWebsite.name}}"/>
4747
<argument name="storeView" value="{{customStoreEN.name}}"/>
4848
</actionGroup>
4949
</before>
5050
<after>
5151
<actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
52-
<argument name="customerEmail" value="Simple_US_Customer.email"/>
52+
<argument name="customerEmail" value="Simple_US_Customer_Assistance_Allowed.email"/>
5353
</actionGroup>
5454
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
5555
<argument name="websiteName" value="{{customWebsite.name}}"/>
@@ -65,7 +65,7 @@
6565

6666
<!-- Login as Customer from Customer page -->
6767
<actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom">
68-
<argument name="customer" value="Simple_US_Customer"/>
68+
<argument name="customer" value="Simple_US_Customer_Assistance_Allowed"/>
6969
</actionGroup>
7070
<grabFromCurrentUrl regex="~id/(\d+)/~" stepKey="customerId" />
7171
<actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
2525
stepKey="enableLoginAsCustomerAutoDetection"/>
2626
<magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
27-
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
27+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
2828
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAdmin"/>
2929
</before>
3030
<after>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
stepKey="enableLoginAsCustomerAutoDetection"/>
2727
<magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
2828
<createData entity="NewAdminUser" stepKey="createNewAdmin"/>
29-
<createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
30-
<createData entity="Simple_US_CA_Customer" stepKey="createSecondCustomer"/>
29+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createFirstCustomer"/>
30+
<createData entity="Simple_US_CA_Customer_Assistance_Allowed" stepKey="createSecondCustomer"/>
3131
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultUser"/>
3232
</before>
3333
<after>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</skip>
2424
</annotations>
2525
<before>
26-
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
26+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
2727
<magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
2828
stepKey="enableLoginAsCustomer"/>
2929
<magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 1"

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
3434
<createData entity="SimpleProduct2" stepKey="createProduct1"/>
3535
<createData entity="SimpleProduct2" stepKey="createProduct2"/>
36-
<createData entity="Simple_US_Customer_Two_Addresses" stepKey="createCustomer"/>
36+
<createData entity="Simple_US_Customer_Assistance_Allowed_Two_Addresses" stepKey="createCustomer"/>
3737
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3838
</before>
3939

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<createData entity="SimpleProduct" stepKey="createProduct">
2929
<requiredEntity createDataKey="createCategory"/>
3030
</createData>
31-
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
31+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
3232

3333
<!-- Create new User -->
3434
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<createData entity="SimpleProduct" stepKey="createProduct">
2929
<requiredEntity createDataKey="createCategory"/>
3030
</createData>
31-
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
31+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
3232

3333
<!-- Create new User -->
3434
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>

0 commit comments

Comments
 (0)