From f232fbe1d4686ee514292b9609d218af68ae414f Mon Sep 17 00:00:00 2001 From: Dmitry Tsymbal Date: Fri, 23 Apr 2021 16:34:39 +0300 Subject: [PATCH 1/4] Captcha On Email To Friend Form --- ...aVisibleOnEmailToFriendFormActionGroup.xml | 21 +++++ ...lCaptchaOnEmailToFriendFormActionGroup.xml | 17 ++++ .../Test/Mftf/Data/CaptchaConfigData.xml | 6 ++ ...orefrontCaptchaOnEmailToFriendFormTest.xml | 89 +++++++++++++++++++ ...ToFriendButtonOnProductPageActionGroup.xml | 14 +++ ...ilButtonOnEmailToFriendFormActionGroup.xml | 15 ++++ ...llFieldsOnEmailToFriendFormActionGroup.xml | 26 ++++++ .../Catalog/Test/Mftf/Data/ConfigData.xml | 10 ++- .../Test/Mftf/Data/EmailToFriendData.xml | 15 ++++ .../StorefrontEmailToFriendSection.xml | 22 +++++ .../Section/StorefrontProductPageSection.xml | 1 + 11 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnEmailToFriendFormActionGroup.xml create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml create mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickEmailToFriendButtonOnProductPageActionGroup.xml create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup.xml create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontFillFieldsOnEmailToFriendFormActionGroup.xml create mode 100644 app/code/Magento/Catalog/Test/Mftf/Data/EmailToFriendData.xml create mode 100644 app/code/Magento/Catalog/Test/Mftf/Section/StorefrontEmailToFriendSection.xml diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnEmailToFriendFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnEmailToFriendFormActionGroup.xml new file mode 100644 index 0000000000000..5bdb05258c0ee --- /dev/null +++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnEmailToFriendFormActionGroup.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml new file mode 100644 index 0000000000000..10108b6dc224d --- /dev/null +++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml index 90f48c320f2ac..4bf98d6183ce3 100644 --- a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml +++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml @@ -139,4 +139,10 @@ ABCDEFGHJKMnpqrstuvwxyz23456789 ABCDEFGHJKMnpqrstuvwxyz23456789 + + customer/captcha/forms + 0 + Send To Friend Form + product_sendtofriend_form + diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml new file mode 100644 index 0000000000000..a1163e51acb30 --- /dev/null +++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml @@ -0,0 +1,89 @@ + + + + + + + + + + <description value="Customer should be able send email to friend about product with enabled captcha"/> + <severity value="MINOR"/> + <group value="captcha"/> + </annotations> + <before> + <createData entity="SimpleSubCategory" stepKey="createCategory"/> + <createData entity="SimpleProduct" stepKey="createProduct"> + <requiredEntity createDataKey="createCategory"/> + </createData> + <createData entity="Simple_US_Customer" stepKey="createCustomer"/> + <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength"/> + <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols"/> + <magentoCLI command="config:set {{StorefrontCaptchaOnEmailToFriendFormConfigData.path}} {{StorefrontCaptchaOnEmailToFriendFormConfigData.value}}" stepKey="enableEmailToFriendCaptcha"/> + <magentoCLI command="config:set {{StorefrontCustomerCaptchaModeAlwaysConfigData.path}} {{StorefrontCustomerCaptchaModeAlwaysConfigData.value}}" stepKey="setCaptchaAlwaysVisible"/> + <magentoCLI command="config:set {{EnableCatalogEmailToFriendOptionConfigData.path}} {{EnableCatalogEmailToFriendOptionConfigData.value}}" stepKey="enableSendToFriend"/> + <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches"> + <argument name="tags" value="config full_page"/> + </actionGroup> + </before> + <after> + <deleteData createDataKey="createCategory" stepKey="deleteCategory"/> + <deleteData createDataKey="createProduct" stepKey="deleteProduct"/> + <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/> + <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/> + <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength"/> + <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols"/> + <magentoCLI command="config:set {{StorefrontCustomerCaptchaModeAfterFailConfigData.path}} {{StorefrontCustomerCaptchaModeAfterFailConfigData.value}}" stepKey="setCaptchaDefaultVisibility"/> + <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerLoginConfigData.path}} {{StorefrontCaptchaOnCustomerLoginConfigData.value}},{{StorefrontCaptchaOnCustomerForgotPasswordConfigData.value}}" stepKey="enableCaptchaOnDefaultForms"/> + <magentoCLI command="config:set {{DisableCatalogEmailToFriendOptionConfigData.path}} {{DisableCatalogEmailToFriendOptionConfigData.value}}" stepKey="disableSendToFriend"/> + <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches"> + <argument name="tags" value="config full_page"/> + </actionGroup> + </after> + + <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount"> + <argument name="Customer" value="$createCustomer$"/> + </actionGroup> + <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openProductFromCategory"> + <argument name="category" value="$createCategory$"/> + <argument name="product" value="$createProduct$"/> + </actionGroup> + <actionGroup ref="StorefrontClickEmailToFriendButtonOnProductPageActionGroup" stepKey="clickEmailButton"/> + <actionGroup ref="AssertCaptchaVisibleOnEmailToFriendFormActionGroup" stepKey="seeCaptchaOnEmailToFriendForm"/> + <actionGroup ref="StorefrontFillFieldsOnEmailToFriendFormActionGroup" stepKey="fillFieldsOnForm"> + <argument name="senderName" value="{{Simple_US_Customer.firstname}}"/> + <argument name="senderEmail" value="{{Simple_US_Customer.email}}"/> + <argument name="message" value="{{EmailToFriendValidValues.shareInfo_message}}"/> + <argument name="recipientName" value="{{EmailToFriendValidValues.recipient_name}}"/> + <argument name="recipientEmail" value="{{EmailToFriendValidValues.shareInfo_email}}"/> + </actionGroup> + <actionGroup ref="StorefrontFillCaptchaOnEmailToFriendForm" stepKey="fillCaptchaFieldWithIncorrectValues"> + <argument name="captcha" value="{{WrongCaptcha.value}}"/> + </actionGroup> + <actionGroup ref="StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup" stepKey="submitEmailToFriendForm"/> + <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertErrorMessage"> + <argument name="message" value="Incorrect CAPTCHA"/> + <argument name="messageType" value="error"/> + </actionGroup> + <actionGroup ref="StorefrontFillFieldsOnEmailToFriendFormActionGroup" stepKey="fillFieldsOnEmailToFriendForm"> + <argument name="senderName" value="{{Simple_US_Customer.firstname}}"/> + <argument name="senderEmail" value="{{Simple_US_Customer.email}}"/> + <argument name="message" value="{{EmailToFriendValidValues.shareInfo_message}}"/> + <argument name="recipientName" value="{{EmailToFriendValidValues.recipient_name}}"/> + <argument name="recipientEmail" value="{{EmailToFriendValidValues.shareInfo_email}}"/> + </actionGroup> + <actionGroup ref="StorefrontFillCaptchaOnEmailToFriendForm" stepKey="fillCaptchaFieldWithCorrectValues"> + <argument name="captcha" value="{{PreconfiguredCaptcha.value}}"/> + </actionGroup> + <actionGroup ref="StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup" stepKey="submitEmailToFriendFormWithValidValues"/> + <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertSuccessMessage"> + <argument name="message" value="The link to a friend was sent."/> + </actionGroup> + </test> +</tests> diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickEmailToFriendButtonOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickEmailToFriendButtonOnProductPageActionGroup.xml new file mode 100644 index 0000000000000..b7b48699a39b1 --- /dev/null +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickEmailToFriendButtonOnProductPageActionGroup.xml @@ -0,0 +1,14 @@ +<?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="StorefrontClickEmailToFriendButtonOnProductPageActionGroup"> + <click selector="{{StorefrontProductPageSection.email}}" stepKey="clickEmailToFriendButton"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup.xml new file mode 100644 index 0000000000000..5784da8e27e9e --- /dev/null +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup.xml @@ -0,0 +1,15 @@ +<?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="StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup"> + <click selector="{{StorefrontEmailToFriendSection.sendEmail}}" stepKey="sendEmail"/> + <waitForPageLoad stepKey="waitForPageLoad"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontFillFieldsOnEmailToFriendFormActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontFillFieldsOnEmailToFriendFormActionGroup.xml new file mode 100644 index 0000000000000..1c1c2afa1b72d --- /dev/null +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontFillFieldsOnEmailToFriendFormActionGroup.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="StorefrontFillFieldsOnEmailToFriendFormActionGroup"> + <arguments> + <argument name="senderName" type="string"/> + <argument name="senderEmail" type="string"/> + <argument name="message" type="string"/> + <argument name="recipientName" type="string"/> + <argument name="recipientEmail" type="string"/> + </arguments> + + <fillField userInput="{{senderName}}" selector="{{StorefrontEmailToFriendSection.name}}" stepKey="fillSenderName"/> + <fillField userInput="{{senderEmail}}" selector="{{StorefrontEmailToFriendSection.email}}" stepKey="fillSenderEmail"/> + <fillField userInput="{{message}}" selector="{{StorefrontEmailToFriendSection.message}}" stepKey="fillMessageField"/> + <fillField userInput="{{recipientName}}" selector="{{StorefrontEmailToFriendSection.recipientName}}" stepKey="fillRecipientName"/> + <fillField userInput="{{recipientEmail}}" selector="{{StorefrontEmailToFriendSection.recipientEmail}}" stepKey="fillRecipientEmail"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ConfigData.xml index 35c5c8ac3c866..e018e904a5030 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Data/ConfigData.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Data/ConfigData.xml @@ -16,4 +16,12 @@ <data key="path">catalog/layered_navigation/display_category</data> <data key="value">0</data> </entity> -</entities> \ No newline at end of file + <entity name="EnableCatalogEmailToFriendOptionConfigData"> + <data key="path">sendfriend/email/enabled</data> + <data key="value">1</data> + </entity> + <entity name="DisableCatalogEmailToFriendOptionConfigData"> + <data key="path">sendfriend/email/enabled</data> + <data key="value">0</data> + </entity> +</entities> diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/EmailToFriendData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/EmailToFriendData.xml new file mode 100644 index 0000000000000..3221ac9d24ab4 --- /dev/null +++ b/app/code/Magento/Catalog/Test/Mftf/Data/EmailToFriendData.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd"> + <entity name="EmailToFriendValidValues" type="emailToFFriend"> + <data key="shareInfo_message">Sharing message.</data> + <data key="shareInfo_email">JohnDoe123456789@example.com</data> + <data key="recipient_name">John</data> + </entity> +</entities> diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontEmailToFriendSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontEmailToFriendSection.xml new file mode 100644 index 0000000000000..94909bf966bfd --- /dev/null +++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontEmailToFriendSection.xml @@ -0,0 +1,22 @@ +<?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="StorefrontEmailToFriendSection"> + <element name="name" type="input" selector="#sender-name.input-text"/> + <element name="email" type="input" selector="#sender-email.input-text"/> + <element name="message" type="input" selector="#sender-message.input-text"/> + <element name="recipientName" type="input" selector="#recipients-name0.input-text"/> + <element name="recipientEmail" type="input" selector="#recipients-email0.input-text"/> + <element name="sendEmail" type="button" selector=".action.submit.primary"/> + <element name="captchaField" type="input" selector="#product-sendtofriend-form input[name='captcha[product_sendtofriend_form]']" /> + <element name="captchaImg" type="block" selector="#product-sendtofriend-form img.captcha-img"/> + <element name="captchaReload" type="block" selector="#product-sendtofriend-form button.captcha-reload"/> + </section> +</sections> diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml index 7be02126e3a0f..e6d3376db7096 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml @@ -16,6 +16,7 @@ <element name="alertMessage" type="text" selector=".page.messages [role=alert]"/> <element name="messagesBlock" type="text" selector=".page.messages" timeout="30"/> <element name="addToWishlist" type="button" selector="//a[@class='action towishlist']" timeout="30"/> + <element name="email" type="button" selector=".action.mailto.friend"/> <element name="customTextOptionInput" type="input" selector=".input-text.product-custom-option"/> <element name="charCounter" type="text" selector=".character-counter"/> <element name="tax" type="input" selector=".totals-tax .amount .price"/> From 024a68dfe16196855d36049b785214fa10efa3a4 Mon Sep 17 00:00:00 2001 From: engcom-Dash <grp-engcom-vendorworker-Dash@adobe.com> Date: Fri, 6 Dec 2024 20:00:35 +0530 Subject: [PATCH 2/4] 32830: fix mftf test cases and static failures --- ...ertCaptchaVisibleOnEmailToFriendFormActionGroup.xml | 8 ++++---- ...efrontFillCaptchaOnEmailToFriendFormActionGroup.xml | 8 ++++---- .../Captcha/Test/Mftf/Data/CaptchaConfigData.xml | 9 +++++---- .../Test/StorefrontCaptchaOnEmailToFriendFormTest.xml | 8 ++++---- ...lickEmailToFriendButtonOnProductPageActionGroup.xml | 8 ++++---- ...ckSendEmailButtonOnEmailToFriendFormActionGroup.xml | 8 ++++---- ...refrontFillFieldsOnEmailToFriendFormActionGroup.xml | 8 ++++---- app/code/Magento/Catalog/Test/Mftf/Data/ConfigData.xml | 10 ++++++---- .../Catalog/Test/Mftf/Data/EmailToFriendData.xml | 8 ++++---- .../Mftf/Section/StorefrontEmailToFriendSection.xml | 8 ++++---- .../Test/Mftf/Section/StorefrontProductPageSection.xml | 8 ++++---- 11 files changed, 47 insertions(+), 44 deletions(-) diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnEmailToFriendFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnEmailToFriendFormActionGroup.xml index 5bdb05258c0ee..4dfc8e3a3ee3f 100644 --- a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnEmailToFriendFormActionGroup.xml +++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnEmailToFriendFormActionGroup.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ +/** + * Copyright 2021 Adobe + * All Rights Reserved. + */ --> <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml index 10108b6dc224d..08171179cf71d 100644 --- a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml +++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ +/** + * Copyright 2021 Adobe + * All Rights Reserved. + */ --> <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml index 6cf49a87bba7e..c85d742c5c286 100644 --- a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml +++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ +/** + * Copyright 2019 Adobe + * All Rights Reserved. + */ --> <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -168,6 +168,7 @@ <data key="scope_id">0</data> <data key="label">Send To Friend Form</data> <data key="value">product_sendtofriend_form</data> + </entity> <entity name="AdminCaptchaForgotPasswordFormConfigData"> <!-- Magento default value --> <data key="path">admin/captcha/forms</data> diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml index a1163e51acb30..83d2231122d3a 100644 --- a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml +++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ +/** + * Copyright 2021 Adobe + * All Rights Reserved. + */ --> <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickEmailToFriendButtonOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickEmailToFriendButtonOnProductPageActionGroup.xml index b7b48699a39b1..47145319a3de5 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickEmailToFriendButtonOnProductPageActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickEmailToFriendButtonOnProductPageActionGroup.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ +/** + * Copyright 2021 Adobe + * All Rights Reserved. + */ --> <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup.xml index 5784da8e27e9e..3deb56877df23 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ +/** + * Copyright 2021 Adobe + * All Rights Reserved. + */ --> <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontFillFieldsOnEmailToFriendFormActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontFillFieldsOnEmailToFriendFormActionGroup.xml index 1c1c2afa1b72d..2f4d5f22a1be1 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontFillFieldsOnEmailToFriendFormActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontFillFieldsOnEmailToFriendFormActionGroup.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ +/** + * Copyright 2021 Adobe + * All Rights Reserved. + */ --> <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ConfigData.xml index ecc14c1e8a7b2..131101e797d7f 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Data/ConfigData.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Data/ConfigData.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ +/** + * Copyright 2021 Adobe + * All Rights Reserved. + */ --> <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -22,6 +22,8 @@ </entity> <entity name="DisableCatalogEmailToFriendOptionConfigData"> <data key="path">sendfriend/email/enabled</data> + <data key="value">0</data> + </entity> <entity name="AllowGuestsToWriteReviewsConfigData"> <!-- Magento Default Value --> <data key="path">catalog/review/allow_guest</data> diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/EmailToFriendData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/EmailToFriendData.xml index 3221ac9d24ab4..fe1ca47e57f79 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Data/EmailToFriendData.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Data/EmailToFriendData.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ +/** + * Copyright 2021 Adobe + * All Rights Reserved. + */ --> <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd"> diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontEmailToFriendSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontEmailToFriendSection.xml index 94909bf966bfd..c56454ea5f477 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontEmailToFriendSection.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontEmailToFriendSection.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ +/** + * Copyright 2021 Adobe + * All Rights Reserved. + */ --> <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml index 13e4e04e05d06..8c615e557c3e2 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ +/** + * Copyright 2018 Adobe + * All Rights Reserved. + */ --> <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" From be8ab096a6ecf4cc3e1c1d6f8823f834a95c8384 Mon Sep 17 00:00:00 2001 From: engcom-Dash <grp-engcom-vendorworker-Dash@adobe.com> Date: Mon, 9 Dec 2024 11:47:30 +0530 Subject: [PATCH 3/4] 32830: fix action group name --- .../StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml index 08171179cf71d..6697713b5320d 100644 --- a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml +++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaOnEmailToFriendFormActionGroup.xml @@ -8,7 +8,7 @@ <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - <actionGroup name="StorefrontFillCaptchaOnEmailToFriendForm"> + <actionGroup name="StorefrontFillCaptchaOnEmailToFriendFormActionGroup"> <arguments> <argument name="captcha" type="string"/> </arguments> From 53a18e1dada4065f92333bc8bd9e9e270de439af Mon Sep 17 00:00:00 2001 From: engcom-Dash <grp-engcom-vendorworker-Dash@adobe.com> Date: Mon, 9 Dec 2024 16:37:52 +0530 Subject: [PATCH 4/4] 32830: update action group name in test --- .../Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml index 83d2231122d3a..bb1a963abebb7 100644 --- a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml +++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnEmailToFriendFormTest.xml @@ -63,7 +63,7 @@ <argument name="recipientName" value="{{EmailToFriendValidValues.recipient_name}}"/> <argument name="recipientEmail" value="{{EmailToFriendValidValues.shareInfo_email}}"/> </actionGroup> - <actionGroup ref="StorefrontFillCaptchaOnEmailToFriendForm" stepKey="fillCaptchaFieldWithIncorrectValues"> + <actionGroup ref="StorefrontFillCaptchaOnEmailToFriendFormActionGroup" stepKey="fillCaptchaFieldWithIncorrectValues"> <argument name="captcha" value="{{WrongCaptcha.value}}"/> </actionGroup> <actionGroup ref="StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup" stepKey="submitEmailToFriendForm"/> @@ -78,7 +78,7 @@ <argument name="recipientName" value="{{EmailToFriendValidValues.recipient_name}}"/> <argument name="recipientEmail" value="{{EmailToFriendValidValues.shareInfo_email}}"/> </actionGroup> - <actionGroup ref="StorefrontFillCaptchaOnEmailToFriendForm" stepKey="fillCaptchaFieldWithCorrectValues"> + <actionGroup ref="StorefrontFillCaptchaOnEmailToFriendFormActionGroup" stepKey="fillCaptchaFieldWithCorrectValues"> <argument name="captcha" value="{{PreconfiguredCaptcha.value}}"/> </actionGroup> <actionGroup ref="StorefrontClickSendEmailButtonOnEmailToFriendFormActionGroup" stepKey="submitEmailToFriendFormWithValidValues"/>