Skip to content

Commit b65e67c

Browse files
magento-engcom-teammagento-engcom-team
authored
[EngCom] Public Pull Requests - 2.3-develop
 - merged latest code from mainline branch
2 parents 99ea949 + beb0274 commit b65e67c

File tree

13 files changed

+189
-22
lines changed

13 files changed

+189
-22
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@
1919
<click selector="{{AdminProductFiltersSection.apply}}" stepKey="clickApplyFiltersButton"/>
2020
</actionGroup>
2121

22+
<actionGroup name="SearchForProductOnBackendByNameActionGroup" extends="SearchForProductOnBackendActionGroup">
23+
<arguments>
24+
<argument name="productName" type="string"/>
25+
</arguments>
26+
<remove keyForRemoval="fillSkuFieldOnFiltersSection"/>
27+
<fillField userInput="{{productName}}" selector="{{AdminProductFiltersSection.nameInput}}" after="cleanFiltersIfTheySet" stepKey="fillNameFieldOnFiltersSection"/>
28+
</actionGroup>
29+
2230
<actionGroup name="ClearProductsFilterActionGroup">
2331
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
2432
<waitForPageLoad time="30" stepKey="waitForProductsPageToLoad"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,12 @@
1919
<group value="checkout"/>
2020
</annotations>
2121
<before>
22-
<createData entity="_defaultCategory" stepKey="createCategory"/>
23-
<createData entity="defaultVirtualProduct" stepKey="createVirtualProduct">
24-
<requiredEntity createDataKey="createCategory"/>
25-
</createData>
26-
<createData entity="Simple_US_Customer_CA" stepKey="createCustomer">
27-
<field key="group_id">1</field>
28-
</createData>
22+
<createData entity="VirtualProduct" stepKey="createVirtualProduct"/>
23+
<createData entity="Customer_With_Different_Default_Billing_Shipping_Addresses" stepKey="createCustomer"/>
2924
</before>
3025
<after>
3126
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
3227
<deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
33-
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3428
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3529
</after>
3630
<!-- Steps -->
@@ -48,8 +42,8 @@
4842
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingcart"/>
4943
<!-- Step 4: Open Estimate Tax section -->
5044
<click selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" stepKey="openEstimateTaxSection"/>
51-
<see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="checkCountry"/>
52-
<see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkState"/>
45+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCountry"/>
46+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkState"/>
5347
<scrollTo selector="{{CheckoutCartSummarySection.postcode}}" stepKey="scrollToPostCodeField"/>
5448
<grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
5549
<assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
<data key="city">Los Angeles</data>
130130
<data key="state">California</data>
131131
<data key="country_id">US</data>
132+
<data key="country">United States</data>
132133
<data key="postcode">90001</data>
133134
<data key="telephone">512-345-6789</data>
134135
<data key="default_billing">Yes</data>
@@ -182,4 +183,12 @@
182183
</array>
183184
<data key="state">California</data>
184185
</entity>
186+
<entity name="US_Default_Billing_Address_TX" type="address" extends="US_Address_TX">
187+
<data key="default_billing">false</data>
188+
<data key="default_shipping">true</data>
189+
</entity>
190+
<entity name="US_Default_Shipping_Address_CA" type="address" extends="US_Address_CA">
191+
<data key="default_billing">true</data>
192+
<data key="default_shipping">false</data>
193+
</entity>
185194
</entities>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,4 +166,16 @@
166166
<data key="website_id">0</data>
167167
<requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
168168
</entity>
169+
<entity name="Customer_With_Different_Default_Billing_Shipping_Addresses" type="customer">
170+
<data key="group_id">1</data>
171+
<data key="email" unique="prefix">[email protected]</data>
172+
<data key="firstname">John</data>
173+
<data key="lastname">Doe</data>
174+
<data key="fullname">John Doe</data>
175+
<data key="password">pwdTest123!</data>
176+
<data key="store_id">0</data>
177+
<data key="website_id">0</data>
178+
<requiredEntity type="address">US_Default_Billing_Address_TX</requiredEntity>
179+
<requiredEntity type="address">US_Default_Shipping_Address_CA</requiredEntity>
180+
</entity>
169181
</entities>

‎app/code/Magento/Payment/Helper/Data.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ public function __construct(
8484
}
8585

8686
/**
87+
* Get config name of method model
88+
*
8789
* @param string $code
8890
* @return string
8991
*/
@@ -259,10 +261,13 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
259261
$groupRelations = [];
260262

261263
foreach ($this->getPaymentMethods() as $code => $data) {
262-
if (isset($data['title'])) {
263-
$methods[$code] = $data['title'];
264-
} else {
265-
$methods[$code] = $this->getMethodInstance($code)->getConfigData('title', $store);
264+
if (!empty($data['active'])) {
265+
$storedTitle = $this->getMethodInstance($code)->getConfigData('title', $store);
266+
if (isset($storedTitle)) {
267+
$methods[$code] = $storedTitle;
268+
} elseif (isset($data['title'])) {
269+
$methods[$code] = $data['title'];
270+
}
266271
}
267272
if ($asLabelValue && $withGroups && isset($data['group'])) {
268273
$groupRelations[$code] = $data['group'];

‎app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ class Options implements \Magento\Framework\Data\OptionSourceInterface
2525
*
2626
* @param \Magento\Payment\Helper\Data $paymentHelper
2727
*/
28-
public function __construct(\Magento\Payment\Helper\Data $paymentHelper)
29-
{
28+
public function __construct(
29+
\Magento\Payment\Helper\Data $paymentHelper
30+
) {
3031
$this->paymentHelper = $paymentHelper;
3132
}
3233

‎app/code/Magento/Store/Test/Mftf/Data/StoreData.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,24 @@
3939
<data key="store_type">group</data>
4040
<requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
4141
</entity>
42+
<entity name="customStoreENNotUnique" type="store">
43+
<data key="name">EN</data>
44+
<data key="code">en</data>
45+
<data key="is_active">1</data>
46+
<data key="store_id">null</data>
47+
<data key="store_action">add</data>
48+
<data key="store_type">store</data>
49+
<requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
50+
</entity>
51+
<entity name="customStoreNLNotUnique" type="store">
52+
<data key="name">NL</data>
53+
<data key="code">nl</data>
54+
<data key="is_active">1</data>
55+
<data key="store_id">null</data>
56+
<data key="store_action">add</data>
57+
<data key="store_type">store</data>
58+
<requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
59+
</entity>
4260
<entity name="staticStore" type="store">
4361
<!--data key="group_id">customStoreGroup.id</data-->
4462
<data key="name">Second Store View</data>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
9090
<!-- Step 4: Open Estimate Shipping and Tax section -->
9191
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
92-
<see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="checkCustomerCountry" />
93-
<see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
92+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCustomerCountry" />
93+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
9494
<grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
9595
<assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
9696
<expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
6262
<!-- Step 4: Open Estimate Shipping and Tax section -->
6363
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
64-
<see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_NY.country_id}}" stepKey="checkCustomerCountry" />
65-
<see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_NY.state}}" stepKey="checkCustomerRegion" />
64+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_NY.country}}" stepKey="checkCustomerCountry" />
65+
<seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_NY.state}}" stepKey="checkCustomerRegion" />
6666
<grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
6767
<assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
6868
<expectedResult type="string">{{US_Address_NY.postcode}}</expectedResult>

‎app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<section name="AdminUrlRewriteIndexSection">
1212
<element name="requestPathFilter" type="input" selector="#urlrewriteGrid_filter_request_path"/>
1313
<element name="requestPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='request_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
14+
<element name="targetPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='target_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
1415
<element name="searchButton" type="button" selector="//button[@data-ui-id='widget-button-1']" timeout="30"/>
1516
<element name="emptyRecordMessage" type="text" selector="//*[@class='empty-text']"/>
1617
<element name="requestPathColumn" type="text" selector="//tr[@data-role='row']['{{var1}}']/td[@data-column='request_path']" parameterized="true"/>

0 commit comments

Comments
 (0)