Skip to content

Commit b0c8317

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-23795' into 2.4-develop-pr23
2 parents d1ec840 + 1cdedc7 commit b0c8317

File tree

5 files changed

+23
-15
lines changed

5 files changed

+23
-15
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="CustomerEntityOne" type="customer">
12-
<data key="group_id">0</data>
12+
<data key="group_id">1</data>
1313
<data key="default_billing">defaultBillingValue</data>
1414
<data key="default_shipping">defaultShippingValue</data>
1515
<data key="confirmation">confirmationData</data>
@@ -111,7 +111,7 @@
111111
<data key="website_id">0</data>
112112
</entity>
113113
<entity name="Simple_US_Customer_Multiple_Addresses" type="customer">
114-
<data key="group_id">0</data>
114+
<data key="group_id">1</data>
115115
<data key="default_billing">true</data>
116116
<data key="default_shipping">true</data>
117117
<data key="email" unique="prefix">John.Doe@example.com</data>
@@ -125,7 +125,7 @@
125125
<requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
126126
</entity>
127127
<entity name="Simple_US_Customer_Multiple_Addresses_No_Default_Address" type="customer">
128-
<data key="group_id">0</data>
128+
<data key="group_id">1</data>
129129
<data key="default_billing">true</data>
130130
<data key="default_shipping">true</data>
131131
<data key="email" unique="prefix">John.Doe@example.com</data>
@@ -139,7 +139,7 @@
139139
<requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
140140
</entity>
141141
<entity name="Simple_US_Customer_With_Different_Billing_Shipping_Addresses" type="customer">
142-
<data key="group_id">0</data>
142+
<data key="group_id">1</data>
143143
<data key="default_billing">true</data>
144144
<data key="default_shipping">true</data>
145145
<data key="email" unique="prefix">John.Doe@example.com</data>
@@ -153,7 +153,7 @@
153153
<requiredEntity type="address">US_Address_NY_Default_Shipping</requiredEntity>
154154
</entity>
155155
<entity name="Simple_US_Customer_NY" type="customer">
156-
<data key="group_id">0</data>
156+
<data key="group_id">1</data>
157157
<data key="default_billing">true</data>
158158
<data key="default_shipping">true</data>
159159
<data key="email" unique="prefix">John.Doe@example.com</data>
@@ -166,7 +166,7 @@
166166
<requiredEntity type="address">US_Address_NY</requiredEntity>
167167
</entity>
168168
<entity name="Simple_US_Customer_CA" type="customer">
169-
<data key="group_id">0</data>
169+
<data key="group_id">1</data>
170170
<data key="default_billing">true</data>
171171
<data key="default_shipping">true</data>
172172
<data key="email" unique="prefix">John.Doe@example.com</data>
@@ -221,7 +221,7 @@
221221
<requiredEntity type="address">US_Address_Utah</requiredEntity>
222222
</entity>
223223
<entity name="Simple_GB_Customer" type="customer">
224-
<data key="group_id">0</data>
224+
<data key="group_id">1</data>
225225
<data key="default_billing">true</data>
226226
<data key="default_shipping">true</data>
227227
<data key="email" unique="prefix">Jane.Doe@example.com</data>
@@ -257,7 +257,7 @@
257257
<data key="website_id">0</data>
258258
</entity>
259259
<entity name="UKCustomer" type="customer">
260-
<data key="group_id">0</data>
260+
<data key="group_id">1</data>
261261
<data key="default_billing">true</data>
262262
<data key="default_shipping">true</data>
263263
<data key="email" unique="prefix">david@email.com</data>
@@ -271,7 +271,7 @@
271271
<requiredEntity type="address">updateCustomerUKAddress</requiredEntity>
272272
</entity>
273273
<entity name="Customer_US_UK_DE" type="customer">
274-
<data key="group_id">0</data>
274+
<data key="group_id">1</data>
275275
<data key="default_billing">true</data>
276276
<data key="default_shipping">true</data>
277277
<data key="email" unique="prefix">John.Doe@example.com</data>
@@ -299,7 +299,7 @@
299299
<requiredEntity type="address">US_Address_CA</requiredEntity>
300300
</entity>
301301
<entity name="Simple_US_Customer_Two_Addresses" type="customer">
302-
<data key="group_id">0</data>
302+
<data key="group_id">1</data>
303303
<data key="default_billing">true</data>
304304
<data key="default_shipping">true</data>
305305
<data key="email" unique="prefix">John.Doe@example.com</data>
@@ -331,7 +331,7 @@
331331
<data key="password">123123qa</data>
332332
</entity>
333333
<entity name="Simple_US_Customer_Incorrect_Email" type="customer">
334-
<data key="group_id">0</data>
334+
<data key="group_id">1</data>
335335
<data key="default_billing">true</data>
336336
<data key="default_shipping">true</data>
337337
<data key="email">&gt;&lt;script&gt;alert(1);&lt;/script&gt;@example.com</data>
@@ -354,7 +354,7 @@
354354
<data key="website_id">0</data>
355355
</entity>
356356
<entity name="Simple_US_Customer_ArmedForcesEurope" type="customer">
357-
<data key="group_id">0</data>
357+
<data key="group_id">1</data>
358358
<data key="default_billing">true</data>
359359
<data key="default_shipping">true</data>
360360
<data key="email" unique="prefix">John.Doe@example.com</data>

‎app/code/Magento/Customer/etc/di.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,11 @@
357357
<type name="Magento\Framework\App\ActionInterface">
358358
<plugin name="customerNotification" type="Magento\Customer\Model\Plugin\CustomerNotification"/>
359359
</type>
360+
<type name="Magento\Customer\Model\Authorization\CustomerSessionUserContext">
361+
<arguments>
362+
<argument name="customerSession" xsi:type="object">Magento\Customer\Model\Session\Proxy</argument>
363+
</arguments>
364+
</type>
360365
<type name="Magento\PageCache\Observer\FlushFormKey">
361366
<plugin name="customerFlushFormKey" type="Magento\Customer\Model\Plugin\CustomerFlushFormKey"/>
362367
</type>

‎app/code/Magento/Persistent/etc/di.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,4 @@
1212
<type name="Magento\Customer\CustomerData\Customer">
1313
<plugin name="section_data" type="Magento\Persistent\Model\Plugin\CustomerData" />
1414
</type>
15-
<type name="Magento\Framework\App\Http\Context">
16-
<plugin name="persistent_page_cache_variation" type="Magento\Persistent\Model\Plugin\PersistentCustomerContext" />
17-
</type>
1815
</config>

‎app/code/Magento/Persistent/etc/frontend/di.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,7 @@
4949
</argument>
5050
</arguments>
5151
</type>
52+
<type name="Magento\Framework\App\Http\Context">
53+
<plugin name="persistent_page_cache_variation" type="Magento\Persistent\Model\Plugin\PersistentCustomerContext" />
54+
</type>
5255
</config>

‎app/code/Magento/Translation/Test/Mftf/Test/AdminInlineTranslationOnCheckoutTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<testCaseId value="MC-11505"/>
1818
<group value="translation"/>
1919
<group value="checkout"/>
20+
<skip>
21+
<issueId value="MC-31663"/>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>

0 commit comments

Comments
 (0)