Skip to content

Commit 6687d03

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-51917' into BUGS
2 parents 4593735 + f92330d commit 6687d03

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<data name="customer/data/lastname" xsi:type="string">Doe%isolation%</data>
1717
<data name="customer/data/suffix" xsi:type="string">_Suffix%isolation%</data>
1818
<data name="customer/data/email" xsi:type="string">JohnDoe%isolation%@example.com</data>
19-
<data name="customer/data/dob" xsi:type="string">Aug 01, 1986</data>
19+
<data name="customer/data/dob" xsi:type="string">Aug 1, 1986</data>
2020
<data name="customer/data/taxvat" xsi:type="string">123456789001</data>
2121
<data name="customer/data/gender" xsi:type="string">Male</data>
2222
<constraint name="Magento\Customer\Test\Constraint\AssertCustomerSuccessSaveMessage" />
@@ -52,7 +52,7 @@
5252
<data name="customer/data/lastname" xsi:type="string">Doe%isolation%</data>
5353
<data name="customer/data/suffix" xsi:type="string">_JaneSuffix%isolation%</data>
5454
<data name="customer/data/email" xsi:type="string">Jane%isolation%@example.com</data>
55-
<data name="customer/data/dob" xsi:type="string">Dec 01, 2000</data>
55+
<data name="customer/data/dob" xsi:type="string">Dec 1, 2000</data>
5656
<data name="customer/data/taxvat" xsi:type="string">987654321</data>
5757
<data name="customer/data/gender" xsi:type="string">Female</data>
5858
<data name="address/data/prefix" xsi:type="string">Prefix%isolation%_</data>

dev/tests/functional/tests/app/Magento/Weee/Test/Block/Product/Price.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Price extends \Magento\Catalog\Test\Block\AbstractPriceBlock
1818
*/
1919
protected $mapTypePrices = [
2020
'regular_price' => [
21-
'selector' => '[data-price-type="finalPrice"] .price',
21+
'selector' => '.price-wrapper',
2222
],
2323
'fpt_price' => [
2424
'selector' => '[data-price-type="weee"] .price',

0 commit comments

Comments
 (0)