Merge branch '2.4-develop' into PR_10_JAN_2024

2026-11-07 09:17:35 +00:00 · 2024-03-21 00:48:30 +05:30
commit 06ae79f914
@@ -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}}"/>
@@ -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>
@@ -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"/>
+        <waitForText selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
    </actionGroup>
 </actionGroups>
@@ -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"/>
@@ -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>
@@ -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="AdminExpandCurrencyOptionsActionGroup">
+        <waitForElementClickable selector="{{CurrencySetupSection.currencyOptions}}" stepKey="waitForCurrencyOptionsSectionToBecomeClickable"/>
+        <click selector="{{CurrencySetupSection.currencyOptions}}" stepKey="openCurrencyOptions"/>
+    </actionGroup>
+</actionGroups>
@@ -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="AdminNavigateToCurrencySetupPageActionGroup">
+        <amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage1"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
@@ -10,6 +10,9 @@
              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
    <!-- Set base currency -->
    <actionGroup name="AdminSetDefaultCurrencyActionGroup" extends="AdminSaveConfigActionGroup">
+        <annotations>
+            <description>Admin uncheck  default currency  option.</description>
+        </annotations>
        <arguments>
            <argument name="currency" type="string"/>
        </arguments>
@@ -0,0 +1,44 @@
+<?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="UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest">
+        <annotations>
+            <stories value="Currency Rates"/>
+            <title value="Update currency rate for quotes in statuses Ordered and Closed"/>
+            <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>
@@ -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}}"/>
@@ -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-->
@@ -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>
@@ -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"/>
@@ -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",