Skip to content

Commit 5b07b33

Browse files
glo71317glo71317
committed
Merge remote-tracking branch 'origin/2.4-develop' into AC-12025
2 parents 294e46b + 83a12d6 commit 5b07b33

File tree

36 files changed

+752
-3
lines changed

36 files changed

+752
-3
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<testCaseId value="MC-115"/>
1919
<group value="Bundle"/>
2020
<group value="cloud"/>
21+
<skip>
22+
<issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
23+
</skip>
2124
</annotations>
2225
<before>
2326
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAddRemoveProductImageVirtualProductTest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<testCaseId value="MC-103"/>
1919
<group value="Catalog"/>
2020
<group value="cloud"/>
21+
<skip>
22+
<issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
23+
</skip>
2124
</annotations>
2225
<before>
2326
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<severity value="BLOCKER"/>
1717
<testCaseId value="MC-189"/>
1818
<group value="Catalog"/>
19+
<skip>
20+
<issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
21+
</skip>
1922
</annotations>
2023

2124
<before>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<testCaseId value="MC-101"/>
1919
<group value="ConfigurableProduct"/>
2020
<group value="cloud"/>
21+
<skip>
22+
<issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
23+
</skip>
2124
</annotations>
2225

2326
<before>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,4 +528,18 @@
528528
<data key="default_shipping">Yes</data>
529529
<requiredEntity type="region">RegionCA</requiredEntity>
530530
</entity>
531+
<entity name="US_Address_California_Madison">
532+
<data key="firstname">John</data>
533+
<data key="lastname">Doe</data>
534+
<data key="company">Magento</data>
535+
<array key="street">
536+
<item>4145 Madison Ave</item>
537+
</array>
538+
<data key="city">Culver City</data>
539+
<data key="country_id">US</data>
540+
<data key="country">United States</data>
541+
<data key="state">California</data>
542+
<data key="postcode">90232</data>
543+
<data key="telephone">555-55-555-55</data>
544+
</entity>
531545
</entities>

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<!-- Verify country Belgium can be saved without state as state not required -->
6262
<actionGroup ref="StoreFrontClickEditDefaultShippingAddressActionGroup" stepKey="clickOnDefaultShippingAddress"/>
6363
<selectOption selector="{{StorefrontCustomerAddressFormSection.country}}" userInput="Belgium" stepKey="selectCountry"/>
64+
<waitForAjaxLoad stepKey="waitForCountryDataToApply" />
6465
<selectOption selector="{{StorefrontCustomerAddressFormSection.state}}" userInput="Please select a region, state or province." stepKey="selectState"/>
6566
<actionGroup ref="AdminSaveCustomerAddressActionGroup" stepKey="saveAddress"/>
6667
<see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="Belgium" stepKey="seeAssertCustomerDefaultShippingAddressCountry"/>

‎app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-117"/>
1919
<group value="Downloadable"/>
20+
<skip>
21+
<issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<testCaseId value="MC-106"/>
1919
<group value="GroupedProduct"/>
2020
<group value="cloud"/>
21+
<skip>
22+
<issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
23+
</skip>
2124
</annotations>
2225
<before>
2326
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

‎app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminConfigurePaypalPaylaterEnableActionGroup.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!--
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
-->
7+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
8+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminConfigurePaypalPaylaterEnableActionGroup">
10+
<annotations>
11+
<description>Enable Paypal Paylater Solution For Paypal Express Checkout</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="countryCode" type="string" defaultValue="us"/>
15+
</arguments>
16+
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
17+
<waitForElementClickable selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="waitForConfigureButtonClickable"/>
18+
<click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="configureButtonClicked"/>
19+
<selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLater(countryCode)}}" userInput="Yes" stepKey="enablePaylaterExp"/>
20+
<waitForPageLoad stepKey="waitForAdvisePageLoad"/>
21+
<click selector="{{PayPalExpressCheckoutConfigSection.payLaterConfigDropDown(countryCode)}}" stepKey="advertisePaylater"/>
22+
<waitForPageLoad stepKey="waitForAdvisePaylaterDropdown"/>
23+
<selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLaterIn(countryCode)}}" userInput="Yes" stepKey="enablePaypalLater"/>
24+
</actionGroup>
25+
</actionGroups>

‎app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminDisablePayPalPayFlowLinkActionGroup.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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="AdminDisablePayPalPayFlowLinkActionGroup">
12+
<annotations>
13+
<description>Goes to the 'Configuration' page for 'Payment Methods'. Disables PayPal payflow link solution. Clicks on Save.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="countryCode" type="string" defaultValue="us"/>
17+
</arguments>
18+
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
19+
<waitForPageLoad stepKey="waitForPageLoad1"/>
20+
<scrollTo selector="{{AdminPayPalPayFlowLinkConfigSection.paymentGateway(countryCode)}}" stepKey="scrollToConfigure"/>
21+
<waitForElementVisible selector="{{AdminPayPalPayFlowLinkConfigSection.configureBtn(countryCode)}}" stepKey="waitForPayPalPayFlowPaymentConfigureBtn"/>
22+
<conditionalClick selector ="{{AdminPayPalPayFlowLinkConfigSection.configureBtn(countryCode)}}" dependentSelector="{{AdminPayPalPayFlowLinkConfigSection.configureBtn(countryCode)}}" visible="true" stepKey="clickPayPalPayFlowPaymentConfigureBtn"/>
23+
<waitForElementClickable selector ="{{AdminPayPalPayFlowLinkConfigSection.enableSolution(countryCode)}}" stepKey="waitForSolutionFieldToBeClickable"/>
24+
<selectOption selector ="{{AdminPayPalPayFlowLinkConfigSection.enableSolution(countryCode)}}" userInput="No" stepKey="disableSolution"/>
25+
<waitForElementClickable selector ="{{AdminConfigSection.saveButton}}" stepKey="waitForSaveConfigToBeVisible"/>
26+
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
27+
<waitForPageLoad stepKey="waitForSaving"/>
28+
</actionGroup>
29+
</actionGroups>

0 commit comments

Comments
 (0)