Skip to content

Commit a98a64a

Browse files
internal-magento-queue-manager[bot]internal-magento-queue-manager[bot]
authored
Merge pull request #8776 from magento-gl/ACQE-6178_mainline_PR_development
[Bengals Team] Test Fixes and Automation Tasks
2 parents ba25af8 + df930d3 commit a98a64a

14 files changed

+103
-20
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
</arguments>
2121

2222
<!-- search for the name -->
23+
<waitForElementClickable selector="{{AdminSecondaryGridSection.resetFilters}}" stepKey="waitForFiltersReset"/>
2324
<click stepKey="resetFilters" selector="{{AdminSecondaryGridSection.resetFilters}}"/>
2425
<fillField stepKey="fillIdentifier" selector="{{searchInput}}" userInput="{{name}}"/>
2526
<click stepKey="searchForName" selector="{{AdminSecondaryGridSection.searchButton}}"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyThatRecentlyOrderedWidgetShowOnlyFiveProductTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989

9090
<!--Place the order-->
9191
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage"/>
92+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
9293
<actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder">
9394
<argument name="shippingMethod" value="Flat Rate"/>
9495
</actionGroup>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClickPlaceOrderActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
1717
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
1818
<waitForPageLoad stepKey="waitForCheckout"/>
19-
<see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
19+
<waitForText selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
2020
</actionGroup>
2121
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StoreFrontValidateDynamicChangeOfShippingRateForGuestUserTest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,19 @@
5757
<actionGroup ref="OpenStoreFrontCheckoutShippingPageActionGroup" stepKey="goToShippingPage"/>
5858
<!-- Guest checkout -->
5959
<actionGroup ref="FillGuestCheckoutShippingAddressFormActionGroup" stepKey="goToShippingAndFillDetails">
60-
<argument name="customerAddress" value="US_CA_Address"/>
60+
<argument name="customerAddress" value="US_Address_CA"/>
6161
</actionGroup>
6262
<selectOption selector="{{CheckoutShippingSection.region}}" userInput="California" stepKey="fillStateField"/>
6363
<waitForPageLoad stepKey="waitForChangeAfterStateLoad"/>
64-
<actionGroup ref="CheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethod"/>
64+
<actionGroup ref="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethod"/>
6565
<waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodDhlLabel}}" stepKey="waitForDHLLabelVisible"/>
6666
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodDhlWorldWideExpress}}" stepKey="waitForDHLPriceNotVisibleAfterStateChange"/>
6767
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingNotVisible"/>
6868
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="waitForFreeShippingLabelNotVisible"/>
6969
<!-- Change country value -->
7070
<selectOption selector="{{CheckoutShippingSection.country}}" userInput="Afghanistan" stepKey="fillCountryField"/>
7171
<waitForPageLoad stepKey="waitForChangeAfterCountryLoad"/>
72-
<actionGroup ref="CheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterCountryChange"/>
72+
<actionGroup ref="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterCountryChange"/>
7373
<waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingVisibleAfterCountryChange"/>
7474
<waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="waitForFreeShippingLabelVisibleAfterCountryChange"/>
7575
<waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodDhlLabel}}" stepKey="waitForDHLLabelVisibleAfterCountryChange"/>
@@ -79,10 +79,10 @@
7979
<selectOption selector="{{CheckoutShippingSection.country}}" userInput="United Kingdom" stepKey="fillCountry"/>
8080
<fillField selector="{{CheckoutShippingSection.city}}" userInput="London" stepKey="fillCity"/>
8181
<fillField selector="{{CheckoutShippingSection.postcode}}" userInput="N14 5JP" stepKey="fillPostcode"/>
82-
<actionGroup ref="CheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterNewData"/>
82+
<actionGroup ref="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterNewData"/>
8383
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingVisibleAfterNewFormData"/>
8484
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="waitForFreeShippingLabelVisibleAfterNewFormData"/>
85-
<actionGroup ref="VerifyDHLShippingMethodIsVisibilityActionGroup" stepKey="dhlShippingVisibility"/>
85+
<actionGroup ref="StorefrontVerifyDHLShippingMethodIsVisibilityActionGroup" stepKey="dhlShippingVisibility"/>
8686
<after>
8787
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
8888
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>

‎app/code/Magento/Config/Test/Mftf/Data/DHLConfigData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<entity name="AdminCarriersDHLId">
2424
<data key="path">carriers/dhl/id</data>
2525
<data key="scope_id">1</data>
26-
<data key="value">EvgeniyUSA</data>
26+
<data key="value">{{_CREDS.magento/carriers_dhl_access_id}}</data>
2727
</entity>
2828
<entity name="AdminCarriersDHLPassword">
2929
<data key="path">carriers/dhl/password</data>
@@ -33,7 +33,7 @@
3333
<entity name="AdminCarriersDHLAccount">
3434
<data key="path">carriers/dhl/account</data>
3535
<data key="scope_id">1</data>
36-
<data key="value">965269748</data>
36+
<data key="value">{{_CREDS.magento/carriers_dhl_account_number}}</data>
3737
</entity>
3838
<entity name="AdminCarriersDHLAllowedAllCountries">
3939
<data key="path">carriers/dhl/sallowspecific</data>

‎app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminExpandCurrencyOptionsActionGroup.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminExpandCurrencyOptionsActionGroup">
12+
<waitForElementClickable selector="{{CurrencySetupSection.currencyOptions}}" stepKey="waitForCurrencyOptionsSectionToBecomeClickable"/>
13+
<click selector="{{CurrencySetupSection.currencyOptions}}" stepKey="openCurrencyOptions"/>
14+
</actionGroup>
15+
</actionGroups>

‎app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminNavigateToCurrencySetupPageActionGroup.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminNavigateToCurrencySetupPageActionGroup">
12+
<amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage1"/>
13+
<waitForPageLoad stepKey="waitForPageLoad"/>
14+
</actionGroup>
15+
</actionGroups>

‎app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminSetDefaultCurrencyActionGroup.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<!-- Set base currency -->
1212
<actionGroup name="AdminSetDefaultCurrencyActionGroup" extends="AdminSaveConfigActionGroup">
13+
<annotations>
14+
<description>Admin uncheck default currency option.</description>
15+
</annotations>
1316
<arguments>
1417
<argument name="currency" type="string"/>
1518
</arguments>

‎app/code/Magento/CurrencySymbol/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest">
12+
<annotations>
13+
<stories value="Currency Rates"/>
14+
<title value="Update currency rate for quotes in statuses Ordered and Closed"/>
15+
<description value="Update currency rate for created quotes in statuses Ordered and Closed"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="B2B-1506"/>
18+
</annotations>
19+
<before>
20+
<!--Login to backend-->
21+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
22+
<!--Setup currencies -->
23+
<actionGroup ref="AdminNavigateToCurrencySetupPageActionGroup" stepKey="navigateToConfigCurrencySetupPage"/>
24+
<actionGroup ref="AdminExpandCurrencyOptionsActionGroup" stepKey="openCurrencyOptions"/>
25+
<actionGroup ref="AdminSetBaseCurrencyActionGroup" stepKey="setBaseCurrencyUSD">
26+
<argument name="currency" value="US Dollar"/>
27+
</actionGroup>
28+
<selectOption selector="{{CurrencySetupSection.baseCurrency}}" userInput="US Dollar" stepKey="setBaseCurrencyField"/>
29+
<uncheckOption selector="{{CurrencySetupSection.allowcurrenciescheckbox}}" stepKey="UnCheckUseDefaultOptionForAllowedCurrencies"/>
30+
<selectOption selector="{{CurrencySetupSection.allowCurrencies}}" parameterArray="['Euro', 'US Dollar']" stepKey="selectCurrencies"/>
31+
<scrollToTopOfPage stepKey="scrollToTopOfPage" />
32+
<actionGroup ref="AdminSetDefaultCurrencyActionGroup" stepKey="setDefaultCurrencyEUR">
33+
<argument name="currency" value="Euro"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveStoreConfiguration"/>
36+
<!--<click stepKey="saveConfigs" selector="{{AdminConfigSection.saveButton}}"/>-->
37+
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
38+
<waitForText selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
39+
<!--Go to Configuration -> Currency Setup-->
40+
<actionGroup ref="AdminOpenCurrencyRatesPageActionGroup" stepKey="gotToCurrencyRatesPage"/>
41+
<actionGroup ref="AdminImportCurrencyRatesActionGroup" stepKey="importCurrencyRates"/>
42+
</before>
43+
</test>
44+
</tests>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCreateCustomerSignedUpNewsletterActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
2020
<waitForPageLoad stepKey="waitForNavigateToCustomersPageLoad"/>
21+
<waitForElementClickable selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="waitForCreateAnAccountLink"/>
2122
<click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
2223
<fillField stepKey="fillFirstName" userInput="{{customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
2324
<fillField stepKey="fillLastName" userInput="{{customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>

‎app/code/Magento/Directory/Test/Mftf/Test/CustomCurrencySymbolWithSpaceTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@
6565
<click selector="{{AdminCurrencySymbolsGridSection.saveCurrencySymbols}}" stepKey="clickSaveCurrencySymbols"/>
6666
<waitForPageLoad stepKey="waitForSave"/>
6767
<see selector="{{AdminMessagesSection.success}}" userInput="{{AdminSaveCurrencySymbolMessageData.success}}" stepKey="seeSuccessMessage"/>
68-
68+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
69+
<argument name="tags" value="config full_page"/>
70+
</actionGroup>
6971
<!--Redirect back to admin dashboard screen-->
7072
<actionGroup ref="AdminReloadDashboardDataActionGroup" stepKey="reloadDashboardData" />
7173
<!--Verify there is a space between custom currency symbol respective amounts on admin dashboard-->

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@
2626
<element name="orderId" type="text" selector="|Order # (\d+)|"/>
2727
<element name="orderStatusUnderViewM" type="text" selector="//td//div[contains(text(),'{{product}}')]/../..//td[@class='col-status' and contains(text(),'{{status}}')]" parameterized="true" timeout="30"/>
2828
<element name="orderStatusUnderViewS" type="text" selector="//tr//div[contains(text(),'{{product}}')]/../../..//td[@class='col-status' and contains(text(),'{{status}}')]" parameterized="true" timeout="30"/>
29+
<element name="rateValue" type="text" selector="//table[contains(@class, 'order-information-table')]//th[contains(text(), 'rate:')]/following-sibling::td"/>
2930
</section>
3031
</sections>

‎app/code/Magento/Tax/Test/Mftf/Test/ApplyTaxesAndFptForSimpleProductWithCanadianPstOriginTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
</actionGroup>
3535
<!-- Login as Admin -->
3636
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
37+
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="navigateToTaxRatesPage"/>
38+
<actionGroup ref="AdminDeleteMultipleTaxRatesActionGroup" stepKey="deleteAllNonDefaultTaxRates"/>
3739
<!-- change tax classes configuration -->
3840
<actionGroup ref="SetTaxClassForShippingActionGroup" stepKey="setTaxClass"/>
3941
<actionGroup ref="AdminChangeTaxAndFptConfigActionGroup" stepKey="changeTaxConfigs"/>

‎composer.lock

Lines changed: 9 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)