From de6ade50adc1390574fd9f4164a97edf989911db Mon Sep 17 00:00:00 2001 From: shanthi Date: Wed, 3 Jan 2024 15:14:11 +0530 Subject: [PATCH 01/24] ACQE-5193: Added files --- .../AdminExpandCurrencyOptionsActionGroup.xml | 15 +++++++++++++++ ...dminNavigateToCurrencySetupPageActionGroup.xml | 15 +++++++++++++++ .../AdminSetDefaultCurrencyActionGroup.xml | 2 +- .../Test/Mftf/Section/CurrencySetupSection.xml | 4 ++-- .../AdminOrderDetailsInformationSection.xml | 1 + 5 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminExpandCurrencyOptionsActionGroup.xml create mode 100644 app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminNavigateToCurrencySetupPageActionGroup.xml diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminExpandCurrencyOptionsActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminExpandCurrencyOptionsActionGroup.xml new file mode 100644 index 000000000000..d54952e5af94 --- /dev/null +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminExpandCurrencyOptionsActionGroup.xml @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminNavigateToCurrencySetupPageActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminNavigateToCurrencySetupPageActionGroup.xml new file mode 100644 index 000000000000..c1f0cd004a59 --- /dev/null +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminNavigateToCurrencySetupPageActionGroup.xml @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml index 280f84612a6b..804632440fc3 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml @@ -13,7 +13,7 @@ - + diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml index 093bcc9cabfb..ee3800732fea 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml @@ -14,8 +14,8 @@ - - + + diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml index 752a3489d672..dd669974d4e4 100644 --- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml +++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml @@ -26,5 +26,6 @@ + From ddb1c4e3c7d21b2f68d51a4c11f96fb243d23118 Mon Sep 17 00:00:00 2001 From: shanthi Date: Wed, 3 Jan 2024 15:19:42 +0530 Subject: [PATCH 02/24] ACQE-Removed unwanted files --- ...vancedFixedPricingWithIndexActionGroup.xml | 19 ------------- ...yInAdvancedPricingWithIndexActionGroup.xml | 28 ------------------- 2 files changed, 47 deletions(-) delete mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductSetAdvancedFixedPricingWithIndexActionGroup.xml delete mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUpdateQuantityInAdvancedPricingWithIndexActionGroup.xml diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductSetAdvancedFixedPricingWithIndexActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductSetAdvancedFixedPricingWithIndexActionGroup.xml deleted file mode 100644 index 5c82deb1542f..000000000000 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductSetAdvancedFixedPricingWithIndexActionGroup.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - Sets the provided Advanced Fixed Pricing on the Admin Product creation/edit page. - - - - - - \ No newline at end of file diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUpdateQuantityInAdvancedPricingWithIndexActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUpdateQuantityInAdvancedPricingWithIndexActionGroup.xml deleted file mode 100644 index 8494e84e79b7..000000000000 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUpdateQuantityInAdvancedPricingWithIndexActionGroup.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - Update quantity in Advanced Pricing on the Admin Product creation/edit page. - - - - - - - - - - - - - - - From e24413c09b38b9d20f679b865ac40e8105080de9 Mon Sep 17 00:00:00 2001 From: shanthi Date: Wed, 3 Jan 2024 15:36:12 +0530 Subject: [PATCH 03/24] ACQE-5193: Removed unwanted files --- .../Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml | 4 ++-- .../CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml index 804632440fc3..10005d5c6aee 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml @@ -13,7 +13,7 @@ - + - + \ No newline at end of file diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml index ee3800732fea..55f4ac9167b9 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml @@ -14,8 +14,6 @@ - - From f6d50b76d51f0bb8092874477a970a7c020f00b3 Mon Sep 17 00:00:00 2001 From: shanthi Date: Wed, 3 Jan 2024 15:38:18 +0530 Subject: [PATCH 04/24] ACQE-5193: Modified files --- .../Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml | 2 +- .../CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml index 10005d5c6aee..da5d21d93564 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml index 55f4ac9167b9..ee3800732fea 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml @@ -14,6 +14,8 @@ + + From 454335536800c301492eaad8d330a07802506cbf Mon Sep 17 00:00:00 2001 From: shanthi Date: Wed, 3 Jan 2024 16:49:56 +0530 Subject: [PATCH 05/24] Removed unwanted file --- .../AdminSetDefaultCurrencyActionGroup.xml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml deleted file mode 100644 index da5d21d93564..000000000000 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file From cc593bc4d4b18f2658d48f906b6f06f3c138e9f8 Mon Sep 17 00:00:00 2001 From: shanthi Date: Wed, 3 Jan 2024 16:52:17 +0530 Subject: [PATCH 06/24] Modified file --- .../CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml index ee3800732fea..093bcc9cabfb 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml @@ -14,8 +14,8 @@ - - + + From b32c66b16f0db4dacbfefe7b1896225127ed960c Mon Sep 17 00:00:00 2001 From: shanthi Date: Wed, 3 Jan 2024 20:17:18 +0530 Subject: [PATCH 07/24] ACQE-5193: AdminSetDefaultCurrencyActionGroup --- .../AdminSetDefaultCurrencyActionGroup.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml new file mode 100644 index 000000000000..943579fa2687 --- /dev/null +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml @@ -0,0 +1,22 @@ + + + + + + + + Admin uncheck default currency option. + + + + + + + + \ No newline at end of file From 05346649a485cc285b3c26fbb7f9c68c0622c064 Mon Sep 17 00:00:00 2001 From: Shanthi <103998768+glo25731@users.noreply.github.com> Date: Wed, 3 Jan 2024 20:17:52 +0530 Subject: [PATCH 08/24] Update AdminSetDefaultCurrencyActionGroup.xml --- .../Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml index 943579fa2687..0cb94f5cce3b 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml @@ -19,4 +19,4 @@ - \ No newline at end of file + From 7462348530afe6f22b18a12fad9c03265936c53e Mon Sep 17 00:00:00 2001 From: Keerthana SL Date: Wed, 10 Jan 2024 17:57:12 +0530 Subject: [PATCH 09/24] ACQE-5193 : Merging code to avoid dependency error --- ...RateForQuotesInStatusesOrderedAndClosedTest.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml new file mode 100644 index 000000000000..23dc8a237549 --- /dev/null +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml @@ -0,0 +1,14 @@ + + + + + + + + From 00cb9769c71faafddf9d80d4c9d4a1e6467ba1d6 Mon Sep 17 00:00:00 2001 From: Keerthana SL Date: Wed, 10 Jan 2024 18:46:21 +0530 Subject: [PATCH 10/24] ACQE-5193 : Adding annotations for static test failure fix --- ...CurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml index 23dc8a237549..79f5092844e5 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml @@ -9,6 +9,13 @@ + + + + <description value="Update currency rate for created quotes in statuses Ordered and Closed"/> + <severity value="MAJOR"/> + <testCaseId value="B2B-1506"/> + </annotations> <actionGroup ref="AdminExpandCurrencyOptionsActionGroup" stepKey="openCurrencyOptions"/> </test> </tests> From a046bf7383ac60dfd6803215e73d79fef501ec52 Mon Sep 17 00:00:00 2001 From: Keerthana SL <glo81187@adobe.com> Date: Wed, 10 Jan 2024 19:39:41 +0530 Subject: [PATCH 11/24] ACQE-5193 : Updated merging in before tag --- ...ateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml index 79f5092844e5..7b323aa79784 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml @@ -16,6 +16,8 @@ <severity value="MAJOR"/> <testCaseId value="B2B-1506"/> </annotations> - <actionGroup ref="AdminExpandCurrencyOptionsActionGroup" stepKey="openCurrencyOptions"/> + <before> + <actionGroup ref="AdminExpandCurrencyOptionsActionGroup" stepKey="openCurrencyOptions"/> + </before> </test> </tests> From 595ca34a6f9941db0a58129068ac88d70991caf6 Mon Sep 17 00:00:00 2001 From: Keerthana SL <glo81187@adobe.com> Date: Fri, 12 Jan 2024 08:55:08 +0530 Subject: [PATCH 12/24] ACQE-5193 : Moving a logical set of code to currency symbol module --- ...orQuotesInStatusesOrderedAndClosedTest.xml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml index 7b323aa79784..0154bc0e1ef1 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml @@ -17,7 +17,28 @@ <testCaseId value="B2B-1506"/> </annotations> <before> + <!--Login to backend--> + <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin" before="navigateToConfigCurrencySetupPage1"/> + <!--Setup currencies --> + <actionGroup ref="AdminNavigateToCurrencySetupPageActionGroup" stepKey="navigateToConfigCurrencySetupPage1"/> <actionGroup ref="AdminExpandCurrencyOptionsActionGroup" stepKey="openCurrencyOptions"/> + <actionGroup ref="AdminSetBaseCurrencyActionGroup" stepKey="setBaseCurrencyUSD"> + <argument name="currency" value="US Dollar"/> + </actionGroup> + <selectOption selector="{{CurrencySetupSection.baseCurrency}}" userInput="US Dollar" stepKey="setBaseCurrencyField"/> + <uncheckOption selector="{{CurrencySetupSection.allowcurrenciescheckbox}}" stepKey="UnCheckUseDefaultOptionForAllowedCurrencies"/> + <selectOption selector="{{CurrencySetupSection.allowCurrencies}}" parameterArray="['Euro', 'US Dollar']" stepKey="selectCurrencies"/> + <scrollToTopOfPage stepKey="scrollToTopOfPage" /> + <actionGroup ref="AdminSetDefaultCurrencyActionGroup" stepKey="setDefaultCurrencyEUR"> + <argument name="currency" value="Euro"/> + </actionGroup> + <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveStoreConfiguration"/> + <!--<click stepKey="saveConfigs" selector="{{AdminConfigSection.saveButton}}"/>--> + <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/> + <waitForText selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/> + <!--Go to Configuration -> Currency Setup--> + <actionGroup ref="AdminOpenCurrencyRatesPageActionGroup" stepKey="gotToCurrencyRatesPage"/> + <actionGroup ref="AdminImportCurrencyRatesActionGroup" stepKey="importCurrencyRates"/> </before> </test> </tests> From 12168e25783e0d7fa92663125f3743ecf1a48a4c Mon Sep 17 00:00:00 2001 From: Shanthi <103998768+glo25731@users.noreply.github.com> Date: Wed, 17 Jan 2024 15:40:00 +0530 Subject: [PATCH 13/24] Update UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml --- ...pdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml index 0154bc0e1ef1..91a9cd801d45 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml @@ -18,7 +18,7 @@ </annotations> <before> <!--Login to backend--> - <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin" before="navigateToConfigCurrencySetupPage1"/> + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin" before="navigateToConfigCurrencySetupPage1"/> <!--Setup currencies --> <actionGroup ref="AdminNavigateToCurrencySetupPageActionGroup" stepKey="navigateToConfigCurrencySetupPage1"/> <actionGroup ref="AdminExpandCurrencyOptionsActionGroup" stepKey="openCurrencyOptions"/> From 8cc101ba277702c2147fac925109d5bc66b54042 Mon Sep 17 00:00:00 2001 From: Shanthi <103998768+glo25731@users.noreply.github.com> Date: Thu, 18 Jan 2024 16:27:47 +0530 Subject: [PATCH 14/24] Update UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml --- ...ateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml index 91a9cd801d45..d35d9d349362 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml @@ -18,9 +18,9 @@ </annotations> <before> <!--Login to backend--> - <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin" before="navigateToConfigCurrencySetupPage1"/> + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> <!--Setup currencies --> - <actionGroup ref="AdminNavigateToCurrencySetupPageActionGroup" stepKey="navigateToConfigCurrencySetupPage1"/> + <actionGroup ref="AdminNavigateToCurrencySetupPageActionGroup" stepKey="navigateToConfigCurrencySetupPage"/> <actionGroup ref="AdminExpandCurrencyOptionsActionGroup" stepKey="openCurrencyOptions"/> <actionGroup ref="AdminSetBaseCurrencyActionGroup" stepKey="setBaseCurrencyUSD"> <argument name="currency" value="US Dollar"/> From a7d35b93f1ff17d08fb65239d1db1028cda14564 Mon Sep 17 00:00:00 2001 From: mohit-adobe <84013331+mohit-adobe@users.noreply.github.com> Date: Wed, 7 Feb 2024 09:59:40 +0530 Subject: [PATCH 15/24] Update ClickPlaceOrderActionGroup.xml --- .../Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml index f2fff4af4814..c5529f66e9ae 100644 --- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml +++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml @@ -16,6 +16,6 @@ <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/> <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/> <waitForPageLoad stepKey="waitForCheckout"/> - <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/> + <waitForElementVisible selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/> </actionGroup> </actionGroups> From bf1291aa21ed95b41525d9c34e98e7dd24fe78bd Mon Sep 17 00:00:00 2001 From: mohit-adobe <84013331+mohit-adobe@users.noreply.github.com> Date: Wed, 7 Feb 2024 10:18:55 +0530 Subject: [PATCH 16/24] Update ClickPlaceOrderActionGroup.xml --- .../Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml index c5529f66e9ae..76817d0b7c8d 100644 --- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml +++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml @@ -16,6 +16,6 @@ <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/> <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/> <waitForPageLoad stepKey="waitForCheckout"/> - <waitForElementVisible selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/> + <waitForText selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/> </actionGroup> </actionGroups> From 1efffa46619e948cb6810f243510d511a5d1cf8f Mon Sep 17 00:00:00 2001 From: manjusha729 <93243302+manjusha729@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:30:40 +0530 Subject: [PATCH 17/24] ACQE-6082 : Test Fix --- ...pplyTaxesAndFptForSimpleProductWithCanadianPstOriginTest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Tax/Test/Mftf/Test/ApplyTaxesAndFptForSimpleProductWithCanadianPstOriginTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/ApplyTaxesAndFptForSimpleProductWithCanadianPstOriginTest.xml index 6cab1fc9b358..23825afd53a2 100644 --- a/app/code/Magento/Tax/Test/Mftf/Test/ApplyTaxesAndFptForSimpleProductWithCanadianPstOriginTest.xml +++ b/app/code/Magento/Tax/Test/Mftf/Test/ApplyTaxesAndFptForSimpleProductWithCanadianPstOriginTest.xml @@ -34,6 +34,8 @@ </actionGroup> <!-- Login as Admin --> <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> + <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="navigateToTaxRatesPage"/> + <actionGroup ref="AdminDeleteMultipleTaxRatesActionGroup" stepKey="deleteAllNonDefaultTaxRates"/> <!-- change tax classes configuration --> <actionGroup ref="SetTaxClassForShippingActionGroup" stepKey="setTaxClass"/> <actionGroup ref="AdminChangeTaxAndFptConfigActionGroup" stepKey="changeTaxConfigs"/> From e327c00f327b8b9662b59db13e82dc7bf2306be6 Mon Sep 17 00:00:00 2001 From: nikhilsharma-adobe <glo01481@adobe.com> Date: Thu, 29 Feb 2024 10:42:30 +0530 Subject: [PATCH 18/24] adding wait for element in StorefrontRegisterCustomerWithCustomerImageAttributeTest --- .../StorefrontCreateCustomerSignedUpNewsletterActionGroup.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCreateCustomerSignedUpNewsletterActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCreateCustomerSignedUpNewsletterActionGroup.xml index 22a90fca78cb..6bbc3be5de1d 100644 --- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCreateCustomerSignedUpNewsletterActionGroup.xml +++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCreateCustomerSignedUpNewsletterActionGroup.xml @@ -18,6 +18,7 @@ <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/> <waitForPageLoad stepKey="waitForNavigateToCustomersPageLoad"/> + <waitForElementClickable selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="waitForCreateAnAccountLink"/> <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/> <fillField stepKey="fillFirstName" userInput="{{customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/> <fillField stepKey="fillLastName" userInput="{{customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/> From 14dce8bb76e740344371638ab1c39920688de9a8 Mon Sep 17 00:00:00 2001 From: nikhilsharma-adobe <glo01481@adobe.com> Date: Mon, 18 Mar 2024 11:25:53 +0530 Subject: [PATCH 19/24] ACQE-6303: change address value and actiongroup name --- ...dateDynamicChangeOfShippingRateForGuestUserTest.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StoreFrontValidateDynamicChangeOfShippingRateForGuestUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StoreFrontValidateDynamicChangeOfShippingRateForGuestUserTest.xml index 415b9e93109b..a9a6e7c7468c 100644 --- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StoreFrontValidateDynamicChangeOfShippingRateForGuestUserTest.xml +++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StoreFrontValidateDynamicChangeOfShippingRateForGuestUserTest.xml @@ -57,11 +57,11 @@ <actionGroup ref="OpenStoreFrontCheckoutShippingPageActionGroup" stepKey="goToShippingPage"/> <!-- Guest checkout --> <actionGroup ref="FillGuestCheckoutShippingAddressFormActionGroup" stepKey="goToShippingAndFillDetails"> - <argument name="customerAddress" value="US_CA_Address"/> + <argument name="customerAddress" value="US_Address_CA"/> </actionGroup> <selectOption selector="{{CheckoutShippingSection.region}}" userInput="California" stepKey="fillStateField"/> <waitForPageLoad stepKey="waitForChangeAfterStateLoad"/> - <actionGroup ref="CheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethod"/> + <actionGroup ref="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethod"/> <waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodDhlLabel}}" stepKey="waitForDHLLabelVisible"/> <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodDhlWorldWideExpress}}" stepKey="waitForDHLPriceNotVisibleAfterStateChange"/> <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingNotVisible"/> @@ -69,7 +69,7 @@ <!-- Change country value --> <selectOption selector="{{CheckoutShippingSection.country}}" userInput="Afghanistan" stepKey="fillCountryField"/> <waitForPageLoad stepKey="waitForChangeAfterCountryLoad"/> - <actionGroup ref="CheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterCountryChange"/> + <actionGroup ref="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterCountryChange"/> <waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingVisibleAfterCountryChange"/> <waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="waitForFreeShippingLabelVisibleAfterCountryChange"/> <waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodDhlLabel}}" stepKey="waitForDHLLabelVisibleAfterCountryChange"/> @@ -79,10 +79,10 @@ <selectOption selector="{{CheckoutShippingSection.country}}" userInput="United Kingdom" stepKey="fillCountry"/> <fillField selector="{{CheckoutShippingSection.city}}" userInput="London" stepKey="fillCity"/> <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="N14 5JP" stepKey="fillPostcode"/> - <actionGroup ref="CheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterNewData"/> + <actionGroup ref="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterNewData"/> <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingVisibleAfterNewFormData"/> <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="waitForFreeShippingLabelVisibleAfterNewFormData"/> - <actionGroup ref="VerifyDHLShippingMethodIsVisibilityActionGroup" stepKey="dhlShippingVisibility"/> + <actionGroup ref="StorefrontVerifyDHLShippingMethodIsVisibilityActionGroup" stepKey="dhlShippingVisibility"/> <after> <deleteData createDataKey="createCategory" stepKey="deleteCategory"/> <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/> From b862dc7374106ab1c03aa82b9fb361ea54aa7c5d Mon Sep 17 00:00:00 2001 From: nikhilsharma-adobe <glo01481@adobe.com> Date: Mon, 18 Mar 2024 15:07:38 +0530 Subject: [PATCH 20/24] ACQE-6303 : credientials key added in DHL config --- app/code/Magento/Config/Test/Mftf/Data/DHLConfigData.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Config/Test/Mftf/Data/DHLConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/DHLConfigData.xml index a4b5834c2519..7d46c31bb3bf 100644 --- a/app/code/Magento/Config/Test/Mftf/Data/DHLConfigData.xml +++ b/app/code/Magento/Config/Test/Mftf/Data/DHLConfigData.xml @@ -23,7 +23,7 @@ <entity name="AdminCarriersDHLId"> <data key="path">carriers/dhl/id</data> <data key="scope_id">1</data> - <data key="value">EvgeniyUSA</data> + <data key="value">{{_CREDS.magento/carriers_dhl_access_id}}</data> </entity> <entity name="AdminCarriersDHLPassword"> <data key="path">carriers/dhl/password</data> @@ -33,7 +33,7 @@ <entity name="AdminCarriersDHLAccount"> <data key="path">carriers/dhl/account</data> <data key="scope_id">1</data> - <data key="value">965269748</data> + <data key="value">{{_CREDS.magento/carriers_dhl_account_number}}</data> </entity> <entity name="AdminCarriersDHLAllowedAllCountries"> <data key="path">carriers/dhl/sallowspecific</data> From fc8728d2169681edd5a2db22428b64d9ed43b458 Mon Sep 17 00:00:00 2001 From: nikhilsharma-adobe <glo01481@adobe.com> Date: Tue, 19 Mar 2024 10:14:16 +0530 Subject: [PATCH 21/24] adding clear cache config section --- .../Test/Mftf/Test/CustomCurrencySymbolWithSpaceTest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Directory/Test/Mftf/Test/CustomCurrencySymbolWithSpaceTest.xml b/app/code/Magento/Directory/Test/Mftf/Test/CustomCurrencySymbolWithSpaceTest.xml index 50fb0fe48ac4..3510e450ae74 100644 --- a/app/code/Magento/Directory/Test/Mftf/Test/CustomCurrencySymbolWithSpaceTest.xml +++ b/app/code/Magento/Directory/Test/Mftf/Test/CustomCurrencySymbolWithSpaceTest.xml @@ -65,7 +65,9 @@ <click selector="{{AdminCurrencySymbolsGridSection.saveCurrencySymbols}}" stepKey="clickSaveCurrencySymbols"/> <waitForPageLoad stepKey="waitForSave"/> <see selector="{{AdminMessagesSection.success}}" userInput="{{AdminSaveCurrencySymbolMessageData.success}}" stepKey="seeSuccessMessage"/> - + <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches"> + <argument name="tags" value="config full_page"/> + </actionGroup> <!--Redirect back to admin dashboard screen--> <actionGroup ref="AdminReloadDashboardDataActionGroup" stepKey="reloadDashboardData" /> <!--Verify there is a space between custom currency symbol respective amounts on admin dashboard--> From 663001ad5dee6412b3514b69cc3507453865bf1c Mon Sep 17 00:00:00 2001 From: Manjusha <glo24116@adobe.com> Date: Tue, 19 Mar 2024 11:44:35 +0530 Subject: [PATCH 22/24] ACQE-6246 : Components upgrade --- composer.lock | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 9f10fd32f6e9..58b170dc227e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4a1d1326b3706ac6eae29aed522ef8e2", + "content-hash": "7093048314262a0005a7637367da2b24", "packages": [ { "name": "aws/aws-crt-php", @@ -10148,16 +10148,16 @@ }, { "name": "magento/magento2-functional-testing-framework", - "version": "4.7.0", + "version": "4.7.1", "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "9b979d2a302800ffdda1a53b4e92c1b523da522d" + "reference": "036c0db03e6d602d89d31b71c91297015e390b9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/9b979d2a302800ffdda1a53b4e92c1b523da522d", - "reference": "9b979d2a302800ffdda1a53b4e92c1b523da522d", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/036c0db03e6d602d89d31b71c91297015e390b9f", + "reference": "036c0db03e6d602d89d31b71c91297015e390b9f", "shasum": "" }, "require": { @@ -10178,9 +10178,9 @@ "ext-openssl": "*", "guzzlehttp/guzzle": "^7.3.0", "laminas/laminas-diactoros": "^3.0", - "monolog/monolog": "^2.3", + "monolog/monolog": "^2.3||^3.0", "mustache/mustache": "~2.5", - "nikic/php-parser": "^4.4", + "nikic/php-parser": "^4.4||^5.0", "php": ">=8.1", "php-webdriver/webdriver": "^1.14.0", "spomky-labs/otphp": "^10.0||^11.0", @@ -10202,11 +10202,9 @@ }, "require-dev": { "brainmaestro/composer-git-hooks": "^2.8.5", - "codacy/coverage": "^1.4", "php-coveralls/php-coveralls": "^1.0||^2.2", "phpmd/phpmd": "^2.8.0", "phpunit/phpunit": "^9.5", - "sebastian/phpcpd": "~6.0.0", "squizlabs/php_codesniffer": "~3.7.0" }, "suggest": { @@ -10243,9 +10241,9 @@ ], "support": { "issues": "https://github.com/magento/magento2-functional-testing-framework/issues", - "source": "https://github.com/magento/magento2-functional-testing-framework/tree/4.7.0" + "source": "https://github.com/magento/magento2-functional-testing-framework/tree/4.7.1" }, - "time": "2024-01-10T06:53:44+00:00" + "time": "2024-03-18T13:33:48+00:00" }, { "name": "magento/php-compatibility-fork", From c5b782cf449fb4889d979111b2397aca738a00a6 Mon Sep 17 00:00:00 2001 From: nikhilsharma-adobe <glo01481@adobe.com> Date: Tue, 19 Mar 2024 17:56:02 +0530 Subject: [PATCH 23/24] added wait for element click --- .../Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml index 5382095673e8..f7edd7f88cf2 100644 --- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml +++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml @@ -20,6 +20,7 @@ </arguments> <!-- search for the name --> + <waitForElementClickable selector="{{AdminSecondaryGridSection.resetFilters}}" stepKey="waitForFiltersReset"/> <click stepKey="resetFilters" selector="{{AdminSecondaryGridSection.resetFilters}}"/> <fillField stepKey="fillIdentifier" selector="{{searchInput}}" userInput="{{name}}"/> <click stepKey="searchForName" selector="{{AdminSecondaryGridSection.searchButton}}"/> From df930d36103eabd984e16725ef34e6826f08741b Mon Sep 17 00:00:00 2001 From: manjusha729 <93243302+manjusha729@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:04:06 +0530 Subject: [PATCH 24/24] ACQE-6178 : Fixed test failure that is failing in mainline --- ...ontVerifyThatRecentlyOrderedWidgetShowOnlyFiveProductTest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyThatRecentlyOrderedWidgetShowOnlyFiveProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyThatRecentlyOrderedWidgetShowOnlyFiveProductTest.xml index cf92289cf8c6..6558dc28292d 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyThatRecentlyOrderedWidgetShowOnlyFiveProductTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyThatRecentlyOrderedWidgetShowOnlyFiveProductTest.xml @@ -89,6 +89,7 @@ <!--Place the order--> <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage"/> + <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/> <actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder"> <argument name="shippingMethod" value="Flat Rate"/> </actionGroup>