Skip to content

Commit be26941

Browse files
naydavnaydav
authored
Merge pull request #5994 from magento-engcom/login-as-customer-150
[Login as Customer] Customers should be able to enable/disable Admin "remote shopping assistance"
2 parents 2c90cff + c5686f4 commit be26941

File tree

75 files changed

+1795
-92
lines changed

Some content is hidden

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

75 files changed

+1795
-92
lines changed

‎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/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/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"/>

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

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.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="login"/>
2929
</before>
3030
<after>

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

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

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,14 @@
1717
value="Verify Admin users can have only one 'Login as Customer' session at a time"/>
1818
<severity value="MAJOR"/>
1919
<group value="login_as_customer"/>
20-
<skip>
21-
<issueId value="https://github.com/magento/magento2-login-as-customer/pull/193"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1" stepKey="enableLoginAsCustomer"/>
2623
<magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
2724
stepKey="enableLoginAsCustomerAutoDetection"/>
2825
<magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
29-
<createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
30-
<createData entity="Simple_US_CA_Customer" stepKey="createSecondCustomer"/>
26+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createFirstCustomer"/>
27+
<createData entity="Simple_US_CA_Customer_Assistance_Allowed" stepKey="createSecondCustomer"/>
3128
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultUser"/>
3229
</before>
3330
<after>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
3030
<requiredEntity createDataKey="createCategory"/>
3131
</createData>
32-
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
32+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
3333
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserBefore"/>
3434

3535
<!--Create New Role-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
3232
<requiredEntity createDataKey="createCategory"/>
3333
</createData>
34-
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
34+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
3535
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserBefore"/>
3636

3737
<!--Create New Role-->

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

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

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.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/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml

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

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<requiredEntity createDataKey="createCategory"/>
3232
<field key="price">10</field>
3333
</createData>
34-
<createData entity="Simple_US_Customer" stepKey="createCustomer">
34+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer">
3535
<field key="group_id">3</field>
3636
</createData>
3737
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>

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

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

0 commit comments

Comments
 (0)