From 97f2af80853df3960de5e35b7e1f518e901f34b2 Mon Sep 17 00:00:00 2001 From: mohit-adobe <84013331+mohit-adobe@users.noreply.github.com> Date: Tue, 7 May 2024 09:11:03 +0530 Subject: [PATCH 01/36] ACQE-6337: [MFTF PR TESTS] StorefrontCategoryRulesShouldApplyToComplexProductsTest Apply indexing after configuration change. MFTF test fix. --- ...StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml index 45a06bc59f10..35d33bbe8892 100644 --- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml +++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml @@ -113,6 +113,9 @@ + + + From ed58550aefaf68581eba2ba34ba91132f3a533fc Mon Sep 17 00:00:00 2001 From: syed sharuk Date: Tue, 7 May 2024 16:22:23 +0530 Subject: [PATCH 02/36] ACQE-5771 : Paypal payflow link configuration with valid credentials created testcase for payflow link payment --- .../Customer/Test/Mftf/Data/AddressData.xml | 14 ++++ ...minDisablePayPalPayFlowLinkActionGroup.xml | 29 +++++++ ...dminEnablePayPalPayFlowLinkActionGroup.xml | 42 ++++++++++ ...ontOrderDetailsOnPayPalPageActionGroup.xml | 29 +++++++ ...pressCheckoutPayFlowEditionActionGroup.xml | 28 +++++++ ...pressCheckoutPayFlowEditionActionGroup.xml | 21 +++++ .../Paypal/Test/Mftf/Data/PaypalData.xml | 7 ++ .../AdminPayPalPayFlowLinkConfigSection.xml | 20 +++++ .../OtherPayPalPaymentsConfigSection.xml | 3 + .../CheckoutPaymentSection.xml | 2 + .../PayPalPaymentSection.xml | 5 ++ ...uestCheckoutUsingPaypalPayFlowLinkTest.xml | 83 +++++++++++++++++++ 12 files changed, 283 insertions(+) create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminDisablePayPalPayFlowLinkActionGroup.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalPayFlowLinkActionGroup.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontOrderDetailsOnPayPalPageActionGroup.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalExpressCheckoutPayFlowEditionActionGroup.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontSelectPayPalExpressCheckoutPayFlowEditionActionGroup.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/Section/AdminPayPalPayFlowLinkConfigSection.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/Test/StorefrontGuestCheckoutUsingPaypalPayFlowLinkTest.xml diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml index 4e169c086336..603188ecc109 100644 --- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml +++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml @@ -528,4 +528,18 @@ Yes RegionCA + + John + Doe + Magento + + 4145 Madison Ave + + Culver City + US + United States + California + 90232 + 555-55-555-55 + diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminDisablePayPalPayFlowLinkActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminDisablePayPalPayFlowLinkActionGroup.xml new file mode 100644 index 000000000000..72dc207575d9 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminDisablePayPalPayFlowLinkActionGroup.xml @@ -0,0 +1,29 @@ + + + + + + + Goes to the 'Configuration' page for 'Payment Methods'. Disables PayPal payflow link solution. Clicks on Save. + + + + + + + + + + + + + + + + diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalPayFlowLinkActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalPayFlowLinkActionGroup.xml new file mode 100644 index 000000000000..d7cc3ad4600f --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalPayFlowLinkActionGroup.xml @@ -0,0 +1,42 @@ + + + + + + + Goes to the 'Configuration' page for 'Payment Methods'. Fills in the provided Sample PayPal Payflow link credentials and other details. Clicks on Save. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontOrderDetailsOnPayPalPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontOrderDetailsOnPayPalPageActionGroup.xml new file mode 100644 index 000000000000..a89560e3bbc6 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontOrderDetailsOnPayPalPageActionGroup.xml @@ -0,0 +1,29 @@ + + + + + + On PayPal page asserts order amount and shipping details . + + + + + + + + + + + + + + + + + diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalExpressCheckoutPayFlowEditionActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalExpressCheckoutPayFlowEditionActionGroup.xml new file mode 100644 index 000000000000..e27980027c54 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalExpressCheckoutPayFlowEditionActionGroup.xml @@ -0,0 +1,28 @@ + + + + + + On Storefront Login To PayPal Express Checkout Payflow Edition . + + + + + + + + + + + + + + + + diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontSelectPayPalExpressCheckoutPayFlowEditionActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontSelectPayPalExpressCheckoutPayFlowEditionActionGroup.xml new file mode 100644 index 000000000000..adef4d68b673 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontSelectPayPalExpressCheckoutPayFlowEditionActionGroup.xml @@ -0,0 +1,21 @@ + + + + + + Select PayPal Express Checkout PayFlow Edition On Payments page. + + + + + + + + + diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml index 4e88bbe73e2e..3a7d034df686 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml @@ -229,4 +229,11 @@ MksGLTest Abcd@123 + + us_m2_biz@ebay.com + PayPal + mpilink + mpilink + 1234_1234L! + diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/AdminPayPalPayFlowLinkConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/AdminPayPalPayFlowLinkConfigSection.xml new file mode 100644 index 000000000000..68e9811cf8e3 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/Section/AdminPayPalPayFlowLinkConfigSection.xml @@ -0,0 +1,20 @@ + + + +
+ + + + + + + + +
+ diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection/OtherPayPalPaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection/OtherPayPalPaymentsConfigSection.xml index bef5949162f1..2d606a630bdd 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection/OtherPayPalPaymentsConfigSection.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection/OtherPayPalPaymentsConfigSection.xml @@ -10,5 +10,8 @@
+ + +
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/CheckoutPaymentSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/CheckoutPaymentSection.xml index 2156add4f01a..7ae1e2096b73 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/CheckoutPaymentSection.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/CheckoutPaymentSection.xml @@ -13,5 +13,7 @@ + + diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml index 4eaa59e36991..d96e64a32db8 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml @@ -26,5 +26,10 @@ + + + + + diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontGuestCheckoutUsingPaypalPayFlowLinkTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontGuestCheckoutUsingPaypalPayFlowLinkTest.xml new file mode 100644 index 000000000000..90dbe49bf0ce --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontGuestCheckoutUsingPaypalPayFlowLinkTest.xml @@ -0,0 +1,83 @@ + + + + + + + + + <description value="As a customer I want to be able to buy goods using PayPal payflow link with flat rate Shipping"/> + <severity value="CRITICAL"/> + <testCaseId value="AC-6151"/> + <group value="3rd_party_integration"/> + <group value="pr_exclude"/> + </annotations> + <before> + <actionGroup ref="AdminLoginActionGroup" stepKey="login"/> + <!-- Simple product is created --> + <createData entity="simpleProductWithoutCategory" stepKey="createProduct"> + <field key="price">10.00</field> + </createData> + <actionGroup ref="AdminEnablePayPalPayFlowLinkActionGroup" stepKey="ConfigPayPalPayFlowLink"> + <argument name="credentials" value="SamplePaypalPaymentsFlowLinkConfig"/> + </actionGroup> + <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex"> + <argument name="indices" value=""/> + </actionGroup> + <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache"> + <argument name="tags" value="config full_page"/> + </actionGroup> + </before> + <after> + <deleteData createDataKey="createProduct" stepKey="deleteProduct"/> + <actionGroup ref="AdminDisablePayPalPayFlowLinkActionGroup" stepKey="disablePayPalPayFlow"/> + <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> + </after> + <!-- Go to Storefront as Guest and add simple product to cart --> + <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage"> + <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/> + </actionGroup> + <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart"> + <argument name="product" value="$$createProduct$$"/> + <argument name="productCount" value="1"/> + </actionGroup> + <!-- Proceed to Checkout from mini shopping cart --> + <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckout"/> + <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping"> + <argument name="shippingMethod" value="Flat Rate"/> + <argument name="customerVar" value="Simple_US_Customer_CA"/> + <argument name="customerAddressVar" value="US_Address_California_Madison"/> + </actionGroup> + + <!-- Click on PayPal payment radio button --> + <actionGroup ref="StorefrontSelectPayPalExpressCheckoutPayFlowEditionActionGroup" stepKey="selectPaypalExpress"/> + <!-- Login to PayPal and verify order total on PayPal page--> + <actionGroup ref="StorefrontLoginToPayPalExpressCheckoutPayFlowEditionActionGroup" stepKey="loginToPayPal"/> + <actionGroup ref="AssertStorefrontOrderDetailsOnPayPalPageActionGroup" stepKey="assertOrderDetails"/> + + <scrollTo selector="{{PayPalPaymentSection.paypalSubmitBtn}}" stepKey="scrollToContinueBtn"/> + <waitForElementClickable selector="{{PayPalPaymentSection.paypalSubmitBtn}}" stepKey="waitForCompletePurchaseButtonToBeClickable"/> + <click selector="{{PayPalPaymentSection.paypalSubmitBtn}}" stepKey="clickCompleteButton"/> + + <waitForElementVisible selector="{{CheckoutSuccessMainSection.successTitle}}" stepKey="waitForLoadSuccessPageTitle"/> + <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/> + <!--Assert order in orders grid --> + <!-- Go to order page --> + <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openFirstOrderPage"> + <argument name="orderId" value="{$grabOrderNumber}"/> + </actionGroup> + <!-- Check status --> + <actionGroup ref="AdminOrderViewCheckStatusActionGroup" stepKey="seeAdminOrderStatus"> + <argument name="status" value="Processing"/> + </actionGroup> + <waitForText selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$15.00" stepKey="checkGrandTotal"/> + <actionGroup ref="AdminOpenOrderCommentsHistoryActionGroup" stepKey="clickOnCommentsHistory"/> + <waitForText selector="{{AdminOrderCommentsTabSection.orderComment}}" userInput="Authorized amount of $15.00." stepKey="seeOrderHistoryNotes"/> + </test> +</tests> From 9360ac87a288c05426ea222d7e909880c316521f Mon Sep 17 00:00:00 2001 From: pavan <pavan@BLR1-LMC-N71897.local> Date: Wed, 3 Apr 2024 17:37:17 +0530 Subject: [PATCH 03/36] ACQE-5689:Enable PayPal Pay Later Experience for all Merchant Locations Configure Paypal pay later --- ...yPalExpressCheckoutPayLaterActionGroup.xml | 26 +++++++++++ .../AdminSavePaymentConfigActionGroup.xml | 19 ++++++++ ...ertPaypalPayLaterComponentsActionGroup.xml | 24 +++++++++++ .../PayPalExpressCheckoutConfigSection.xml | 7 ++- ...rExperienceForAllMerchantLocationsTest.xml | 43 +++++++++++++++++++ .../Tax/Test/Mftf/Data/TaxRuleData.xml | 2 +- 6 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalExpressCheckoutPayLaterActionGroup.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminSavePaymentConfigActionGroup.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertPaypalPayLaterComponentsActionGroup.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/Test/PayPalPayLaterExperienceForAllMerchantLocationsTest.xml diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalExpressCheckoutPayLaterActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalExpressCheckoutPayLaterActionGroup.xml new file mode 100644 index 000000000000..eac0639d9237 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePayPalExpressCheckoutPayLaterActionGroup.xml @@ -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> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminSavePaymentConfigActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminSavePaymentConfigActionGroup.xml new file mode 100644 index 000000000000..cfea4bb92fa1 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminSavePaymentConfigActionGroup.xml @@ -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> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertPaypalPayLaterComponentsActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertPaypalPayLaterComponentsActionGroup.xml new file mode 100644 index 000000000000..ee2705d8621d --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertPaypalPayLaterComponentsActionGroup.xml @@ -0,0 +1,24 @@ +<?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="AssertPaypalPayLaterComponentsActionGroup"> + <annotations> + <description>Verify paylater components after enabling paypal paylater </description> + </annotations> + <arguments> + <argument name="countryCode" type="string" defaultValue="us"/> + </arguments> + <waitForText selector="{{PayPalExpressCheckoutConfigSection.payLaterHomePage(countryCode)}}" userInput="Home Page" stepKey="verifyHomePageIsPresentUnderPayLater"/> + <waitForText selector="{{PayPalExpressCheckoutConfigSection.payLaterCatalogPageConfigDropDown(countryCode)}}" userInput="Catalog Product Page" stepKey="verifyCatalogProductPageUnderPayLater"/> + <waitForText selector="{{PayPalExpressCheckoutConfigSection.payLaterCheckoutCartPage(countryCode)}}" userInput="Checkout Cart Page" stepKey="verifyCheckoutCartPageUnderPayLater"/> + <waitForText selector="{{PayPalExpressCheckoutConfigSection.payLaterCheckoutPaymentCheck(countryCode)}}" userInput="Checkout Payment Step" stepKey="verifyCheckoutPaymentStepUnderPayLater"/> + <waitForText selector="{{PayPalExpressCheckoutConfigSection.payLaterCatalogCategoryPage(countryCode)}}" userInput="Catalog Category Page" stepKey="verifyCatalogCategoryPageUnderPayLater"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalExpressCheckoutConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalExpressCheckoutConfigSection.xml index 1891cc19d56b..2e1572d61d7f 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalExpressCheckoutConfigSection.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalExpressCheckoutConfigSection.xml @@ -6,7 +6,7 @@ */ --> <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> <section name="PayPalExpressCheckoutConfigSection"> <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}-head" parameterized="true"/> <element name="email" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_business_account" parameterized="true"/> @@ -22,6 +22,11 @@ <element name="payLaterConfigDropDown" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater-head" parameterized="true"/> <element name="enablePayLaterIn" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_paylater_enabled" parameterized="true" /> <element name="payLaterCatalogPageConfigDropDown" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_productpage-head" parameterized="true" /> + <element name="verifyPaylaterText" type="text" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater-head" parameterized="true"/> + <element name="payLaterHomePage" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_homepage-head" parameterized="true"/> + <element name="payLaterCheckoutCartPage" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_cartpage-head" parameterized="true"/> + <element name="payLaterCheckoutPaymentCheck" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_checkout_payment-head" parameterized="true"/> + <element name="payLaterCatalogCategoryPage" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_categorypage-head" parameterized="true"/> <element name="display" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_display" parameterized="true"/> <element name="position" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_position" parameterized="true"/> <element name="advancePaypalSettings" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced-head" parameterized="true" /> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/PayPalPayLaterExperienceForAllMerchantLocationsTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/PayPalPayLaterExperienceForAllMerchantLocationsTest.xml new file mode 100644 index 000000000000..dcda3f2a90ac --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/Test/PayPalPayLaterExperienceForAllMerchantLocationsTest.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> + <test name="PayPalPayLaterExperienceForAllMerchantLocationsTest"> + <annotations> + <features value="Paypal"/> + <stories value="Payment methods"/> + <title value="Enable PayPal Pay Later Experience for all Merchant Locations"/> + <description value="PayPal Pay later is configured on Admin site for all PayPal Payment method which is applicable for all Merchant Locations"/> + <severity value="CRITICAL"/> + <testCaseId value="AC-5689"/> + <group value="paypalExpress"/> + <group value="3rd_party_integration" /> +<!-- <group value="pr_exclude" />--> + </annotations> + <before> + <actionGroup ref="AdminLoginActionGroup" stepKey="login"/> + </before> + <after> + <magentoCLI command="config:set paypal/general/merchant_country US" stepKey="setMerchantCountryDefault"/> + <actionGroup ref="AdminPayPalExpressCheckoutPayLaterDisableActionGroup" stepKey="disablePayPalPayLater"/> + <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/> + </after> + <actionGroup ref="AdminEnablePayPalExpressCheckoutPayLaterActionGroup" stepKey="enablePayPalPayLater"/> + <actionGroup ref="AssertPaypalPayLaterComponentsActionGroup" stepKey="assertPaypalPAyLaterComponents"/> + <actionGroup ref="AdminSavePaymentConfigActionGroup" stepKey="savePaymentConfig"/> + <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="United Kingdom" stepKey="setMerchantCountry"/> + <actionGroup ref="AdminSavePaymentConfigActionGroup" stepKey="savePaymentConfiga"/> + <actionGroup ref="AdminEnablePayPalExpressCheckoutPayLaterActionGroup" stepKey="enablePayPalPayLater1"> + <argument name="countryCode" value="gb"/> + </actionGroup> + <actionGroup ref="AssertPaypalPayLaterComponentsActionGroup" stepKey="assertPaypalPAyLaterComponents1"> + <argument name="countryCode" value="gb"/> + </actionGroup> + </test> +</tests> diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml index aae0921b72fe..74352aad926a 100644 --- a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml +++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml @@ -134,7 +134,7 @@ <data key="calculate_subtotal">true</data> </entity> <entity name="TaxRule" type="taxRule"> - <data key="name" unique="suffix">TaxName</data> + <data key="name" unique="suffix">TaxNameA</data> </entity> <entity name="TaxRuleZeroRate" type="taxRule"> <data key="name" unique="suffix">TaxNameZeroRate</data> From 1f0559ef078115f83269b44293577f5a5ec7941c Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Thu, 9 May 2024 09:34:33 +0530 Subject: [PATCH 04/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page New Automation Test Added For AdminConfigForPaylaterProductPageTest --- ...PaypalPaylaterConfigurationActionGroup.xml | 29 ++++++++++++ .../PayPalProductPageConfigSection.xml | 20 ++++++++ .../AdminConfigForPaylaterProductPageTest.xml | 47 +++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaypalPaylaterConfigurationActionGroup.xml create mode 100755 app/code/Magento/Paypal/Test/Mftf/Section/PayPalProductPageConfigSection.xml create mode 100755 app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaypalPaylaterConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaypalPaylaterConfigurationActionGroup.xml new file mode 100644 index 000000000000..5b439704c9f3 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaypalPaylaterConfigurationActionGroup.xml @@ -0,0 +1,29 @@ +<!-- + /** + * 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="EnablePaypalPaylaterConfigurationActionGroup" > + <annotations> + <description>Enable Paypal Paylater Solution For Paypal Express Checkout</description> + </annotations> + <arguments> + <argument name="countryCode" type="string" defaultValue="us"/> + </arguments> + <waitForPageLoad stepKey="waitForAdvisePaylaterDropdown"/> + <selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLaterIn(countryCode)}}" userInput="Yes" stepKey="enablePaypalLater"/> + <waitForElementClickable selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="waitForCheckoutCartPageClickable"/> + <click selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="clickCheckoutCart"/> + <selectOption selector ="{{PayPalProductPageConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCartPage"/> + <!--Verify Default Option was Selected correctly--> + <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> + <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.styleLayout(countryCode)}}" userInput="Text" stepKey="seeSelectedStyleLayout"/> + <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.logoType(countryCode)}}" userInput="Primary" stepKey="seeSelectedLogoType"/> + <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.logoPosition(countryCode)}}" userInput="Left" stepKey="seeSelectedLogoPosition"/> + <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.textColor(countryCode)}}" userInput="Black" stepKey="seeSelectedTextColor"/> + <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.textSize(countryCode)}}" userInput="12px" stepKey="seeSelectedTextSize"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalProductPageConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalProductPageConfigSection.xml new file mode 100755 index 000000000000..3855eabc6da8 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalProductPageConfigSection.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> + <section name="PayPalProductPageConfigSection"> + <element name="expandCatalogProductPage" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_paylater_settings_paylater_productpage-head" parameterized="true"/> + <element name="display" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_display" parameterized="true"/> + <element name="position" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_position" parameterized="true"/> + <element name="styleLayout" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_stylelayout" parameterized="true" /> + <element name="logoType" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_logotype" parameterized="true" /> + <element name="logoPosition" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_logoposition" parameterized="true" /> + <element name="textColor" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_textcolor" parameterized="true" /> + <element name="textSize" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_textsize" parameterized="true" /> + </section> +</sections> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml new file mode 100755 index 000000000000..1a5d5c7995f5 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> + <test name="AdminConfigForPaylaterProductPageTest"> + <annotations> + <features value="PayPal"/> + <stories value="Payment methods"/> + <title value="Default configuration for Paypal Pay Later Message on Product Page"/> + <description value="Paypal Pay Later Message should display on Catalog Product Page configuration"/> + <severity value="CRITICAL"/> + <testCaseId value="AC-5602"/> + </annotations> + <before> + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> + <actionGroup ref="AdminPayPalExpressCheckoutEnableActionGroup" stepKey="ConfigPayPalExpress"> + <argument name="credentials" value="SamplePaypalExpressConfig2"/> + </actionGroup> + </before> + <after> + <magentoCLI command="config:set payment/paypal_express/active 0" stepKey="disablePayPalExpress"/> + <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/> + </after> + <!--Enable Paylater For Paypal Express Checkout --> + <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/> + <waitForElementClickable selector="{{PayPalExpressCheckoutConfigSection.configureBtn('us')}}" stepKey="waitForConfigureButtonClickable"/> + <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn('us')}}" stepKey="configureButtonClicked"/> + <selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLater('us')}}" userInput="Yes" stepKey="enablePaylaterExp"/> + <waitForPageLoad stepKey="waitForAdvisePageLoad"/> + <click selector="{{PayPalExpressCheckoutConfigSection.payLaterConfigDropDown('us')}}" stepKey="advertisePaylater"/> + <!--Enable Pay Later in Product Page and Check default values selected in dropdown --> + <actionGroup ref="EnablePaypalPaylaterConfigurationActionGroup" stepKey="enablePaypalPaylaterSolution"> + </actionGroup> + <!--Click on Save configure Button --> + <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveAdminConfiguration"> + </actionGroup> + <!-- Cleanup Paypal configurations --> + <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache"> + <argument name="tags" value="config full_page"/> + </actionGroup> + </test> +</tests> From 36dd1329d44cd7162bc1e8655bf81d05007dec98 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Sat, 11 May 2024 19:12:54 +0530 Subject: [PATCH 05/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page Correction OnAdding an ActionGroup For Code Reusuability --- ...aluesForAdminProductConfigActionGroup.xml} | 9 ++---- .../PaylaterProductPageConfigActionGroup.xml | 28 +++++++++++++++++++ .../AdminConfigForPaylaterProductPageTest.xml | 22 ++++----------- 3 files changed, 36 insertions(+), 23 deletions(-) rename app/code/Magento/Paypal/Test/Mftf/ActionGroup/{EnablePaypalPaylaterConfigurationActionGroup.xml => CheckValuesForAdminProductConfigActionGroup.xml} (63%) create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterProductPageConfigActionGroup.xml diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaypalPaylaterConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml similarity index 63% rename from app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaypalPaylaterConfigurationActionGroup.xml rename to app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml index 5b439704c9f3..807a7588cd04 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaypalPaylaterConfigurationActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml @@ -6,18 +6,13 @@ --> <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - <actionGroup name="EnablePaypalPaylaterConfigurationActionGroup" > + <actionGroup name="CheckValuesForAdminProductConfigActionGroup"> <annotations> - <description>Enable Paypal Paylater Solution For Paypal Express Checkout</description> + <description>Check the default Dropdown Values Available in Admin Cart Page.</description> </annotations> <arguments> <argument name="countryCode" type="string" defaultValue="us"/> </arguments> - <waitForPageLoad stepKey="waitForAdvisePaylaterDropdown"/> - <selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLaterIn(countryCode)}}" userInput="Yes" stepKey="enablePaypalLater"/> - <waitForElementClickable selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="waitForCheckoutCartPageClickable"/> - <click selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="clickCheckoutCart"/> - <selectOption selector ="{{PayPalProductPageConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCartPage"/> <!--Verify Default Option was Selected correctly--> <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.styleLayout(countryCode)}}" userInput="Text" stepKey="seeSelectedStyleLayout"/> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterProductPageConfigActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterProductPageConfigActionGroup.xml new file mode 100644 index 000000000000..4ff9fca9aa75 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterProductPageConfigActionGroup.xml @@ -0,0 +1,28 @@ +<!-- + /** + * 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="PaylaterProductPageConfigActionGroup" > + <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('us')}}" stepKey="waitForConfigureButtonClickable"/> + <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn('us')}}" stepKey="configureButtonClicked"/> + <selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLater('us')}}" userInput="Yes" stepKey="enablePaylaterExp"/> + <waitForPageLoad stepKey="waitForAdvisePageLoad"/> + <click selector="{{PayPalExpressCheckoutConfigSection.payLaterConfigDropDown('us')}}" stepKey="advertisePaylater"/> + <waitForPageLoad stepKey="waitForAdvisePaylaterDropdown"/> + <selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLaterIn(countryCode)}}" userInput="Yes" stepKey="enablePaypalLater"/> + <waitForElementClickable selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="waitForCheckoutCartPageClickable"/> + <click selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="clickCheckoutCart"/> + <selectOption selector ="{{PayPalProductPageConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCartPage"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml index 1a5d5c7995f5..b7553f6a9f4d 100755 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml @@ -24,24 +24,14 @@ </before> <after> <magentoCLI command="config:set payment/paypal_express/active 0" stepKey="disablePayPalExpress"/> + <magentoCLI command="cache:flush" stepKey="cleanCache"/> <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/> </after> - <!--Enable Paylater For Paypal Express Checkout --> - <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/> - <waitForElementClickable selector="{{PayPalExpressCheckoutConfigSection.configureBtn('us')}}" stepKey="waitForConfigureButtonClickable"/> - <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn('us')}}" stepKey="configureButtonClicked"/> - <selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLater('us')}}" userInput="Yes" stepKey="enablePaylaterExp"/> - <waitForPageLoad stepKey="waitForAdvisePageLoad"/> - <click selector="{{PayPalExpressCheckoutConfigSection.payLaterConfigDropDown('us')}}" stepKey="advertisePaylater"/> - <!--Enable Pay Later in Product Page and Check default values selected in dropdown --> - <actionGroup ref="EnablePaypalPaylaterConfigurationActionGroup" stepKey="enablePaypalPaylaterSolution"> - </actionGroup> + <!--Enable Pay Later in Admin Product Page --> + <actionGroup ref="PaylaterProductPageConfigActionGroup" stepKey="enablePaypalPaylaterSolution"/> + <!--Check default values selected in dropdown --> + <actionGroup ref="CheckValuesForAdminProductConfigActionGroup" stepKey="verifyDefaultValues"/> <!--Click on Save configure Button --> - <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveAdminConfiguration"> - </actionGroup> - <!-- Cleanup Paypal configurations --> - <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache"> - <argument name="tags" value="config full_page"/> - </actionGroup> + <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveAdminConfiguration"/> </test> </tests> From 3bea32508ebc2be5a46ef8d15d1f1cbb662ad92a Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Mon, 13 May 2024 17:05:48 +0530 Subject: [PATCH 06/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page Correction OnPaylaterProductPageActionGroup --- .../CheckValuesForAdminProductConfigActionGroup.xml | 3 +++ .../PaylaterProductPageConfigActionGroup.xml | 13 +++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml index 807a7588cd04..a03907a1af1b 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml @@ -13,6 +13,9 @@ <arguments> <argument name="countryCode" type="string" defaultValue="us"/> </arguments> + <waitForElementClickable selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="waitForCheckoutCartPageClickable"/> + <click selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="clickCheckoutCart"/> + <selectOption selector ="{{PayPalProductPageConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCartPage"/> <!--Verify Default Option was Selected correctly--> <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.styleLayout(countryCode)}}" userInput="Text" stepKey="seeSelectedStyleLayout"/> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterProductPageConfigActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterProductPageConfigActionGroup.xml index 4ff9fca9aa75..b5357f28e1be 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterProductPageConfigActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterProductPageConfigActionGroup.xml @@ -6,7 +6,7 @@ --> <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - <actionGroup name="PaylaterProductPageConfigActionGroup" > + <actionGroup name="PaylaterProductPageConfigActionGroup"> <annotations> <description>Enable Paypal Paylater Solution For Paypal Express Checkout</description> </annotations> @@ -14,15 +14,12 @@ <argument name="countryCode" type="string" defaultValue="us"/> </arguments> <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/> - <waitForElementClickable selector="{{PayPalExpressCheckoutConfigSection.configureBtn('us')}}" stepKey="waitForConfigureButtonClickable"/> - <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn('us')}}" stepKey="configureButtonClicked"/> - <selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLater('us')}}" userInput="Yes" stepKey="enablePaylaterExp"/> + <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('us')}}" stepKey="advertisePaylater"/> + <click selector="{{PayPalExpressCheckoutConfigSection.payLaterConfigDropDown(countryCode)}}" stepKey="advertisePaylater"/> <waitForPageLoad stepKey="waitForAdvisePaylaterDropdown"/> <selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLaterIn(countryCode)}}" userInput="Yes" stepKey="enablePaypalLater"/> - <waitForElementClickable selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="waitForCheckoutCartPageClickable"/> - <click selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="clickCheckoutCart"/> - <selectOption selector ="{{PayPalProductPageConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCartPage"/> </actionGroup> </actionGroups> From b61b8e70ab486ac98b3f03d2851d38c606cf1295 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Tue, 14 May 2024 18:31:40 +0530 Subject: [PATCH 07/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page Renaming PaylaterConfigurationActionGroup --- ...nfigActionGroup.xml => PaylaterConfigurationActionGroup.xml} | 2 +- .../Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename app/code/Magento/Paypal/Test/Mftf/ActionGroup/{PaylaterProductPageConfigActionGroup.xml => PaylaterConfigurationActionGroup.xml} (96%) diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterProductPageConfigActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterConfigurationActionGroup.xml similarity index 96% rename from app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterProductPageConfigActionGroup.xml rename to app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterConfigurationActionGroup.xml index b5357f28e1be..8037a13a6741 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterProductPageConfigActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterConfigurationActionGroup.xml @@ -6,7 +6,7 @@ --> <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - <actionGroup name="PaylaterProductPageConfigActionGroup"> + <actionGroup name="PaylaterConfigurationActionGroup"> <annotations> <description>Enable Paypal Paylater Solution For Paypal Express Checkout</description> </annotations> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml index b7553f6a9f4d..848a8cde6f54 100755 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml @@ -28,7 +28,7 @@ <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/> </after> <!--Enable Pay Later in Admin Product Page --> - <actionGroup ref="PaylaterProductPageConfigActionGroup" stepKey="enablePaypalPaylaterSolution"/> + <actionGroup ref="PaylaterConfigurationActionGroup" stepKey="enablePaypalPaylaterSolution"/> <!--Check default values selected in dropdown --> <actionGroup ref="CheckValuesForAdminProductConfigActionGroup" stepKey="verifyDefaultValues"/> <!--Click on Save configure Button --> From 8eabd7b7812ca26b5ec679f3ee9f103b2d8c88f6 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Tue, 14 May 2024 23:01:26 +0530 Subject: [PATCH 08/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page Correction On stepKey For AdminConfigForPaylaterProductPageTest --- .../Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml index 848a8cde6f54..0153d0eabfcd 100755 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml @@ -30,7 +30,7 @@ <!--Enable Pay Later in Admin Product Page --> <actionGroup ref="PaylaterConfigurationActionGroup" stepKey="enablePaypalPaylaterSolution"/> <!--Check default values selected in dropdown --> - <actionGroup ref="CheckValuesForAdminProductConfigActionGroup" stepKey="verifyDefaultValues"/> + <actionGroup ref="CheckValuesForAdminProductConfigActionGroup" stepKey="verifyDefaultValuesFromDropDown"/> <!--Click on Save configure Button --> <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveAdminConfiguration"/> </test> From 7909130117fc2ee742de688ee6d978b9b8418f1f Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Wed, 15 May 2024 05:09:28 +0530 Subject: [PATCH 09/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page Correction On stepKey For CheckValuesForAdminProductConfigActionGroup --- .../ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml index a03907a1af1b..8ef83146c7ff 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml @@ -16,6 +16,7 @@ <waitForElementClickable selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="waitForCheckoutCartPageClickable"/> <click selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="clickCheckoutCart"/> <selectOption selector ="{{PayPalProductPageConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCartPage"/> + <selectOption selector="{{PayPalProductPageConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="selectDefaultPosition"/> <!--Verify Default Option was Selected correctly--> <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.styleLayout(countryCode)}}" userInput="Text" stepKey="seeSelectedStyleLayout"/> From 1fd41f146a71bf6b60b14e9a27c453bfa46a5539 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Fri, 17 May 2024 09:48:20 +0530 Subject: [PATCH 10/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page Adding group vale as pr_exclude --- ...tForManageStockDownloadableProductTest.xml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckAddtoCartForManageStockDownloadableProductTest.xml diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckAddtoCartForManageStockDownloadableProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckAddtoCartForManageStockDownloadableProductTest.xml new file mode 100644 index 000000000000..9833b378b71e --- /dev/null +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckAddtoCartForManageStockDownloadableProductTest.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> + <test name="AdminCheckAddtoCartForManageStockDownloadableProductTest"> + <annotations> + <stories value="Manage Stock For Grouped Product"/> + <title value="Update Downloadable Product with (Out of Stock) Visible in Category Only"/> + <description value="Test log in to Update Downloadable Product and Update Downloadable Product with Regular Price (In Stock) Visible in Category Only"/> + <testCaseId value="AC-4167"/> + <severity value="CRITICAL"/> + <group value="catalog"/> + </annotations> + <before> + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> + + + <createData entity="SimpleSubCategory" stepKey="createSimpleCategory"/> + + <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct"> + <requiredEntity createDataKey="createSimpleCategory"/> + </createData> + + <createData entity="ApiDownloadableLink" stepKey="addFirstDownloadableLink"> + <requiredEntity createDataKey="createDownloadableProduct"/> + </createData> + </before> + <after> + + + + <!-- Set ManageStock to Yes--> + <magentoCLI command="config:set {{CatalogInventoryManageStockDisable.path}} 1" stepKey="manageStockEnable"/> + <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/> + </after> + <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToCatalogProduct"/> + <waitForPageLoad stepKey="waitForPageLoad2"/> + + + </test> +</tests> From 9a558817de517de1b7d012f25254bf52b6081cb5 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Fri, 17 May 2024 10:09:40 +0530 Subject: [PATCH 11/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page Adding group value as pr_exclude --- ...tForManageStockDownloadableProductTest.xml | 47 ------------------- .../AdminConfigForPaylaterProductPageTest.xml | 1 + 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckAddtoCartForManageStockDownloadableProductTest.xml diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckAddtoCartForManageStockDownloadableProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckAddtoCartForManageStockDownloadableProductTest.xml deleted file mode 100644 index 9833b378b71e..000000000000 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckAddtoCartForManageStockDownloadableProductTest.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ ---> - -<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> - <test name="AdminCheckAddtoCartForManageStockDownloadableProductTest"> - <annotations> - <stories value="Manage Stock For Grouped Product"/> - <title value="Update Downloadable Product with (Out of Stock) Visible in Category Only"/> - <description value="Test log in to Update Downloadable Product and Update Downloadable Product with Regular Price (In Stock) Visible in Category Only"/> - <testCaseId value="AC-4167"/> - <severity value="CRITICAL"/> - <group value="catalog"/> - </annotations> - <before> - <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> - - - <createData entity="SimpleSubCategory" stepKey="createSimpleCategory"/> - - <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct"> - <requiredEntity createDataKey="createSimpleCategory"/> - </createData> - - <createData entity="ApiDownloadableLink" stepKey="addFirstDownloadableLink"> - <requiredEntity createDataKey="createDownloadableProduct"/> - </createData> - </before> - <after> - - - - <!-- Set ManageStock to Yes--> - <magentoCLI command="config:set {{CatalogInventoryManageStockDisable.path}} 1" stepKey="manageStockEnable"/> - <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/> - </after> - <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToCatalogProduct"/> - <waitForPageLoad stepKey="waitForPageLoad2"/> - - - </test> -</tests> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml index 0153d0eabfcd..9df111e76639 100755 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml @@ -15,6 +15,7 @@ <description value="Paypal Pay Later Message should display on Catalog Product Page configuration"/> <severity value="CRITICAL"/> <testCaseId value="AC-5602"/> + <group value="pr_exclude"/> </annotations> <before> <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> From 910fd2d33eba7d21e4a6d8ee332060c11294b497 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Mon, 20 May 2024 07:05:14 +0530 Subject: [PATCH 12/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page Correction on ActionGroupNaming and Adding Group Value As 3rd_party_integration --- ...xml => AdminConfigurePaypalPaylaterEnableActionGroup.xml} | 2 +- ...nfigForDefaultValuesInPaylaterProductPageActionGroup.xml} | 2 +- .../Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) rename app/code/Magento/Paypal/Test/Mftf/ActionGroup/{PaylaterConfigurationActionGroup.xml => AdminConfigurePaypalPaylaterEnableActionGroup.xml} (95%) rename app/code/Magento/Paypal/Test/Mftf/ActionGroup/{CheckValuesForAdminProductConfigActionGroup.xml => AssertAdminCinfigForDefaultValuesInPaylaterProductPageActionGroup.xml} (95%) diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminConfigurePaypalPaylaterEnableActionGroup.xml similarity index 95% rename from app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterConfigurationActionGroup.xml rename to app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminConfigurePaypalPaylaterEnableActionGroup.xml index 8037a13a6741..91c47587c946 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PaylaterConfigurationActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminConfigurePaypalPaylaterEnableActionGroup.xml @@ -6,7 +6,7 @@ --> <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - <actionGroup name="PaylaterConfigurationActionGroup"> + <actionGroup name="AdminConfigurePaypalPaylaterEnableActionGroup"> <annotations> <description>Enable Paypal Paylater Solution For Paypal Express Checkout</description> </annotations> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminCinfigForDefaultValuesInPaylaterProductPageActionGroup.xml similarity index 95% rename from app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml rename to app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminCinfigForDefaultValuesInPaylaterProductPageActionGroup.xml index 8ef83146c7ff..091ef5961b3b 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/CheckValuesForAdminProductConfigActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminCinfigForDefaultValuesInPaylaterProductPageActionGroup.xml @@ -6,7 +6,7 @@ --> <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - <actionGroup name="CheckValuesForAdminProductConfigActionGroup"> + <actionGroup name="AssertAdminCinfigForDefaultValuesInPaylaterProductPageActionGroup"> <annotations> <description>Check the default Dropdown Values Available in Admin Cart Page.</description> </annotations> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml index 9df111e76639..55f166603e37 100755 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml @@ -15,6 +15,7 @@ <description value="Paypal Pay Later Message should display on Catalog Product Page configuration"/> <severity value="CRITICAL"/> <testCaseId value="AC-5602"/> + <group value="3rd_party_integration"/> <group value="pr_exclude"/> </annotations> <before> @@ -29,9 +30,9 @@ <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/> </after> <!--Enable Pay Later in Admin Product Page --> - <actionGroup ref="PaylaterConfigurationActionGroup" stepKey="enablePaypalPaylaterSolution"/> + <actionGroup ref="AdminConfigurePaypalPaylaterEnableActionGroup" stepKey="enablePaypalPaylaterSolution"/> <!--Check default values selected in dropdown --> - <actionGroup ref="CheckValuesForAdminProductConfigActionGroup" stepKey="verifyDefaultValuesFromDropDown"/> + <actionGroup ref="AssertAdminCinfigForDefaultValuesInPaylaterProductPageActionGroup" stepKey="verifyDefaultValuesFromDropDown"/> <!--Click on Save configure Button --> <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveAdminConfiguration"/> </test> From edbadca7e3b5a0f7738a89c6006c00a6069db23d Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Mon, 20 May 2024 07:38:37 +0530 Subject: [PATCH 13/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page Correction on ActionGroup Naming and Adding Group Value As 3rd_party_integration --- ...nConfigForDefaultValuesInPaylaterProductPageActionGroup.xml} | 2 +- .../Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename app/code/Magento/Paypal/Test/Mftf/ActionGroup/{AssertAdminCinfigForDefaultValuesInPaylaterProductPageActionGroup.xml => AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup.xml} (97%) diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminCinfigForDefaultValuesInPaylaterProductPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup.xml similarity index 97% rename from app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminCinfigForDefaultValuesInPaylaterProductPageActionGroup.xml rename to app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup.xml index 091ef5961b3b..5f3c5ae1099c 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminCinfigForDefaultValuesInPaylaterProductPageActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup.xml @@ -6,7 +6,7 @@ --> <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - <actionGroup name="AssertAdminCinfigForDefaultValuesInPaylaterProductPageActionGroup"> + <actionGroup name="AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup"> <annotations> <description>Check the default Dropdown Values Available in Admin Cart Page.</description> </annotations> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml index 55f166603e37..7798494abb49 100755 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml @@ -32,7 +32,7 @@ <!--Enable Pay Later in Admin Product Page --> <actionGroup ref="AdminConfigurePaypalPaylaterEnableActionGroup" stepKey="enablePaypalPaylaterSolution"/> <!--Check default values selected in dropdown --> - <actionGroup ref="AssertAdminCinfigForDefaultValuesInPaylaterProductPageActionGroup" stepKey="verifyDefaultValuesFromDropDown"/> + <actionGroup ref="AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup" stepKey="verifyDefaultValuesFromDropDown"/> <!--Click on Save configure Button --> <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveAdminConfiguration"/> </test> From d75d86d4317c8777f85b131ab4f8d4bea6329c61 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Mon, 20 May 2024 11:33:53 +0530 Subject: [PATCH 14/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page removing Group value as 3rd prty ontegration --- .../Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml index 7798494abb49..39378132e9f5 100755 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml @@ -15,7 +15,6 @@ <description value="Paypal Pay Later Message should display on Catalog Product Page configuration"/> <severity value="CRITICAL"/> <testCaseId value="AC-5602"/> - <group value="3rd_party_integration"/> <group value="pr_exclude"/> </annotations> <before> From cb25b43bb85a0587fabe13d4b326985672ba1745 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Mon, 20 May 2024 13:43:59 +0530 Subject: [PATCH 15/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page Renaming PayPalProductPageConfigSection to AdminProductPageConfigSection --- ...ValuesInPaylaterProductPageActionGroup.xml | 20 +++++++++---------- ...> AdminPaypalProductPageConfigSection.xml} | 2 +- .../AdminConfigForPaylaterProductPageTest.xml | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) rename app/code/Magento/Paypal/Test/Mftf/Section/{PayPalProductPageConfigSection.xml => AdminPaypalProductPageConfigSection.xml} (97%) mode change 100755 => 100644 diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup.xml index 5f3c5ae1099c..f968fc4379dd 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminConfigForDefaultValuesInPaylaterProductPageActionGroup.xml @@ -13,16 +13,16 @@ <arguments> <argument name="countryCode" type="string" defaultValue="us"/> </arguments> - <waitForElementClickable selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="waitForCheckoutCartPageClickable"/> - <click selector="{{PayPalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="clickCheckoutCart"/> - <selectOption selector ="{{PayPalProductPageConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCartPage"/> - <selectOption selector="{{PayPalProductPageConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="selectDefaultPosition"/> + <waitForElementClickable selector="{{AdminPaypalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="waitForCheckoutCartPageClickable"/> + <click selector="{{AdminPaypalProductPageConfigSection.expandCatalogProductPage(countryCode)}}" stepKey="clickCheckoutCart"/> + <selectOption selector ="{{AdminPaypalProductPageConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCartPage"/> + <selectOption selector="{{AdminPaypalProductPageConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="selectDefaultPosition"/> <!--Verify Default Option was Selected correctly--> - <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> - <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.styleLayout(countryCode)}}" userInput="Text" stepKey="seeSelectedStyleLayout"/> - <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.logoType(countryCode)}}" userInput="Primary" stepKey="seeSelectedLogoType"/> - <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.logoPosition(countryCode)}}" userInput="Left" stepKey="seeSelectedLogoPosition"/> - <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.textColor(countryCode)}}" userInput="Black" stepKey="seeSelectedTextColor"/> - <seeOptionIsSelected selector="{{PayPalProductPageConfigSection.textSize(countryCode)}}" userInput="12px" stepKey="seeSelectedTextSize"/> + <seeOptionIsSelected selector="{{AdminPaypalProductPageConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> + <seeOptionIsSelected selector="{{AdminPaypalProductPageConfigSection.styleLayout(countryCode)}}" userInput="Text" stepKey="seeSelectedStyleLayout"/> + <seeOptionIsSelected selector="{{AdminPaypalProductPageConfigSection.logoType(countryCode)}}" userInput="Primary" stepKey="seeSelectedLogoType"/> + <seeOptionIsSelected selector="{{AdminPaypalProductPageConfigSection.logoPosition(countryCode)}}" userInput="Left" stepKey="seeSelectedLogoPosition"/> + <seeOptionIsSelected selector="{{AdminPaypalProductPageConfigSection.textColor(countryCode)}}" userInput="Black" stepKey="seeSelectedTextColor"/> + <seeOptionIsSelected selector="{{AdminPaypalProductPageConfigSection.textSize(countryCode)}}" userInput="12px" stepKey="seeSelectedTextSize"/> </actionGroup> </actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalProductPageConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/AdminPaypalProductPageConfigSection.xml old mode 100755 new mode 100644 similarity index 97% rename from app/code/Magento/Paypal/Test/Mftf/Section/PayPalProductPageConfigSection.xml rename to app/code/Magento/Paypal/Test/Mftf/Section/AdminPaypalProductPageConfigSection.xml index 3855eabc6da8..cdec2e27874d --- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalProductPageConfigSection.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Section/AdminPaypalProductPageConfigSection.xml @@ -7,7 +7,7 @@ --> <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> - <section name="PayPalProductPageConfigSection"> + <section name="AdminPaypalProductPageConfigSection"> <element name="expandCatalogProductPage" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_paylater_settings_paylater_productpage-head" parameterized="true"/> <element name="display" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_display" parameterized="true"/> <element name="position" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_position" parameterized="true"/> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml index 39378132e9f5..38f50b91b624 100755 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml @@ -16,6 +16,7 @@ <severity value="CRITICAL"/> <testCaseId value="AC-5602"/> <group value="pr_exclude"/> + <group value="3rd_party_integration"/> </annotations> <before> <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> From 77f70864f42653893a8ac2ea5d6eedd549d7daaa Mon Sep 17 00:00:00 2001 From: manjusha729 <93243302+manjusha729@users.noreply.github.com> Date: Mon, 20 May 2024 15:18:08 +0530 Subject: [PATCH 16/36] ACQE-6594 | [MFTF PR TESTS] StorefrontVerifyMultipleProductRatingsOnCategoryPageTest Modified the selector to fix the test --- .../Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml index 39dd719ce10f..ff91a48d68eb 100644 --- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml +++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml @@ -10,7 +10,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> <section name="StorefrontPanelHeaderSection"> <element name="welcomeMessage" type="text" selector="header>.panel .greet.welcome" /> - <element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//li/a[contains(.,'Create an Account')]" timeout="30"/> + <element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//li/..[contains(.,'Create an Account')]" timeout="30"/> <element name="notYouLink" type="button" selector=".greet.welcome span a"/> <element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/> <element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-name"/> From 3efd545f8a90068efa6201c2fda8a937707861e8 Mon Sep 17 00:00:00 2001 From: manjusha729 <93243302+manjusha729@users.noreply.github.com> Date: Tue, 21 May 2024 11:08:27 +0530 Subject: [PATCH 17/36] ACQE-6594 | [MFTF PR TESTS] StorefrontVerifyMultipleProductRatingsOnCategoryPageTest Modified the selector to match the expected element --- .../Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml index ff91a48d68eb..e7426416bb60 100644 --- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml +++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml @@ -10,7 +10,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> <section name="StorefrontPanelHeaderSection"> <element name="welcomeMessage" type="text" selector="header>.panel .greet.welcome" /> - <element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//li/..[contains(.,'Create an Account')]" timeout="30"/> + <element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//ul[@class='header links']//li//a[contains(.,'Create an Account')]" timeout="60"/> <element name="notYouLink" type="button" selector=".greet.welcome span a"/> <element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/> <element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-name"/> From f81872c26faa9e6b746d9549fee13558d99abdd9 Mon Sep 17 00:00:00 2001 From: manjusha729 <93243302+manjusha729@users.noreply.github.com> Date: Tue, 21 May 2024 12:25:07 +0530 Subject: [PATCH 18/36] ACQE-6594 | [MFTF PR TESTS] StorefrontVerifyMultipleProductRatingsOnCategoryPageTest Test Fix --- .../Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml index e7426416bb60..93fa1186b230 100644 --- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml +++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml @@ -10,7 +10,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> <section name="StorefrontPanelHeaderSection"> <element name="welcomeMessage" type="text" selector="header>.panel .greet.welcome" /> - <element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//ul[@class='header links']//li//a[contains(.,'Create an Account')]" timeout="60"/> + <element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//..//..//a[contains(.,'Create an Account')]" timeout="60"/> <element name="notYouLink" type="button" selector=".greet.welcome span a"/> <element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/> <element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-name"/> From f600ec38e033d6509a9dc8ca1a23160e4e4dd7a8 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Wed, 22 May 2024 11:20:08 +0530 Subject: [PATCH 19/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page Correction on Removing group value as pr_exclude in AdminConfigForPaylaterProductPageTest --- .../Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml index 38f50b91b624..942d0175e4fa 100755 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml @@ -15,7 +15,6 @@ <description value="Paypal Pay Later Message should display on Catalog Product Page configuration"/> <severity value="CRITICAL"/> <testCaseId value="AC-5602"/> - <group value="pr_exclude"/> <group value="3rd_party_integration"/> </annotations> <before> From 0d99c07ab6cf08d83e443368363c013b3a6d0d16 Mon Sep 17 00:00:00 2001 From: manjusha729 <93243302+manjusha729@users.noreply.github.com> Date: Wed, 22 May 2024 14:06:07 +0530 Subject: [PATCH 20/36] ACQE-6594 | [MFTF PR TESTS] StorefrontVerifyMultipleProductRatingsOnCategoryPageTest Test Fix --- .../Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml index 93fa1186b230..16bbfa4cbb57 100644 --- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml +++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml @@ -10,7 +10,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> <section name="StorefrontPanelHeaderSection"> <element name="welcomeMessage" type="text" selector="header>.panel .greet.welcome" /> - <element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//..//..//a[contains(.,'Create an Account')]" timeout="60"/> + <element name="createAnAccountLink" type="select" selector="//a[contains(.,'Create an Account')]" timeout="60"/> <element name="notYouLink" type="button" selector=".greet.welcome span a"/> <element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/> <element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-name"/> From bccf85f89a4265a9711e4b01e9148326c363aab2 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Mon, 6 May 2024 06:33:38 +0530 Subject: [PATCH 21/36] ACQE-6496:Configuration for paypal pay later on Category Page --- .../AdminPayPalStandardDisableActionGroup.xml | 41 ++++++++++ .../AdminPayPalStandardEnableActionGroup.xml | 38 ++++++++++ ...nablePaylaterPaypalStandardActionGroup.xml | 28 +++++++ .../Paypal/Test/Mftf/Data/PaypalData.xml | 8 ++ .../Section/PayPalStandardConfigSection.xml | 33 +++++++++ .../Mftf/Suite/ConfigPayPalStandardSuite.xml | 30 ++++++++ .../Test/AdminConfigPaymentsStandardTest.xml | 74 +++++++++++++++++++ 7 files changed, 252 insertions(+) create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardDisableActionGroup.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/Suite/ConfigPayPalStandardSuite.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardDisableActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardDisableActionGroup.xml new file mode 100644 index 000000000000..b5f33cce0017 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardDisableActionGroup.xml @@ -0,0 +1,41 @@ +<?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="AdminPayPalStandardDisableActionGroup"> + <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="waitForPageLoad8"/> + <scrollTo selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" x="0" y="-80" stepKey="scrollToConfigure"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" stepKey="waitForPayPalStandardConfigureBtn" /> + <click selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalStandardConfigureBtn"/> + <selectOption selector="{{PayPalStandardConfigSection.enableSolution(countryCode)}}" userInput="No" stepKey="disableSolution"/> + <selectOption selector="{{PayPalStandardConfigSection.enablePaylaterExperience(countryCode)}}" userInput="Yes" stepKey="EnablePaylaterExperience"/> + <waitForPageLoad stepKey="waitForadvisepaylaterdropdown"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.advisepaylater(countryCode)}}" stepKey="waitForAdvisepaylaterClickable"/> + <click selector="{{PayPalStandardConfigSection.advisepaylater(countryCode)}}" stepKey="clickAdvisePaylater"/> + <selectOption selector="{{PayPalStandardConfigSection.enablePaypalPaylater(countryCode)}}" userInput="Yes" stepKey="EnablePaypallater"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.expandcategorypage(countryCode)}}" stepKey="waitForcategorypageClickable"/> + <click selector="{{PayPalStandardConfigSection.expandcategorypage(countryCode)}}" stepKey="clickCategoryPage"/> + <selectOption selector ="{{PayPalStandardConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCategoryPage"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.stylelayout(countryCode)}}" userInput="Flex" stepKey="seeSelectedStylelayout"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.Ratio(countryCode)}}" userInput="20x1" stepKey="seeSelectedRatio"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.color(countryCode)}}" userInput="Blue" stepKey="seeSelectedColor"/> + <waitForElementClickable selector="{{AdminConfigSection.saveButton}}" stepKey="waitForConfiguBtn" /> + <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfiguration"/> + <waitForPageLoad stepKey="waitForPageLoad82"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml new file mode 100644 index 000000000000..c20c3e48f323 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml @@ -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="waitForPageLoad1"/> + <waitForElementClickable selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="waitForExpandOtherPaypalConfigButton" /> + <click selector ="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="expandOtherPaypalConfigButton"/> + <scrollTo selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" x="0" y="-80" stepKey="scrollToConfigure"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" stepKey="waitForPayPalStandardConfigureBtn" /> + <click selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalStandardConfigureBtn"/> + <waitForElementVisible selector="{{PayPalStandardConfigSection.email(countryCode)}}" stepKey="waitForEmailTab"/> + <fillField selector ="{{PayPalStandardConfigSection.email(countryCode)}}" userInput="{{credentials.paypal_express_email}}" stepKey="inputEmailAssociatedWithPayPalMerchantAccount"/> + <selectOption selector ="{{PayPalStandardConfigSection.apiMethod(countryCode)}}" userInput="API Signature" stepKey="inputAPIAuthenticationMethods"/> + <fillField selector ="{{PayPalStandardConfigSection.username(countryCode)}}" userInput="{{credentials.paypal_express_api_username}}" stepKey="inputAPIUsername"/> + <fillField selector ="{{PayPalStandardConfigSection.password(countryCode)}}" userInput="{{credentials.paypal_express_api_password}}" stepKey="inputAPIPassword"/> + <fillField selector ="{{PayPalStandardConfigSection.signature(countryCode)}}" userInput="{{credentials.paypal_express_api_signature}}" stepKey="inputAPISignature"/> + <selectOption selector ="{{PayPalStandardConfigSection.sandboxMode(countryCode)}}" userInput="Yes" stepKey="enableSandboxMode"/> + <selectOption selector="{{PayPalStandardConfigSection.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableSolution"/> + <waitForElementClickable selector="{{AdminConfigSection.saveButton}}" stepKey="waitForConfigureBtn" /> + <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/> + <waitForPageLoad stepKey="waitForPageLoad2"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml new file mode 100644 index 000000000000..985fa0995719 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml @@ -0,0 +1,28 @@ +<!-- + /** + * 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="EnablePaypalPaylaterConfigurationActionGroup" > + <annotations> + <description>Enable Paypal Paylater Solution For Paypal Express Checkout</description> + </annotations> + <click selector="{{PayPalStandardConfigSection.configureBtn('us')}}" stepKey="clickPayPalConfigureBtn"/> + <selectOption selector="{{PayPalStandardConfigSection.enablePaylaterExperience('us')}}" userInput="Yes" stepKey="EnablePaylaterExperience"/> + <waitForPageLoad stepKey="waitForadvisepaylaterdropdown"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.advisepaylater('us')}}" stepKey="waitForAdvisepaylaterClickable"/> + <click selector="{{PayPalStandardConfigSection.advisepaylater('us')}}" stepKey="clickAdvisePaylater"/> + <selectOption selector="{{PayPalStandardConfigSection.enablePaypalPaylater('us')}}" userInput="Yes" stepKey="EnablePaypallater"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.expandcategorypage('us')}}" stepKey="waitForcategorypageClickable"/> + <click selector="{{PayPalStandardConfigSection.expandcategorypage('us')}}" stepKey="clickCategoryPage"/> + <selectOption selector ="{{PayPalStandardConfigSection.display('us')}}" userInput="Yes" stepKey="enableDisplayforPaylaterCategory"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.position('us')}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.stylelayout('us')}}" userInput="Flex" stepKey="seeSelectedStylelayout"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.Ratio('us')}}" userInput="20x1" stepKey="seeSelectedRatio"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.color('us')}}" userInput="Blue" stepKey="seeSelectedColor"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml index 4e88bbe73e2e..19a4452e6a46 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml @@ -196,6 +196,14 @@ <entity name="DisablePaypalPayflowProVault" type="payflowpro_cc_vault_active"> <data key="value">0</data> </entity> + <entity name="EnablePaypalPayStandard"> + <data key="path">payment/wps_express/active</data> + <data key="value">1</data> + </entity> + <entity name="DisablePaypalPayStandard"> + <data key="path">payment/wps_express/active</data> + <data key="value">0</data> + </entity> <entity name="Visa3DSecureCard" type="data"> <data key="cardNumber">4000000000000002</data> <data key="month">12</data> diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml new file mode 100644 index 000000000000..d04848b49133 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> + <section name="PayPalStandardConfigSection"> + <element name="configureBtn" type="button" selector="//button[@id='payment_{{countryCode}}_paypal_group_all_in_one_wps_express-head']" parameterized="true"/> + <element name="email" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout_business_account" parameterized="true"/> + <element name="apiMethod" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout_api_authentication" parameterized="true"/> + <element name="username" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout_api_username" parameterized="true"/> + <element name="password" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout_api_password" parameterized="true"/> + <element name="signature" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout_api_signature" parameterized="true"/> + <element name="sandboxMode" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout_sandbox_flag" parameterized="true"/> + <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_enable_express_checkout" parameterized="true"/> + <element name="enablePaylaterExperience" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_enable_paypal_paylater_experience" parameterized="true"/> + <element name="expandcategorypage" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage-head" parameterized="true"/> + <element name="advisepaylater" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater-head" parameterized="true"/> + <element name="enablePaypalPaylater" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_paylater_enabled" parameterized="true"/> + <element name="display" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_display" parameterized="true"/> + <element name="position" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_position" parameterized="true"/> + <element name="stylelayout" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_stylelayout" parameterized="true"/> + <element name="Ratio" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_ratio" parameterized="true"/> + <element name="color" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_color" parameterized="true"/> + <element name="payPaFrame" type="iframe" selector="//iframe[contains(@id, 'jsx-iframe')]"/> + <element name="categoryClick" type="button" selector="//span[contains(text(), 'SimpleSubCategory')]"/> + <element name="payPaliFrame" type="iframe" selector="//iframe[contains(@name, 'zoid__paypal_message')]"/> + <element name="PaypallaterMessage" type="input" selector="//span[text()='Buy now, pay later.']"/> + </section> +</sections> diff --git a/app/code/Magento/Paypal/Test/Mftf/Suite/ConfigPayPalStandardSuite.xml b/app/code/Magento/Paypal/Test/Mftf/Suite/ConfigPayPalStandardSuite.xml new file mode 100644 index 000000000000..a173f162fb66 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/Suite/ConfigPayPalStandardSuite.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd"> + <suite name="ConfigPayPalStandardSuite"> + <before> + <!-- Login --> + <actionGroup ref="AdminLoginActionGroup" stepKey="login"/> + <!--Config PayPal Standard--> + <actionGroup ref="AdminPayPalStandardEnableActionGroup" stepKey="ConfigPayPalStandard"/> + <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache"> + <argument name="tags" value="config full_page"/> + </actionGroup> + </before> + <after> + <!-- Cleanup PayPal Standard configurations --> + <magentoCLI command="config:set {{DisablePaypalPayStandard.path}} {{DisablePaypalPayStandard.value}}" stepKey="disablePayPalStandard"/> + <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache"> + <argument name="tags" value="config full_page"/> + </actionGroup> + </after> + <include> + <group name="paypalStandard"/> + </include> + </suite> +</suites> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml new file mode 100644 index 000000000000..2aab0d666b75 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> + <test name="AdminConfigPaymentsStandardTest"> + <annotations> + <features value="PayPal"/> + <stories value="Payment methods"/> + <title value="configuration for paypal pay later on Category page"/> + <description value="Paypal Pay Later Message should display on Admin Category Page configuration"/> + <severity value="CRITICAL"/> + <testCaseId value="AC-5639"/> + <group value="paypalStandard"/> + </annotations> + <before> + <createData entity="SimpleSubCategory" stepKey="simpleCategory"/> + <createData entity="SimpleProduct" stepKey="simpleProduct"> + <requiredEntity createDataKey="simpleCategory"/> + </createData> + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> + <actionGroup ref="AdminPayPalStandardEnableActionGroup" stepKey="ConfigPaymentsStandard"> + </actionGroup> + </before> + <after> + <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/> + <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/> + <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> + </after> + <actionGroup ref="EnablePaypalPaylaterConfigurationActionGroup" stepKey="enablePaylaterCategoryPage"> + </actionGroup> + <!-- Reindex and cache flush --> + <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexPage"> + <argument name="indices" value=""/> + </actionGroup> + <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCachePage"> + <argument name="tags" value=""/> + </actionGroup> + <!--Navigate to Storefront--> + <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/> + <waitForPageLoad stepKey="waitForProductPage"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.categoryClick}}" stepKey="waitForCategryToClickable"/> + <click selector ="{{PayPalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryeButton"/> + <waitForPageLoad stepKey="waitForCategrypageTobeLoaded"/> + <waitForElementVisible selector="{{PayPalStandardConfigSection.payPaliFrame}}" stepKey="waitForElement"/> + <switchToIFrame selector="{{PayPalStandardConfigSection.payPaliFrame}}" stepKey="switchToBuyNowPaylaterIFrame"/> + <seeElement selector="{{PayPalStandardConfigSection.PaypallaterMessage}}" stepKey="verifyBuyNowPaylaterMessage"/> + <switchToIFrame stepKey="switchBackToMainPaypalFrame"/> + <!--Disable Paypal Standard--> + <actionGroup ref="AdminPayPalStandardDisableActionGroup" stepKey="disablePaypalStandard"> + </actionGroup> + <!-- Reindex and cache flush --> + <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAdminPage"> + <argument name="indices" value=""/> + </actionGroup> + <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAdminPage"> + <argument name="tags" value=""/> + </actionGroup> + <!--Validate Paylater Message On Storefront Category Page--> + <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFrontPage"/> + <waitForPageLoad stepKey="waitForItemPage"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.categoryClick}}" stepKey="waitForCategryToBeClickable"/> + <click selector ="{{PayPalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryeTab"/> + <waitForPageLoad stepKey="waitForCategoryPageTobeLoaded"/> + <dontSeeElement selector="{{PayPalStandardConfigSection.PaypallaterMessage}}" stepKey="verifyPaylaterMessageToBeDisappeared"/> + </test> +</tests> + + + From 530bab2dc13fe3aa676c602aaeac3b65c8f44b7e Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Mon, 6 May 2024 15:29:26 +0530 Subject: [PATCH 22/36] ACQE-6496:Configuration for paypal pay later on Categoty Page Correction On EnablePaylaterPaypalStandardActionGroup --- .../ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml index 985fa0995719..176f4d2fd47f 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml @@ -7,9 +7,9 @@ <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - <actionGroup name="EnablePaypalPaylaterConfigurationActionGroup" > + <actionGroup name="EnablePaylaterPaypalStandardActionGroup" > <annotations> - <description>Enable Paypal Paylater Solution For Paypal Express Checkout</description> + <description>Enable Paypal Paylater Solution For Paypal Standard</description> </annotations> <click selector="{{PayPalStandardConfigSection.configureBtn('us')}}" stepKey="clickPayPalConfigureBtn"/> <selectOption selector="{{PayPalStandardConfigSection.enablePaylaterExperience('us')}}" userInput="Yes" stepKey="EnablePaylaterExperience"/> From c3445e066ed26086aa0c8fb0f18005e19f71ff2f Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Mon, 6 May 2024 16:58:16 +0530 Subject: [PATCH 23/36] ACQE-6496:Configuration for paypal pay later on Category page Correction group Value In AdminConfigPaymentsStandardTest --- .../Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml index 2aab0d666b75..067d9955b2fd 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml @@ -16,6 +16,8 @@ <severity value="CRITICAL"/> <testCaseId value="AC-5639"/> <group value="paypalStandard"/> + <group value="3rd_party_integration" /> + <group value="pr_exclude" /> </annotations> <before> <createData entity="SimpleSubCategory" stepKey="simpleCategory"/> @@ -31,7 +33,7 @@ <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/> <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> </after> - <actionGroup ref="EnablePaypalPaylaterConfigurationActionGroup" stepKey="enablePaylaterCategoryPage"> + <actionGroup ref="EnablePaylaterPaypalStandardActionGroup" stepKey="enablePaypalStandard"> </actionGroup> <!-- Reindex and cache flush --> <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexPage"> From e26a703572dd231a4e189e4865df82e247ddb82e Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Sat, 11 May 2024 20:00:16 +0530 Subject: [PATCH 24/36] ACQE-6496:Configuration for paypal pay later on Category page Removing pr_exclude as groupvalue in AdminConfigPaymentsStandardTest --- .../AdminPayPalStandardDisableActionGroup.xml | 12 +++++----- ...nablePaylaterPaypalStandardActionGroup.xml | 14 ++++++------ .../Section/PayPalStandardConfigSection.xml | 11 +++++----- .../Test/AdminConfigPaymentsStandardTest.xml | 22 +++++-------------- 4 files changed, 24 insertions(+), 35 deletions(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardDisableActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardDisableActionGroup.xml index b5f33cce0017..f89d4b67458e 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardDisableActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardDisableActionGroup.xml @@ -24,15 +24,15 @@ <selectOption selector="{{PayPalStandardConfigSection.enableSolution(countryCode)}}" userInput="No" stepKey="disableSolution"/> <selectOption selector="{{PayPalStandardConfigSection.enablePaylaterExperience(countryCode)}}" userInput="Yes" stepKey="EnablePaylaterExperience"/> <waitForPageLoad stepKey="waitForadvisepaylaterdropdown"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.advisepaylater(countryCode)}}" stepKey="waitForAdvisepaylaterClickable"/> - <click selector="{{PayPalStandardConfigSection.advisepaylater(countryCode)}}" stepKey="clickAdvisePaylater"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.advisePaylater(countryCode)}}" stepKey="waitForAdvisepaylaterClickable"/> + <click selector="{{PayPalStandardConfigSection.advisePaylater(countryCode)}}" stepKey="clickAdvisePaylater"/> <selectOption selector="{{PayPalStandardConfigSection.enablePaypalPaylater(countryCode)}}" userInput="Yes" stepKey="EnablePaypallater"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.expandcategorypage(countryCode)}}" stepKey="waitForcategorypageClickable"/> - <click selector="{{PayPalStandardConfigSection.expandcategorypage(countryCode)}}" stepKey="clickCategoryPage"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.expandCategoryPage(countryCode)}}" stepKey="waitForcategorypageClickable"/> + <click selector="{{PayPalStandardConfigSection.expandCategoryPage(countryCode)}}" stepKey="clickCategoryPage"/> <selectOption selector ="{{PayPalStandardConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCategoryPage"/> <seeOptionIsSelected selector="{{PayPalStandardConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.stylelayout(countryCode)}}" userInput="Flex" stepKey="seeSelectedStylelayout"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.Ratio(countryCode)}}" userInput="20x1" stepKey="seeSelectedRatio"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.styleLayout(countryCode)}}" userInput="Flex" stepKey="seeSelectedStylelayout"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.ratio(countryCode)}}" userInput="20x1" stepKey="seeSelectedRatio"/> <seeOptionIsSelected selector="{{PayPalStandardConfigSection.color(countryCode)}}" userInput="Blue" stepKey="seeSelectedColor"/> <waitForElementClickable selector="{{AdminConfigSection.saveButton}}" stepKey="waitForConfiguBtn" /> <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfiguration"/> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml index 176f4d2fd47f..b4b95564b28e 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml @@ -13,16 +13,16 @@ </annotations> <click selector="{{PayPalStandardConfigSection.configureBtn('us')}}" stepKey="clickPayPalConfigureBtn"/> <selectOption selector="{{PayPalStandardConfigSection.enablePaylaterExperience('us')}}" userInput="Yes" stepKey="EnablePaylaterExperience"/> - <waitForPageLoad stepKey="waitForadvisepaylaterdropdown"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.advisepaylater('us')}}" stepKey="waitForAdvisepaylaterClickable"/> - <click selector="{{PayPalStandardConfigSection.advisepaylater('us')}}" stepKey="clickAdvisePaylater"/> + <waitForPageLoad stepKey="waitForAdvisepaylaterdropdown"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.advisePaylater('us')}}" stepKey="waitForAdvisepaylaterClickable"/> + <click selector="{{PayPalStandardConfigSection.advisePaylater('us')}}" stepKey="clickAdvisePaylater"/> <selectOption selector="{{PayPalStandardConfigSection.enablePaypalPaylater('us')}}" userInput="Yes" stepKey="EnablePaypallater"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.expandcategorypage('us')}}" stepKey="waitForcategorypageClickable"/> - <click selector="{{PayPalStandardConfigSection.expandcategorypage('us')}}" stepKey="clickCategoryPage"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.expandCategoryPage('us')}}" stepKey="waitForcategorypageClickable"/> + <click selector="{{PayPalStandardConfigSection.expandCategoryPage('us')}}" stepKey="clickCategoryPage"/> <selectOption selector ="{{PayPalStandardConfigSection.display('us')}}" userInput="Yes" stepKey="enableDisplayforPaylaterCategory"/> <seeOptionIsSelected selector="{{PayPalStandardConfigSection.position('us')}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.stylelayout('us')}}" userInput="Flex" stepKey="seeSelectedStylelayout"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.Ratio('us')}}" userInput="20x1" stepKey="seeSelectedRatio"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.styleLayout('us')}}" userInput="Flex" stepKey="seeSelectedStylelayout"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.ratio('us')}}" userInput="20x1" stepKey="seeSelectedRatio"/> <seeOptionIsSelected selector="{{PayPalStandardConfigSection.color('us')}}" userInput="Blue" stepKey="seeSelectedColor"/> </actionGroup> </actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml index d04848b49133..a0bd2a75a074 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml @@ -17,17 +17,16 @@ <element name="sandboxMode" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout_sandbox_flag" parameterized="true"/> <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_enable_express_checkout" parameterized="true"/> <element name="enablePaylaterExperience" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_enable_paypal_paylater_experience" parameterized="true"/> - <element name="expandcategorypage" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage-head" parameterized="true"/> - <element name="advisepaylater" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater-head" parameterized="true"/> + <element name="expandCategoryPage" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage-head" parameterized="true"/> + <element name="advisePaylater" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater-head" parameterized="true"/> <element name="enablePaypalPaylater" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_paylater_enabled" parameterized="true"/> <element name="display" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_display" parameterized="true"/> <element name="position" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_position" parameterized="true"/> - <element name="stylelayout" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_stylelayout" parameterized="true"/> - <element name="Ratio" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_ratio" parameterized="true"/> + <element name="styleLayout" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_stylelayout" parameterized="true"/> + <element name="ratio" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_ratio" parameterized="true"/> <element name="color" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_color" parameterized="true"/> - <element name="payPaFrame" type="iframe" selector="//iframe[contains(@id, 'jsx-iframe')]"/> <element name="categoryClick" type="button" selector="//span[contains(text(), 'SimpleSubCategory')]"/> <element name="payPaliFrame" type="iframe" selector="//iframe[contains(@name, 'zoid__paypal_message')]"/> - <element name="PaypallaterMessage" type="input" selector="//span[text()='Buy now, pay later.']"/> + <element name="paypalPaylaterMessage" type="input" selector="//span[text()='Buy now, pay later.']"/> </section> </sections> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml index 067d9955b2fd..4bbf1e90ee91 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml @@ -16,8 +16,6 @@ <severity value="CRITICAL"/> <testCaseId value="AC-5639"/> <group value="paypalStandard"/> - <group value="3rd_party_integration" /> - <group value="pr_exclude" /> </annotations> <before> <createData entity="SimpleSubCategory" stepKey="simpleCategory"/> @@ -36,12 +34,8 @@ <actionGroup ref="EnablePaylaterPaypalStandardActionGroup" stepKey="enablePaypalStandard"> </actionGroup> <!-- Reindex and cache flush --> - <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexPage"> - <argument name="indices" value=""/> - </actionGroup> - <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCachePage"> - <argument name="tags" value=""/> - </actionGroup> + <magentoCLI command="indexer:reindex" stepKey="performReindex"/> + <magentoCLI command="cache:flush" stepKey="cleanCache"/> <!--Navigate to Storefront--> <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/> <waitForPageLoad stepKey="waitForProductPage"/> @@ -50,25 +44,21 @@ <waitForPageLoad stepKey="waitForCategrypageTobeLoaded"/> <waitForElementVisible selector="{{PayPalStandardConfigSection.payPaliFrame}}" stepKey="waitForElement"/> <switchToIFrame selector="{{PayPalStandardConfigSection.payPaliFrame}}" stepKey="switchToBuyNowPaylaterIFrame"/> - <seeElement selector="{{PayPalStandardConfigSection.PaypallaterMessage}}" stepKey="verifyBuyNowPaylaterMessage"/> + <seeElement selector="{{PayPalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyBuyNowPaylaterMessage"/> <switchToIFrame stepKey="switchBackToMainPaypalFrame"/> <!--Disable Paypal Standard--> <actionGroup ref="AdminPayPalStandardDisableActionGroup" stepKey="disablePaypalStandard"> </actionGroup> <!-- Reindex and cache flush --> - <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAdminPage"> - <argument name="indices" value=""/> - </actionGroup> - <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAdminPage"> - <argument name="tags" value=""/> - </actionGroup> + <magentoCLI command="indexer:reindex" stepKey="performReIndex"/> + <magentoCLI command="cache:flush" stepKey="flushCache"/> <!--Validate Paylater Message On Storefront Category Page--> <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFrontPage"/> <waitForPageLoad stepKey="waitForItemPage"/> <waitForElementClickable selector="{{PayPalStandardConfigSection.categoryClick}}" stepKey="waitForCategryToBeClickable"/> <click selector ="{{PayPalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryeTab"/> <waitForPageLoad stepKey="waitForCategoryPageTobeLoaded"/> - <dontSeeElement selector="{{PayPalStandardConfigSection.PaypallaterMessage}}" stepKey="verifyPaylaterMessageToBeDisappeared"/> + <dontSeeElement selector="{{PayPalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyPaylaterMessageToBeDisappeared"/> </test> </tests> From 25c82a13834670aa5e6e85b3cb57eca0e1c0e9e8 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Mon, 13 May 2024 06:33:38 +0530 Subject: [PATCH 25/36] ACQE-6496:Configuration for paypal pay later on Category page Correction On Selector of Configure Button --- .../ActionGroup/AdminPayPalStandardEnableActionGroup.xml | 6 +++--- .../Test/Mftf/Section/PayPalStandardConfigSection.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml index c20c3e48f323..c6eceda3d390 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml @@ -17,9 +17,9 @@ <argument name="countryCode" type="string" defaultValue="us"/> </arguments> <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/> - <waitForPageLoad stepKey="waitForPageLoad1"/> - <waitForElementClickable selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="waitForExpandOtherPaypalConfigButton" /> - <click selector ="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="expandOtherPaypalConfigButton"/> + <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="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" x="0" y="-80" stepKey="scrollToConfigure"/> <waitForElementClickable selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" stepKey="waitForPayPalStandardConfigureBtn" /> <click selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalStandardConfigureBtn"/> diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml index a0bd2a75a074..ffa720df1250 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml @@ -8,7 +8,7 @@ <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> <section name="PayPalStandardConfigSection"> - <element name="configureBtn" type="button" selector="//button[@id='payment_{{countryCode}}_paypal_group_all_in_one_wps_express-head']" parameterized="true"/> + <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express-head" parameterized="true"/> <element name="email" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout_business_account" parameterized="true"/> <element name="apiMethod" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout_api_authentication" parameterized="true"/> <element name="username" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout_api_username" parameterized="true"/> From fc0588d8991a49ab0206654b5011d0989eedfc49 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Mon, 13 May 2024 09:38:15 +0530 Subject: [PATCH 26/36] ACQE-6496:Configuration for paypal pay later on Category page Correction On Iframe Selecter in PayPalStandardConfigSection --- .../AdminPayPalStandardDisableActionGroup.xml | 41 ------------------- ...nablePaylaterPaypalStandardActionGroup.xml | 2 + ...alidatePaylaterInStorefrontActionGroup.xml | 26 ++++++++++++ .../Section/PayPalStandardConfigSection.xml | 2 +- .../Mftf/Suite/ConfigPayPalStandardSuite.xml | 30 -------------- .../Test/AdminConfigPaymentsStandardTest.xml | 23 +++++------ 6 files changed, 39 insertions(+), 85 deletions(-) delete mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardDisableActionGroup.xml create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml delete mode 100644 app/code/Magento/Paypal/Test/Mftf/Suite/ConfigPayPalStandardSuite.xml diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardDisableActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardDisableActionGroup.xml deleted file mode 100644 index f89d4b67458e..000000000000 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardDisableActionGroup.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?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="AdminPayPalStandardDisableActionGroup"> - <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="waitForPageLoad8"/> - <scrollTo selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" x="0" y="-80" stepKey="scrollToConfigure"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" stepKey="waitForPayPalStandardConfigureBtn" /> - <click selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalStandardConfigureBtn"/> - <selectOption selector="{{PayPalStandardConfigSection.enableSolution(countryCode)}}" userInput="No" stepKey="disableSolution"/> - <selectOption selector="{{PayPalStandardConfigSection.enablePaylaterExperience(countryCode)}}" userInput="Yes" stepKey="EnablePaylaterExperience"/> - <waitForPageLoad stepKey="waitForadvisepaylaterdropdown"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.advisePaylater(countryCode)}}" stepKey="waitForAdvisepaylaterClickable"/> - <click selector="{{PayPalStandardConfigSection.advisePaylater(countryCode)}}" stepKey="clickAdvisePaylater"/> - <selectOption selector="{{PayPalStandardConfigSection.enablePaypalPaylater(countryCode)}}" userInput="Yes" stepKey="EnablePaypallater"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.expandCategoryPage(countryCode)}}" stepKey="waitForcategorypageClickable"/> - <click selector="{{PayPalStandardConfigSection.expandCategoryPage(countryCode)}}" stepKey="clickCategoryPage"/> - <selectOption selector ="{{PayPalStandardConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCategoryPage"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.styleLayout(countryCode)}}" userInput="Flex" stepKey="seeSelectedStylelayout"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.ratio(countryCode)}}" userInput="20x1" stepKey="seeSelectedRatio"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.color(countryCode)}}" userInput="Blue" stepKey="seeSelectedColor"/> - <waitForElementClickable selector="{{AdminConfigSection.saveButton}}" stepKey="waitForConfiguBtn" /> - <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfiguration"/> - <waitForPageLoad stepKey="waitForPageLoad82"/> - </actionGroup> -</actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml index b4b95564b28e..ca1d0fc26cc8 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml @@ -24,5 +24,7 @@ <seeOptionIsSelected selector="{{PayPalStandardConfigSection.styleLayout('us')}}" userInput="Flex" stepKey="seeSelectedStylelayout"/> <seeOptionIsSelected selector="{{PayPalStandardConfigSection.ratio('us')}}" userInput="20x1" stepKey="seeSelectedRatio"/> <seeOptionIsSelected selector="{{PayPalStandardConfigSection.color('us')}}" userInput="Blue" stepKey="seeSelectedColor"/> + <waitForElementClickable selector="{{AdminConfigSection.saveButton}}" stepKey="waitForConfiguBtn" /> + <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfiguration"/> </actionGroup> </actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml new file mode 100644 index 000000000000..985d7719bf31 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml @@ -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="ValidatePaylaterInStorefrontActionGroup"> + <annotations> + <description>Goes to the 'Storefront Category' page for 'Paylater Message'. </description> + </annotations> + <arguments> + <argument name="countryCode" type="string" defaultValue="us"/> + </arguments> + <waitForElementClickable selector="{{PayPalStandardConfigSection.categoryClick}}" stepKey="waitForCategryToClickable"/> + <click selector ="{{PayPalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryeButton"/> + <waitForPageLoad stepKey="waitForCategrypageTobeLoaded"/> + <waitForElementVisible selector="{{PayPalStandardConfigSection.payPalFrame}}" stepKey="waitForElement"/> + <switchToIFrame selector="{{PayPalStandardConfigSection.payPalFrame}}" stepKey="switchToBuyNowPaylaterIFrame"/> + <seeElement selector="{{PayPalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyBuyNowPaylaterMessage"/> + <switchToIFrame stepKey="switchBackToMainPaypalFrame"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml index ffa720df1250..384d6c7952c2 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml @@ -26,7 +26,7 @@ <element name="ratio" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_ratio" parameterized="true"/> <element name="color" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_paylater_settings_paylater_categorypage_paylater_categorypage_color" parameterized="true"/> <element name="categoryClick" type="button" selector="//span[contains(text(), 'SimpleSubCategory')]"/> - <element name="payPaliFrame" type="iframe" selector="//iframe[contains(@name, 'zoid__paypal_message')]"/> + <element name="payPalFrame" type="iframe" selector="//iframe[contains(@id, 'jsx-iframe')]"/> <element name="paypalPaylaterMessage" type="input" selector="//span[text()='Buy now, pay later.']"/> </section> </sections> diff --git a/app/code/Magento/Paypal/Test/Mftf/Suite/ConfigPayPalStandardSuite.xml b/app/code/Magento/Paypal/Test/Mftf/Suite/ConfigPayPalStandardSuite.xml deleted file mode 100644 index a173f162fb66..000000000000 --- a/app/code/Magento/Paypal/Test/Mftf/Suite/ConfigPayPalStandardSuite.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ ---> -<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd"> - <suite name="ConfigPayPalStandardSuite"> - <before> - <!-- Login --> - <actionGroup ref="AdminLoginActionGroup" stepKey="login"/> - <!--Config PayPal Standard--> - <actionGroup ref="AdminPayPalStandardEnableActionGroup" stepKey="ConfigPayPalStandard"/> - <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache"> - <argument name="tags" value="config full_page"/> - </actionGroup> - </before> - <after> - <!-- Cleanup PayPal Standard configurations --> - <magentoCLI command="config:set {{DisablePaypalPayStandard.path}} {{DisablePaypalPayStandard.value}}" stepKey="disablePayPalStandard"/> - <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache"> - <argument name="tags" value="config full_page"/> - </actionGroup> - </after> - <include> - <group name="paypalStandard"/> - </include> - </suite> -</suites> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml index 4bbf1e90ee91..32ad090431b4 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml @@ -15,15 +15,20 @@ <description value="Paypal Pay Later Message should display on Admin Category Page configuration"/> <severity value="CRITICAL"/> <testCaseId value="AC-5639"/> - <group value="paypalStandard"/> + </annotations> <before> <createData entity="SimpleSubCategory" stepKey="simpleCategory"/> <createData entity="SimpleProduct" stepKey="simpleProduct"> <requiredEntity createDataKey="simpleCategory"/> </createData> - <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> - <actionGroup ref="AdminPayPalStandardEnableActionGroup" stepKey="ConfigPaymentsStandard"> + + <!-- Login --> + <actionGroup ref="AdminLoginActionGroup" stepKey="login"/> + <!--Config PayPal Standard--> + <actionGroup ref="AdminPayPalStandardEnableActionGroup" stepKey="ConfigPayPalStandard"/> + <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache"> + <argument name="tags" value="config full_page"/> </actionGroup> </before> <after> @@ -38,17 +43,9 @@ <magentoCLI command="cache:flush" stepKey="cleanCache"/> <!--Navigate to Storefront--> <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/> - <waitForPageLoad stepKey="waitForProductPage"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.categoryClick}}" stepKey="waitForCategryToClickable"/> - <click selector ="{{PayPalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryeButton"/> - <waitForPageLoad stepKey="waitForCategrypageTobeLoaded"/> - <waitForElementVisible selector="{{PayPalStandardConfigSection.payPaliFrame}}" stepKey="waitForElement"/> - <switchToIFrame selector="{{PayPalStandardConfigSection.payPaliFrame}}" stepKey="switchToBuyNowPaylaterIFrame"/> - <seeElement selector="{{PayPalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyBuyNowPaylaterMessage"/> - <switchToIFrame stepKey="switchBackToMainPaypalFrame"/> + <actionGroup ref="ValidatePaylaterInStorefrontActionGroup" stepKey="verifyPaylaterInStorefrontCategoryPage"/> <!--Disable Paypal Standard--> - <actionGroup ref="AdminPayPalStandardDisableActionGroup" stepKey="disablePaypalStandard"> - </actionGroup> + <magentoCLI command="config:set {{DisablePaypalPayStandard.path}} {{DisablePaypalPayStandard.value}}" stepKey="disablePayPalStandard"/> <!-- Reindex and cache flush --> <magentoCLI command="indexer:reindex" stepKey="performReIndex"/> <magentoCLI command="cache:flush" stepKey="flushCache"/> From 9b558c9f4b3aff77fcc872f5bc626d74ae6e8c88 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Mon, 13 May 2024 10:33:33 +0530 Subject: [PATCH 27/36] ACQE-6496:Configuration for paypal pay later on Category page Removing argument from ValidatePayLaterStorefrontActionGroup --- .../ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml index 985d7719bf31..3a4900bf1c2c 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml @@ -12,9 +12,6 @@ <annotations> <description>Goes to the 'Storefront Category' page for 'Paylater Message'. </description> </annotations> - <arguments> - <argument name="countryCode" type="string" defaultValue="us"/> - </arguments> <waitForElementClickable selector="{{PayPalStandardConfigSection.categoryClick}}" stepKey="waitForCategryToClickable"/> <click selector ="{{PayPalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryeButton"/> <waitForPageLoad stepKey="waitForCategrypageTobeLoaded"/> From fbc625c9324ceea1e55c900c0cc1f64b57fb191e Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Wed, 15 May 2024 16:50:25 +0530 Subject: [PATCH 28/36] ACQE-6496:Configuration for paypal pay later on Category page Correction In Title On AdminConfigPaymentsStandardTest --- .../Mftf/Test/AdminConfigPaymentsStandardTest.xml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml index 32ad090431b4..2fc66b01e9f6 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml @@ -11,18 +11,16 @@ <annotations> <features value="PayPal"/> <stories value="Payment methods"/> - <title value="configuration for paypal pay later on Category page"/> - <description value="Paypal Pay Later Message should display on Admin Category Page configuration"/> + <title value="Configuration for paypal pay later on Category page"/> + <description value="Paypal Pay Later Message should display on Admin Category Page configuration"/> <severity value="CRITICAL"/> <testCaseId value="AC-5639"/> - </annotations> <before> <createData entity="SimpleSubCategory" stepKey="simpleCategory"/> <createData entity="SimpleProduct" stepKey="simpleProduct"> <requiredEntity createDataKey="simpleCategory"/> </createData> - <!-- Login --> <actionGroup ref="AdminLoginActionGroup" stepKey="login"/> <!--Config PayPal Standard--> @@ -36,8 +34,7 @@ <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/> <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> </after> - <actionGroup ref="EnablePaylaterPaypalStandardActionGroup" stepKey="enablePaypalStandard"> - </actionGroup> + <actionGroup ref="EnablePaylaterPaypalStandardActionGroup" stepKey="enablePaypalStandard"/> <!-- Reindex and cache flush --> <magentoCLI command="indexer:reindex" stepKey="performReindex"/> <magentoCLI command="cache:flush" stepKey="cleanCache"/> @@ -52,8 +49,8 @@ <!--Validate Paylater Message On Storefront Category Page--> <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFrontPage"/> <waitForPageLoad stepKey="waitForItemPage"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.categoryClick}}" stepKey="waitForCategryToBeClickable"/> - <click selector ="{{PayPalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryeTab"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.categoryClick}}" stepKey="waitForCategoryToBeClickable"/> + <click selector ="{{PayPalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryTab"/> <waitForPageLoad stepKey="waitForCategoryPageTobeLoaded"/> <dontSeeElement selector="{{PayPalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyPaylaterMessageToBeDisappeared"/> </test> From 50705b2987373f20624c0a252c6231df1d3f94e9 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Thu, 16 May 2024 18:53:30 +0530 Subject: [PATCH 29/36] ACQE-6496:Configuration for paypal pay later on Category Page Adding ValidatePaylaterDropdownValuesActionGroup and Using Reindex and Cache ActionGroup in AdminConfigPaymentsStandardTest --- ...nablePaylaterPaypalStandardActionGroup.xml | 27 +++++++++---------- ...idatePaylaterDropdownValuesActionGroup.xml | 24 +++++++++++++++++ ...alidatePaylaterInStorefrontActionGroup.xml | 2 +- .../Test/AdminConfigPaymentsStandardTest.xml | 21 ++++++++++----- 4 files changed, 52 insertions(+), 22 deletions(-) create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterDropdownValuesActionGroup.xml diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml index ca1d0fc26cc8..d05c04835369 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml @@ -7,24 +7,21 @@ <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - <actionGroup name="EnablePaylaterPaypalStandardActionGroup" > + <actionGroup name="EnablePaylaterPaypalStandardActionGroup"> <annotations> <description>Enable Paypal Paylater Solution For Paypal Standard</description> </annotations> - <click selector="{{PayPalStandardConfigSection.configureBtn('us')}}" stepKey="clickPayPalConfigureBtn"/> - <selectOption selector="{{PayPalStandardConfigSection.enablePaylaterExperience('us')}}" userInput="Yes" stepKey="EnablePaylaterExperience"/> + <arguments> + <argument name="countryCode" type="string" defaultValue="us"/> + </arguments> + <click selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/> + <selectOption selector="{{PayPalStandardConfigSection.enablePaylaterExperience(countryCode)}}" userInput="Yes" stepKey="EnablePaylaterExperience"/> <waitForPageLoad stepKey="waitForAdvisepaylaterdropdown"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.advisePaylater('us')}}" stepKey="waitForAdvisepaylaterClickable"/> - <click selector="{{PayPalStandardConfigSection.advisePaylater('us')}}" stepKey="clickAdvisePaylater"/> - <selectOption selector="{{PayPalStandardConfigSection.enablePaypalPaylater('us')}}" userInput="Yes" stepKey="EnablePaypallater"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.expandCategoryPage('us')}}" stepKey="waitForcategorypageClickable"/> - <click selector="{{PayPalStandardConfigSection.expandCategoryPage('us')}}" stepKey="clickCategoryPage"/> - <selectOption selector ="{{PayPalStandardConfigSection.display('us')}}" userInput="Yes" stepKey="enableDisplayforPaylaterCategory"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.position('us')}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.styleLayout('us')}}" userInput="Flex" stepKey="seeSelectedStylelayout"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.ratio('us')}}" userInput="20x1" stepKey="seeSelectedRatio"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.color('us')}}" userInput="Blue" stepKey="seeSelectedColor"/> - <waitForElementClickable selector="{{AdminConfigSection.saveButton}}" stepKey="waitForConfiguBtn" /> - <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfiguration"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.advisePaylater(countryCode)}}" stepKey="waitForAdvisepaylaterClickable"/> + <click selector="{{PayPalStandardConfigSection.advisePaylater(countryCode)}}" stepKey="clickAdvisePaylater"/> + <selectOption selector="{{PayPalStandardConfigSection.enablePaypalPaylater(countryCode)}}" userInput="Yes" stepKey="EnablePaypallater"/> + <waitForElementClickable selector="{{PayPalStandardConfigSection.expandCategoryPage(countryCode)}}" stepKey="waitForcategorypageClickable"/> + <click selector="{{PayPalStandardConfigSection.expandCategoryPage(countryCode)}}" stepKey="clickCategoryPage"/> + <selectOption selector ="{{PayPalStandardConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCategory"/> </actionGroup> </actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterDropdownValuesActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterDropdownValuesActionGroup.xml new file mode 100644 index 000000000000..273265407158 --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterDropdownValuesActionGroup.xml @@ -0,0 +1,24 @@ +<!-- + /** + * 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="ValidatePaylaterDropdownValuesActionGroup"> + <annotations> + <description>Validate the Default Dropdown values In Paylater</description> + </annotations> + <arguments> + <argument name="countryCode" type="string" defaultValue="us"/> + </arguments> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.styleLayout(countryCode)}}" userInput="Flex" stepKey="seeSelectedStylelayout"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.ratio(countryCode)}}" userInput="20x1" stepKey="seeSelectedRatio"/> + <seeOptionIsSelected selector="{{PayPalStandardConfigSection.color(countryCode)}}" userInput="Blue" stepKey="seeSelectedColor"/> + <waitForElementClickable selector="{{AdminConfigSection.saveButton}}" stepKey="waitForConfiguBtn" /> + <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfiguration"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml index 3a4900bf1c2c..3eecec6424fb 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml @@ -17,7 +17,7 @@ <waitForPageLoad stepKey="waitForCategrypageTobeLoaded"/> <waitForElementVisible selector="{{PayPalStandardConfigSection.payPalFrame}}" stepKey="waitForElement"/> <switchToIFrame selector="{{PayPalStandardConfigSection.payPalFrame}}" stepKey="switchToBuyNowPaylaterIFrame"/> - <seeElement selector="{{PayPalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyBuyNowPaylaterMessage"/> + <waitForElementVisible selector="{{PayPalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyBuyNowPaylaterMessage"/> <switchToIFrame stepKey="switchBackToMainPaypalFrame"/> </actionGroup> </actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml index 2fc66b01e9f6..0382257745ec 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml @@ -11,7 +11,7 @@ <annotations> <features value="PayPal"/> <stories value="Payment methods"/> - <title value="Configuration for paypal pay later on Category page"/> + <title value="Configuration for paypal pay later on Category Page"/> <description value="Paypal Pay Later Message should display on Admin Category Page configuration"/> <severity value="CRITICAL"/> <testCaseId value="AC-5639"/> @@ -35,24 +35,33 @@ <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> </after> <actionGroup ref="EnablePaylaterPaypalStandardActionGroup" stepKey="enablePaypalStandard"/> + <actionGroup ref="ValidatePaylaterDropdownValuesActionGroup" stepKey="verifyPaylaterDropdownVales"/> <!-- Reindex and cache flush --> - <magentoCLI command="indexer:reindex" stepKey="performReindex"/> - <magentoCLI command="cache:flush" stepKey="cleanCache"/> + <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex"> + <argument name="indices" value=""/> + </actionGroup> + <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanMagentoCache"> + <argument name="tags" value="config full_page"/> + </actionGroup> <!--Navigate to Storefront--> <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/> <actionGroup ref="ValidatePaylaterInStorefrontActionGroup" stepKey="verifyPaylaterInStorefrontCategoryPage"/> <!--Disable Paypal Standard--> <magentoCLI command="config:set {{DisablePaypalPayStandard.path}} {{DisablePaypalPayStandard.value}}" stepKey="disablePayPalStandard"/> <!-- Reindex and cache flush --> - <magentoCLI command="indexer:reindex" stepKey="performReIndex"/> - <magentoCLI command="cache:flush" stepKey="flushCache"/> + <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex1"> + <argument name="indices" value=""/> + </actionGroup> + <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanMagentoCache1"> + <argument name="tags" value="config full_page"/> + </actionGroup> <!--Validate Paylater Message On Storefront Category Page--> <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFrontPage"/> <waitForPageLoad stepKey="waitForItemPage"/> <waitForElementClickable selector="{{PayPalStandardConfigSection.categoryClick}}" stepKey="waitForCategoryToBeClickable"/> <click selector ="{{PayPalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryTab"/> <waitForPageLoad stepKey="waitForCategoryPageTobeLoaded"/> - <dontSeeElement selector="{{PayPalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyPaylaterMessageToBeDisappeared"/> + <waitForElementNotVisible selector="{{PayPalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyPaylaterMessageToBeDisappeared"/> </test> </tests> From 057e50baa5e5c4d119892e1fd54e1c0c9c794fc8 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Mon, 20 May 2024 15:22:29 +0530 Subject: [PATCH 30/36] ACQE-6496:Configuration for paypal pay later on Category Page Renamed all files with prefix as Admin ot Storefront --- ...nablePaypalStandardPaylaterActionGroup.xml | 26 ++++++++++++++++++ .../AdminPayPalStandardEnableActionGroup.xml | 22 +++++++-------- ...laterDefaultValuesCartPageActionGroup.xml} | 11 ++++---- ...ertStorefrontPaypalPaylaterActionGroup.xml | 22 +++++++++++++++ ...nablePaylaterPaypalStandardActionGroup.xml | 27 ------------------- ...alidatePaylaterInStorefrontActionGroup.xml | 23 ---------------- ...l => AdminPaypalStandardConfigSection.xml} | 2 +- .../Test/AdminConfigPaymentsStandardTest.xml | 13 ++++----- 8 files changed, 72 insertions(+), 74 deletions(-) create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePaypalStandardPaylaterActionGroup.xml rename app/code/Magento/Paypal/Test/Mftf/ActionGroup/{ValidatePaylaterDropdownValuesActionGroup.xml => AssertAdminPaypalStandardPaylaterDefaultValuesCartPageActionGroup.xml} (52%) create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontPaypalPaylaterActionGroup.xml delete mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml delete mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml rename app/code/Magento/Paypal/Test/Mftf/Section/{PayPalStandardConfigSection.xml => AdminPaypalStandardConfigSection.xml} (98%) diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePaypalStandardPaylaterActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePaypalStandardPaylaterActionGroup.xml new file mode 100644 index 000000000000..e7ce4ad4283a --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminEnablePaypalStandardPaylaterActionGroup.xml @@ -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> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml index c6eceda3d390..9fd183c0d408 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalStandardEnableActionGroup.xml @@ -20,17 +20,17 @@ <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="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" x="0" y="-80" stepKey="scrollToConfigure"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" stepKey="waitForPayPalStandardConfigureBtn" /> - <click selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalStandardConfigureBtn"/> - <waitForElementVisible selector="{{PayPalStandardConfigSection.email(countryCode)}}" stepKey="waitForEmailTab"/> - <fillField selector ="{{PayPalStandardConfigSection.email(countryCode)}}" userInput="{{credentials.paypal_express_email}}" stepKey="inputEmailAssociatedWithPayPalMerchantAccount"/> - <selectOption selector ="{{PayPalStandardConfigSection.apiMethod(countryCode)}}" userInput="API Signature" stepKey="inputAPIAuthenticationMethods"/> - <fillField selector ="{{PayPalStandardConfigSection.username(countryCode)}}" userInput="{{credentials.paypal_express_api_username}}" stepKey="inputAPIUsername"/> - <fillField selector ="{{PayPalStandardConfigSection.password(countryCode)}}" userInput="{{credentials.paypal_express_api_password}}" stepKey="inputAPIPassword"/> - <fillField selector ="{{PayPalStandardConfigSection.signature(countryCode)}}" userInput="{{credentials.paypal_express_api_signature}}" stepKey="inputAPISignature"/> - <selectOption selector ="{{PayPalStandardConfigSection.sandboxMode(countryCode)}}" userInput="Yes" stepKey="enableSandboxMode"/> - <selectOption selector="{{PayPalStandardConfigSection.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableSolution"/> + <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"/> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterDropdownValuesActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminPaypalStandardPaylaterDefaultValuesCartPageActionGroup.xml similarity index 52% rename from app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterDropdownValuesActionGroup.xml rename to app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminPaypalStandardPaylaterDefaultValuesCartPageActionGroup.xml index 273265407158..f9ab3c09d41b 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterDropdownValuesActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertAdminPaypalStandardPaylaterDefaultValuesCartPageActionGroup.xml @@ -4,20 +4,19 @@ * 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="ValidatePaylaterDropdownValuesActionGroup"> + <actionGroup name="AssertAdminPaypalStandardPaylaterDefaultValuesCartPageActionGroup"> <annotations> <description>Validate the Default Dropdown values In Paylater</description> </annotations> <arguments> <argument name="countryCode" type="string" defaultValue="us"/> </arguments> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.styleLayout(countryCode)}}" userInput="Flex" stepKey="seeSelectedStylelayout"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.ratio(countryCode)}}" userInput="20x1" stepKey="seeSelectedRatio"/> - <seeOptionIsSelected selector="{{PayPalStandardConfigSection.color(countryCode)}}" userInput="Blue" stepKey="seeSelectedColor"/> + <seeOptionIsSelected selector="{{AdminPaypalStandardConfigSection.position(countryCode)}}" userInput="Header (center)" stepKey="seeSelectedPosition"/> + <seeOptionIsSelected selector="{{AdminPaypalStandardConfigSection.styleLayout(countryCode)}}" userInput="Flex" stepKey="seeSelectedStylelayout"/> + <seeOptionIsSelected selector="{{AdminPaypalStandardConfigSection.ratio(countryCode)}}" userInput="20x1" stepKey="seeSelectedRatio"/> + <seeOptionIsSelected selector="{{AdminPaypalStandardConfigSection.color(countryCode)}}" userInput="Blue" stepKey="seeSelectedColor"/> <waitForElementClickable selector="{{AdminConfigSection.saveButton}}" stepKey="waitForConfiguBtn" /> <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfiguration"/> </actionGroup> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontPaypalPaylaterActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontPaypalPaylaterActionGroup.xml new file mode 100644 index 000000000000..47b18338fcba --- /dev/null +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AssertStorefrontPaypalPaylaterActionGroup.xml @@ -0,0 +1,22 @@ +<?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="AssertStorefrontPaypalPaylaterActionGroup"> + <annotations> + <description>Goes to the 'Storefront Category' page for 'Paylater Message'. </description> + </annotations> + <waitForElementClickable selector="{{AdminPaypalStandardConfigSection.categoryClick}}" stepKey="waitForCategryToClickable"/> + <click selector ="{{AdminPaypalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryeButton"/> + <waitForPageLoad stepKey="waitForCategrypageTobeLoaded"/> + <waitForElementVisible selector="{{AdminPaypalStandardConfigSection.payPalFrame}}" stepKey="waitForElement"/> + <switchToIFrame selector="{{AdminPaypalStandardConfigSection.payPalFrame}}" stepKey="switchToBuyNowPaylaterIFrame"/> + <waitForElementVisible selector="{{AdminPaypalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyBuyNowPaylaterMessage"/> + <switchToIFrame stepKey="switchBackToMainPaypalFrame"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml deleted file mode 100644 index d05c04835369..000000000000 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePaylaterPaypalStandardActionGroup.xml +++ /dev/null @@ -1,27 +0,0 @@ -<!-- - /** - * 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="EnablePaylaterPaypalStandardActionGroup"> - <annotations> - <description>Enable Paypal Paylater Solution For Paypal Standard</description> - </annotations> - <arguments> - <argument name="countryCode" type="string" defaultValue="us"/> - </arguments> - <click selector="{{PayPalStandardConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/> - <selectOption selector="{{PayPalStandardConfigSection.enablePaylaterExperience(countryCode)}}" userInput="Yes" stepKey="EnablePaylaterExperience"/> - <waitForPageLoad stepKey="waitForAdvisepaylaterdropdown"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.advisePaylater(countryCode)}}" stepKey="waitForAdvisepaylaterClickable"/> - <click selector="{{PayPalStandardConfigSection.advisePaylater(countryCode)}}" stepKey="clickAdvisePaylater"/> - <selectOption selector="{{PayPalStandardConfigSection.enablePaypalPaylater(countryCode)}}" userInput="Yes" stepKey="EnablePaypallater"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.expandCategoryPage(countryCode)}}" stepKey="waitForcategorypageClickable"/> - <click selector="{{PayPalStandardConfigSection.expandCategoryPage(countryCode)}}" stepKey="clickCategoryPage"/> - <selectOption selector ="{{PayPalStandardConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplayforPaylaterCategory"/> - </actionGroup> -</actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml deleted file mode 100644 index 3eecec6424fb..000000000000 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/ValidatePaylaterInStorefrontActionGroup.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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="ValidatePaylaterInStorefrontActionGroup"> - <annotations> - <description>Goes to the 'Storefront Category' page for 'Paylater Message'. </description> - </annotations> - <waitForElementClickable selector="{{PayPalStandardConfigSection.categoryClick}}" stepKey="waitForCategryToClickable"/> - <click selector ="{{PayPalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryeButton"/> - <waitForPageLoad stepKey="waitForCategrypageTobeLoaded"/> - <waitForElementVisible selector="{{PayPalStandardConfigSection.payPalFrame}}" stepKey="waitForElement"/> - <switchToIFrame selector="{{PayPalStandardConfigSection.payPalFrame}}" stepKey="switchToBuyNowPaylaterIFrame"/> - <waitForElementVisible selector="{{PayPalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyBuyNowPaylaterMessage"/> - <switchToIFrame stepKey="switchBackToMainPaypalFrame"/> - </actionGroup> -</actionGroups> diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/AdminPaypalStandardConfigSection.xml similarity index 98% rename from app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml rename to app/code/Magento/Paypal/Test/Mftf/Section/AdminPaypalStandardConfigSection.xml index 384d6c7952c2..634e18c9f546 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalStandardConfigSection.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Section/AdminPaypalStandardConfigSection.xml @@ -7,7 +7,7 @@ --> <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> - <section name="PayPalStandardConfigSection"> + <section name="AdminPaypalStandardConfigSection"> <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express-head" parameterized="true"/> <element name="email" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout_business_account" parameterized="true"/> <element name="apiMethod" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout_api_authentication" parameterized="true"/> diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml index 0382257745ec..5c4d2071a4fa 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml @@ -15,6 +15,7 @@ <description value="Paypal Pay Later Message should display on Admin Category Page configuration"/> <severity value="CRITICAL"/> <testCaseId value="AC-5639"/> + <group value="3rd_party_integration"/> </annotations> <before> <createData entity="SimpleSubCategory" stepKey="simpleCategory"/> @@ -34,8 +35,8 @@ <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/> <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> </after> - <actionGroup ref="EnablePaylaterPaypalStandardActionGroup" stepKey="enablePaypalStandard"/> - <actionGroup ref="ValidatePaylaterDropdownValuesActionGroup" stepKey="verifyPaylaterDropdownVales"/> + <actionGroup ref="AdminEnablePaypalStandardPaylaterActionGroup" stepKey="enablePaypalStandard"/> + <actionGroup ref="AssertAdminPaypalStandardPaylaterDefaultValuesCartPageActionGroup" stepKey="verifyPaylaterDropdownVales"/> <!-- Reindex and cache flush --> <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex"> <argument name="indices" value=""/> @@ -45,7 +46,7 @@ </actionGroup> <!--Navigate to Storefront--> <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/> - <actionGroup ref="ValidatePaylaterInStorefrontActionGroup" stepKey="verifyPaylaterInStorefrontCategoryPage"/> + <actionGroup ref="AssertStorefrontPaypalPaylaterActionGroup" stepKey="verifyPaylaterInStorefrontCategoryPage"/> <!--Disable Paypal Standard--> <magentoCLI command="config:set {{DisablePaypalPayStandard.path}} {{DisablePaypalPayStandard.value}}" stepKey="disablePayPalStandard"/> <!-- Reindex and cache flush --> @@ -58,10 +59,10 @@ <!--Validate Paylater Message On Storefront Category Page--> <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFrontPage"/> <waitForPageLoad stepKey="waitForItemPage"/> - <waitForElementClickable selector="{{PayPalStandardConfigSection.categoryClick}}" stepKey="waitForCategoryToBeClickable"/> - <click selector ="{{PayPalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryTab"/> + <waitForElementClickable selector="{{AdminPaypalStandardConfigSection.categoryClick}}" stepKey="waitForCategoryToBeClickable"/> + <click selector ="{{AdminPaypalStandardConfigSection.categoryClick}}" stepKey="clickCatagoryTab"/> <waitForPageLoad stepKey="waitForCategoryPageTobeLoaded"/> - <waitForElementNotVisible selector="{{PayPalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyPaylaterMessageToBeDisappeared"/> + <waitForElementNotVisible selector="{{AdminPaypalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyPaylaterMessageToBeDisappeared"/> </test> </tests> From f49b5bedb24b41f0681a8e69873847470086b99a Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Wed, 22 May 2024 14:15:14 +0530 Subject: [PATCH 31/36] ACQE-6496:Configuration for paypal pay later on Category page Correction On stepKey verifyPaylaterDropdownValues --- .../Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml index 5c4d2071a4fa..3dfc667c5552 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml @@ -36,7 +36,7 @@ <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> </after> <actionGroup ref="AdminEnablePaypalStandardPaylaterActionGroup" stepKey="enablePaypalStandard"/> - <actionGroup ref="AssertAdminPaypalStandardPaylaterDefaultValuesCartPageActionGroup" stepKey="verifyPaylaterDropdownVales"/> + <actionGroup ref="AssertAdminPaypalStandardPaylaterDefaultValuesCartPageActionGroup" stepKey="verifyPaylaterDropdownValues"/> <!-- Reindex and cache flush --> <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex"> <argument name="indices" value=""/> From 25a89a53078b8989ae87f37fa20b2257df0d68b1 Mon Sep 17 00:00:00 2001 From: manjusha729 <93243302+manjusha729@users.noreply.github.com> Date: Thu, 23 May 2024 11:51:58 +0530 Subject: [PATCH 32/36] ACQE-6594 | [MFTF PR TESTS] StorefrontVerifyMultipleProductRatingsOnCategoryPageTest Modified the selector. --- .../Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml index 16bbfa4cbb57..6544a5b8020d 100644 --- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml +++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml @@ -10,7 +10,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> <section name="StorefrontPanelHeaderSection"> <element name="welcomeMessage" type="text" selector="header>.panel .greet.welcome" /> - <element name="createAnAccountLink" type="select" selector="//a[contains(.,'Create an Account')]" timeout="60"/> + <element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//div[@class='panel header']//li/a[contains(.,'Create an Account')]" timeout="60"/> <element name="notYouLink" type="button" selector=".greet.welcome span a"/> <element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/> <element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-name"/> From 0c77ed51c5765985252ff8d95b3b7a46f2ac3e5e Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Thu, 23 May 2024 13:24:05 +0530 Subject: [PATCH 33/36] ACQE-6562:Default configuration for Paypal Pay Later Message on Product Page Correction On stepKey configPayPalExpress --- .../Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml index 942d0175e4fa..e9deb4c730e2 100755 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigForPaylaterProductPageTest.xml @@ -16,10 +16,11 @@ <severity value="CRITICAL"/> <testCaseId value="AC-5602"/> <group value="3rd_party_integration"/> + <group value="pr_exclude"/> </annotations> <before> <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> - <actionGroup ref="AdminPayPalExpressCheckoutEnableActionGroup" stepKey="ConfigPayPalExpress"> + <actionGroup ref="AdminPayPalExpressCheckoutEnableActionGroup" stepKey="configPayPalExpress"> <argument name="credentials" value="SamplePaypalExpressConfig2"/> </actionGroup> </before> From 0f0ba2caf390bbb6f7f1e639ba79b8438bde4916 Mon Sep 17 00:00:00 2001 From: "subrat.pandit" <glo53878@adobe.com> Date: Thu, 23 May 2024 13:37:39 +0530 Subject: [PATCH 34/36] ACQE-6496:Configuration for paypal pay later on Category Page Correction On removing Empty lines In AdminConfigPaymentsStandardTest --- .../Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml index 3dfc667c5552..cb4265ba43d7 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsStandardTest.xml @@ -16,6 +16,7 @@ <severity value="CRITICAL"/> <testCaseId value="AC-5639"/> <group value="3rd_party_integration"/> + <group value="pr_exclude"/> </annotations> <before> <createData entity="SimpleSubCategory" stepKey="simpleCategory"/> @@ -65,6 +66,3 @@ <waitForElementNotVisible selector="{{AdminPaypalStandardConfigSection.paypalPaylaterMessage}}" stepKey="verifyPaylaterMessageToBeDisappeared"/> </test> </tests> - - - From 96019413a701fbaa721bdd4c466b101aef6a3747 Mon Sep 17 00:00:00 2001 From: manjusha729 <93243302+manjusha729@users.noreply.github.com> Date: Tue, 28 May 2024 11:30:26 +0530 Subject: [PATCH 35/36] ACQE-6583 | [MFTF TESTS] AdminReviewsByProductsReportTest Added waitForElementClickable to ensure the click to happen --- .../Test/Mftf/ActionGroup/AdminAddProductReviewActionGroup.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAddProductReviewActionGroup.xml b/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAddProductReviewActionGroup.xml index 9316194dcc78..4aaa0c3382a7 100644 --- a/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAddProductReviewActionGroup.xml +++ b/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAddProductReviewActionGroup.xml @@ -13,9 +13,10 @@ <argument name="sku" type="string"/> </arguments> <!--Click on Add New Review --> + <waitForElementClickable selector="{{AdminCreateNewReviewSection.addNewReviewButton}}" stepKey="waitForElementClickOnNewReviewToBeClickable"/> <click selector="{{AdminCreateNewReviewSection.addNewReviewButton}}" stepKey="clickOnNewReview"/> - <waitForElementVisible selector="{{AdminCreateNewReviewSection.addNewReviewBySKU(sku)}}" stepKey="waitForVisibleReviewButton"/> <!--Select Product by SKU and Create Review --> + <waitForElementClickable selector="{{AdminCreateNewReviewSection.addNewReviewBySKU(sku)}}" stepKey="waitForVisibleReviewButton"/> <click selector="{{AdminCreateNewReviewSection.addNewReviewBySKU(sku)}}" stepKey="addNewReviewBySKU"/> <waitForElementVisible selector="{{AdminCreateNewReviewSection.select_stores}}" stepKey="waitForVisibleReviewDetails"/> <selectOption selector="{{AdminCreateNewReviewSection.select_stores}}" userInput="{{review.select_stores[0]}}" stepKey="visibilityField"/> From 983a9e3a0d048a8b89430e19dd4ce1d9bbe4e7e2 Mon Sep 17 00:00:00 2001 From: sharuksyed <92149337+glo74186@users.noreply.github.com> Date: Fri, 31 May 2024 10:13:04 +0530 Subject: [PATCH 36/36] ACQE-5771 : Paypal payflow link configuration with valid credentials Removed duplicate element --- .../OtherPayPalPaymentsConfigSection.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection/OtherPayPalPaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection/OtherPayPalPaymentsConfigSection.xml index abac340afccd..6f5bcbfb7571 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection/OtherPayPalPaymentsConfigSection.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection/OtherPayPalPaymentsConfigSection.xml @@ -11,7 +11,6 @@ <element name="expandTab" type="button" selector="#payment_{{countryCode}}_other_paypal_payment_solutions-head" parameterized="true"/> <element name="expandTab1" type="button" selector="//a[@id='payment_{{countryCode}}_other_paypal_payment_solutions-head']" parameterized="true"/> <element name="expandedTab" type="button" selector="#payment_{{countryCode}}_other_paypal_payment_solutions-head.open" parameterized="true"/> - <element name="expandTab1" type="button" selector="//a[@id='payment_{{countryCode}}_other_paypal_payment_solutions-head']" parameterized="true"/> <element name="expandTabNew" type="button" selector="//a[@id='payment_{{countryCode}}_paypal_payment_gateways-head']" parameterized="true"/> <element name="expandedTabNew" type="button" selector="//a[@id='payment_{{countryCode}}_paypal_payment_gateways-head' and @class='open']" parameterized="true"/> </section>