Skip to content

Commit

Permalink
Merge branch '2.4-develop' of https://github.com/mage-os/mirror-magento2
Browse files Browse the repository at this point in the history
 into 2.4-develop
  • Loading branch information
mage-os-ci committed Jun 25, 2024
2 parents 3aefde8 + 83a12d6 commit db41a69
Show file tree
Hide file tree
Showing 36 changed files with 752 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<testCaseId value="MC-115"/>
<group value="Bundle"/>
<group value="cloud"/>
<skip>
<issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
</skip>
</annotations>
<before>
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<testCaseId value="MC-103"/>
<group value="Catalog"/>
<group value="cloud"/>
<skip>
<issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
</skip>
</annotations>
<before>
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
<severity value="BLOCKER"/>
<testCaseId value="MC-189"/>
<group value="Catalog"/>
<skip>
<issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
</skip>
</annotations>

<before>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<testCaseId value="MC-101"/>
<group value="ConfigurableProduct"/>
<group value="cloud"/>
<skip>
<issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
</skip>
</annotations>

<before>
Expand Down
14 changes: 14 additions & 0 deletions app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -528,4 +528,18 @@
<data key="default_shipping">Yes</data>
<requiredEntity type="region">RegionCA</requiredEntity>
</entity>
<entity name="US_Address_California_Madison">
<data key="firstname">John</data>
<data key="lastname">Doe</data>
<data key="company">Magento</data>
<array key="street">
<item>4145 Madison Ave</item>
</array>
<data key="city">Culver City</data>
<data key="country_id">US</data>
<data key="country">United States</data>
<data key="state">California</data>
<data key="postcode">90232</data>
<data key="telephone">555-55-555-55</data>
</entity>
</entities>
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<!-- Verify country Belgium can be saved without state as state not required -->
<actionGroup ref="StoreFrontClickEditDefaultShippingAddressActionGroup" stepKey="clickOnDefaultShippingAddress"/>
<selectOption selector="{{StorefrontCustomerAddressFormSection.country}}" userInput="Belgium" stepKey="selectCountry"/>
<waitForAjaxLoad stepKey="waitForCountryDataToApply" />
<selectOption selector="{{StorefrontCustomerAddressFormSection.state}}" userInput="Please select a region, state or province." stepKey="selectState"/>
<actionGroup ref="AdminSaveCustomerAddressActionGroup" stepKey="saveAddress"/>
<see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="Belgium" stepKey="seeAssertCustomerDefaultShippingAddressCountry"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
<severity value="MAJOR"/>
<testCaseId value="MC-117"/>
<group value="Downloadable"/>
<skip>
<issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
</skip>
</annotations>
<before>
<magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<testCaseId value="MC-106"/>
<group value="GroupedProduct"/>
<group value="cloud"/>
<skip>
<issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
</skip>
</annotations>
<before>
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminConfigurePaypalPaylaterEnableActionGroup">
<annotations>
<description>Enable Paypal Paylater Solution For Paypal Express Checkout</description>
</annotations>
<arguments>
<argument name="countryCode" type="string" defaultValue="us"/>
</arguments>
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
<waitForElementClickable selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="waitForConfigureButtonClickable"/>
<click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="configureButtonClicked"/>
<selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLater(countryCode)}}" userInput="Yes" stepKey="enablePaylaterExp"/>
<waitForPageLoad stepKey="waitForAdvisePageLoad"/>
<click selector="{{PayPalExpressCheckoutConfigSection.payLaterConfigDropDown(countryCode)}}" stepKey="advertisePaylater"/>
<waitForPageLoad stepKey="waitForAdvisePaylaterDropdown"/>
<selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLaterIn(countryCode)}}" userInput="Yes" stepKey="enablePaypalLater"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminDisablePayPalPayFlowLinkActionGroup">
<annotations>
<description>Goes to the 'Configuration' page for 'Payment Methods'. Disables PayPal payflow link solution. Clicks on Save.</description>
</annotations>
<arguments>
<argument name="countryCode" type="string" defaultValue="us"/>
</arguments>
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
<waitForPageLoad stepKey="waitForPageLoad1"/>
<scrollTo selector="{{AdminPayPalPayFlowLinkConfigSection.paymentGateway(countryCode)}}" stepKey="scrollToConfigure"/>
<waitForElementVisible selector="{{AdminPayPalPayFlowLinkConfigSection.configureBtn(countryCode)}}" stepKey="waitForPayPalPayFlowPaymentConfigureBtn"/>
<conditionalClick selector ="{{AdminPayPalPayFlowLinkConfigSection.configureBtn(countryCode)}}" dependentSelector="{{AdminPayPalPayFlowLinkConfigSection.configureBtn(countryCode)}}" visible="true" stepKey="clickPayPalPayFlowPaymentConfigureBtn"/>
<waitForElementClickable selector ="{{AdminPayPalPayFlowLinkConfigSection.enableSolution(countryCode)}}" stepKey="waitForSolutionFieldToBeClickable"/>
<selectOption selector ="{{AdminPayPalPayFlowLinkConfigSection.enableSolution(countryCode)}}" userInput="No" stepKey="disableSolution"/>
<waitForElementClickable selector ="{{AdminConfigSection.saveButton}}" stepKey="waitForSaveConfigToBeVisible"/>
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
<waitForPageLoad stepKey="waitForSaving"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminEnablePayPalExpressCheckoutPayLaterActionGroup">
<annotations>
<description>Goes to the 'Configuration' page for 'Payment Methods'. Enable pay later option.</description>
</annotations>
<arguments>
<argument name="countryCode" type="string" defaultValue="us"/>
</arguments>
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
<waitForPageLoad stepKey="waitForPageLoad1"/>
<click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/>
<selectOption selector="{{PayPalExpressCheckoutConfigSection.enablePayLater(countryCode)}}" userInput="Yes" stepKey="enablePayLater"/>
<waitForText selector="{{PayPalExpressCheckoutConfigSection.verifyPaylaterText(countryCode)}}" userInput="Advertise PayPal Pay Later" stepKey="verifyAdvertisePayPalPayLaterText"/>
<click selector="{{PayPalExpressCheckoutConfigSection.payLaterConfigDropDown(countryCode)}}" stepKey="clickPayLaterConfiguration" />
<selectOption selector="{{PayPalExpressCheckoutConfigSection.enablePayLaterIn(countryCode)}}" userInput="Yes" stepKey="enablePayLaterIn"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminEnablePayPalPayFlowLinkActionGroup">
<annotations>
<description>Goes to the 'Configuration' page for 'Payment Methods'. Fills in the provided Sample PayPal Payflow link credentials and other details. Clicks on Save.</description>
</annotations>
<arguments>
<argument name="credentials" defaultValue="SamplePaypalPaymentsFlowLinkConfig"/>
<argument name="countryCode" type="string" defaultValue="us"/>
</arguments>
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
<waitForPageLoad stepKey="waitForConfigPageLoad"/>
<conditionalClick selector="{{OtherPayPalPaymentsConfigSection.expandTab1(countryCode)}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTab(countryCode)}}" visible="false" stepKey="clickOtherPayPalPaymentsSection"/>
<conditionalClick selector ="{{OtherPayPalPaymentsConfigSection.expandTabNew(countryCode)}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTabNew(countryCode)}}" visible="false" stepKey="expandPaypalPaymentGatewaysConfigButton"/>
<scrollTo selector="{{AdminPayPalPayFlowLinkConfigSection.paymentGateway(countryCode)}}" stepKey="scrollToConfigure"/>
<conditionalClick selector ="{{AdminPayPalPayFlowLinkConfigSection.configureBtn(countryCode)}}" dependentSelector="{{AdminPayPalPayFlowLinkConfigSection.configureBtn(countryCode)}}" visible="true" stepKey="clickPayPalPayflowPaymentConfigureBtn"/>
<waitForElementVisible selector ="{{AdminPayPalPayFlowLinkConfigSection.partner(countryCode)}}" stepKey="waitForPartnerFieldToBeVisible"/>
<fillField selector ="{{AdminPayPalPayFlowLinkConfigSection.partner(countryCode)}}" userInput="{{credentials.paypal_paymentsflowlink_partner}}" stepKey="inputPartner"/>
<waitForElementVisible selector ="{{AdminPayPalPayFlowLinkConfigSection.user(countryCode)}}" stepKey="waitForUserFieldToBeVisible"/>
<fillField selector ="{{AdminPayPalPayFlowLinkConfigSection.user(countryCode)}}" userInput="{{credentials.paypal_paymentsflowlink_user}}" stepKey="inputUser"/>
<waitForElementVisible selector ="{{AdminPayPalPayFlowLinkConfigSection.vendor(countryCode)}}" stepKey="waitForvendorFieldToBeVisible"/>
<fillField selector ="{{AdminPayPalPayFlowLinkConfigSection.vendor(countryCode)}}" userInput="{{credentials.paypal_paymentsflowlink_vendor}}" stepKey="inputVendor"/>
<waitForElementVisible selector ="{{AdminPayPalPayFlowLinkConfigSection.password(countryCode)}}" stepKey="waitForpasswordFieldToBeVisible"/>
<fillField selector ="{{AdminPayPalPayFlowLinkConfigSection.password(countryCode)}}" userInput="{{credentials.paypal_paymentsflowlink_password}}" stepKey="inputPassword"/>
<waitForElementClickable selector ="{{AdminPayPalPayFlowLinkConfigSection.testMode(countryCode)}}" stepKey="waitFortestModeFieldToBeClickable"/>
<selectOption selector="{{AdminPayPalPayFlowLinkConfigSection.testMode(countryCode)}}" userInput="Yes" stepKey="enableTestMode"/>
<waitForElementClickable selector ="{{AdminPayPalPayFlowLinkConfigSection.enableSolution(countryCode)}}" stepKey="waitForSolutionFieldToBeClickable"/>
<selectOption selector ="{{AdminPayPalPayFlowLinkConfigSection.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableSolution"/>
<waitForElementClickable selector ="{{AdminConfigSection.saveButton}}" stepKey="waitForSaveConfigToBeVisible"/>
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
<waitForPageLoad stepKey="waitForSaving"/>
<waitForText selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminEnablePaypalStandardPaylaterActionGroup">
<annotations>
<description>Enable Paypal Paylater Solution For Paypal Standard</description>
</annotations>
<arguments>
<argument name="countryCode" type="string" defaultValue="us"/>
</arguments>
<click selector="{{AdminPaypalStandardConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/>
<selectOption selector="{{AdminPaypalStandardConfigSection.enablePaylaterExperience(countryCode)}}" userInput="Yes" stepKey="EnablePaylaterExperience"/>
<waitForPageLoad stepKey="waitForAdvisepaylaterdropdown"/>
<waitForElementClickable selector="{{AdminPaypalStandardConfigSection.advisePaylater(countryCode)}}" stepKey="waitForAdvisepaylaterClickable"/>
<click selector="{{AdminPaypalStandardConfigSection.advisePaylater(countryCode)}}" stepKey="clickAdvisePaylater"/>
<selectOption selector="{{AdminPaypalStandardConfigSection.enablePaypalPaylater(countryCode)}}" userInput="Yes" stepKey="EnablePaypallater"/>
<waitForElementClickable selector="{{AdminPaypalStandardConfigSection.expandCategoryPage(countryCode)}}" stepKey="waitForcategorypageClickable"/>
<click selector="{{AdminPaypalStandardConfigSection.expandCategoryPage(countryCode)}}" stepKey="clickCategoryPage"/>
<selectOption selector ="{{AdminPaypalStandardConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCategory"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminPayPalStandardEnableActionGroup">
<annotations>
<description>Goes to the 'Configuration' page for 'Payment Methods'. Fills in the provided Sample PayPal credentials and other details. Clicks on Save.</description>
</annotations>
<arguments>
<argument name="credentials" defaultValue="SamplePaypalExpressConfig2"/>
<argument name="countryCode" type="string" defaultValue="us"/>
</arguments>
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
<waitForPageLoad stepKey="waitForConfigPageLoad"/>
<waitForElementVisible selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="waitForOtherPayPalPaymentsSection"/>
<conditionalClick selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTab(countryCode)}}" visible="false" stepKey="expandOtherPaypalConfigButton"/>
<scrollTo selector="{{AdminPaypalStandardConfigSection.configureBtn(countryCode)}}" x="0" y="-80" stepKey="scrollToConfigure"/>
<waitForElementClickable selector="{{AdminPaypalStandardConfigSection.configureBtn(countryCode)}}" stepKey="waitForPayPalStandardConfigureBtn" />
<click selector="{{AdminPaypalStandardConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalStandardConfigureBtn"/>
<waitForElementVisible selector="{{AdminPaypalStandardConfigSection.email(countryCode)}}" stepKey="waitForEmailTab"/>
<fillField selector ="{{AdminPaypalStandardConfigSection.email(countryCode)}}" userInput="{{credentials.paypal_express_email}}" stepKey="inputEmailAssociatedWithPayPalMerchantAccount"/>
<selectOption selector ="{{AdminPaypalStandardConfigSection.apiMethod(countryCode)}}" userInput="API Signature" stepKey="inputAPIAuthenticationMethods"/>
<fillField selector ="{{AdminPaypalStandardConfigSection.username(countryCode)}}" userInput="{{credentials.paypal_express_api_username}}" stepKey="inputAPIUsername"/>
<fillField selector ="{{AdminPaypalStandardConfigSection.password(countryCode)}}" userInput="{{credentials.paypal_express_api_password}}" stepKey="inputAPIPassword"/>
<fillField selector ="{{AdminPaypalStandardConfigSection.signature(countryCode)}}" userInput="{{credentials.paypal_express_api_signature}}" stepKey="inputAPISignature"/>
<selectOption selector ="{{AdminPaypalStandardConfigSection.sandboxMode(countryCode)}}" userInput="Yes" stepKey="enableSandboxMode"/>
<selectOption selector="{{AdminPaypalStandardConfigSection.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableSolution"/>
<waitForElementClickable selector="{{AdminConfigSection.saveButton}}" stepKey="waitForConfigureBtn" />
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
<waitForPageLoad stepKey="waitForPageLoad2"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminSavePaymentConfigActionGroup">
<annotations>
<description>Goes to the 'Configuration' page for 'Payment Methods'. Enable pay later option.</description>
</annotations>
<waitForElementClickable selector="{{AdminConfigSection.saveButton}}" stepKey="waitForSaveConfigbtn" />
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
<waitForPageLoad stepKey="waitForPageLoad"/>
</actionGroup>
</actionGroups>
Loading

0 comments on commit db41a69

Please sign in to comment.