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 @@ + 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 @@ + diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml index f2fff4af4814..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 @@ - + 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 @@ - + - + @@ -69,7 +69,7 @@ - + @@ -79,10 +79,10 @@ - + - + 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 @@ carriers/dhl/id 1 - EvgeniyUSA + {{_CREDS.magento/carriers_dhl_access_id}} carriers/dhl/password @@ -33,7 +33,7 @@ carriers/dhl/account 1 - 965269748 + {{_CREDS.magento/carriers_dhl_account_number}} carriers/dhl/sallowspecific 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..0cb94f5cce3b 100644 --- a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml @@ -10,6 +10,9 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> + + Admin uncheck default currency option. + 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..d35d9d349362 --- /dev/null +++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml @@ -0,0 +1,44 @@ + + + + + + + + + <description value="Update currency rate for created quotes in statuses Ordered and Closed"/> + <severity value="MAJOR"/> + <testCaseId value="B2B-1506"/> + </annotations> + <before> + <!--Login to backend--> + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> + <!--Setup currencies --> + <actionGroup ref="AdminNavigateToCurrencySetupPageActionGroup" stepKey="navigateToConfigCurrencySetupPage"/> + <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> 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}}"/> 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--> 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 @@ <element name="orderId" type="text" selector="|Order # (\d+)|"/> <element name="orderStatusUnderViewM" type="text" selector="//td//div[contains(text(),'{{product}}')]/../..//td[@class='col-status' and contains(text(),'{{status}}')]" parameterized="true" timeout="30"/> <element name="orderStatusUnderViewS" type="text" selector="//tr//div[contains(text(),'{{product}}')]/../../..//td[@class='col-status' and contains(text(),'{{status}}')]" parameterized="true" timeout="30"/> + <element name="rateValue" type="text" selector="//table[contains(@class, 'order-information-table')]//th[contains(text(), 'rate:')]/following-sibling::td"/> </section> </sections> 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"/> 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",