Skip to content

Commit

Permalink
Merge pull request #8293 from magento-commerce/stability_control
Browse files Browse the repository at this point in the history
MFTF ^4.3.0 + some build stability improvements
  • Loading branch information
internal-magento-queue-manager[bot] committed Jul 17, 2023
2 parents 1bdf9df + f6583ee commit ca30c47
Show file tree
Hide file tree
Showing 22 changed files with 877 additions and 996 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</actionGroup>
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckout"/>
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRate"/>
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="AssertCaptchaVisibleOnSecondCheckoutStepActionGroup" stepKey="assertCaptchaIsVisible"/>
<waitForPageLoad stepKey="waitForSpinner"/>
<actionGroup ref="StorefrontFillCaptchaFieldOnCheckoutActionGroup" stepKey="placeOrderWithIncorrectValue">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@

<!-- 4. Run cron to reindex -->
<wait time="60" stepKey="waitForChanges"/>
<magentoCLI command="cron:run --group index" stepKey="runCron"/>
<magentoCLI command="cron:run --group index" stepKey="runCronTwice"/>
<magentoCron groups="index" stepKey="runCron" />
<magentoCron groups="index" stepKey="runCronTwice" />

<!-- 5. Open category A on Storefront again -->
<actionGroup ref="ReloadPageActionGroup" stepKey="reloadCategoryA"/>
Expand Down Expand Up @@ -124,8 +124,8 @@

<!-- 8. Run cron reindex (Ensure that at least one minute passed since last cron run) -->
<wait time="60" stepKey="waitOneMinute"/>
<magentoCLI command="cron:run --group index" stepKey="runCron1"/>
<magentoCLI command="cron:run --group index" stepKey="runCronTwice1"/>
<magentoCron groups="index" stepKey="runCron1" />
<magentoCron groups="index" stepKey="runCronTwice1" />

<!-- 9. Open category A on Storefront again -->
<actionGroup ref="ReloadPageActionGroup" stepKey="refreshCategoryAPage"/>
Expand Down Expand Up @@ -180,8 +180,8 @@

<!-- 14. Run cron to reindex (Ensure that at least one minute passed since last cron run) -->
<wait time="60" stepKey="waitMinute"/>
<magentoCLI command="cron:run --group index" stepKey="runCron2"/>
<magentoCLI command="cron:run --group index" stepKey="runCronTwice2"/>
<magentoCron groups="index" stepKey="runCron2" />
<magentoCron groups="index" stepKey="runCronTwice2" />

<!-- 15. Open category B on Storefront -->
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="onPageCategoryB">
Expand Down Expand Up @@ -240,8 +240,8 @@

<!-- 17.14. Run cron to reindex (Ensure that at least one minute passed since last cron run) -->
<wait time="60" stepKey="waitForOneMinute"/>
<magentoCLI command="cron:run --group index" stepKey="runCron3"/>
<magentoCLI command="cron:run --group index" stepKey="runCronTwice3"/>
<magentoCron groups="index" stepKey="runCron3" />
<magentoCron groups="index" stepKey="runCronTwice3" />

<!-- 17.15. Open category B on Storefront -->
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openPageCategoryB">
Expand Down Expand Up @@ -302,8 +302,8 @@

<!-- 18.14. Run cron to reindex (Ensure that at least one minute passed since last cron run) -->
<wait time="60" stepKey="waitExtraMinute"/>
<magentoCLI command="cron:run --group index" stepKey="runCron4"/>
<magentoCLI command="cron:run --group index" stepKey="runCronTwice4"/>
<magentoCron groups="index" stepKey="runCron4" />
<magentoCron groups="index" stepKey="runCronTwice4" />

<!-- 18.15. Open category B on Storefront -->
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="navigateToPageCategoryB">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@
</actionGroup>

<!-- Run cron -->
<magentoCLI command="cron:run" stepKey="runCron"/>
<magentoCron stepKey="runCron" />
<magentoCron stepKey="runCronTwice" />

<!-- Check product is present in category after cron run -->
<actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{customer.email}}" stepKey="fillEmailField"/>
<fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customer.firstName}}" stepKey="fillFirstName"/>
<fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customer.lastName}}" stepKey="fillLastName"/>
<fillField selector="{{CheckoutShippingSection.street}}" userInput="{{address.street}}" stepKey="fillStreet"/>
<fillField selector="{{CheckoutShippingSection.street}}" userInput="{{address.street[0]}}" stepKey="fillStreet"/>
<fillField selector="{{CheckoutShippingSection.city}}" userInput="{{address.city}}" stepKey="fillCity"/>
<selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{address.state}}" stepKey="selectRegion"/>
<fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{address.postcode}}" stepKey="fillZipCode"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontCheckoutClickNextOnShippingStepActionGroup" extends="StorefrontCheckoutForwardFromShippingStepActionGroup">
<actionGroup name="StorefrontCheckoutClickNextOnShippingStepActionGroup">
<annotations>
<description>Scrolls and clicks next on Checkout Shipping step</description>
</annotations>
<scrollTo selector="{{CheckoutShippingSection.next}}" before="clickNext" stepKey="scrollToNextButton"/>
<waitForElement selector="{{CheckoutShippingSection.next}}" stepKey="waitForNextButtonElement"/>
<scrollTo selector="{{CheckoutShippingSection.next}}" stepKey="scrollToNextButton"/>
<waitForElementClickable selector="{{CheckoutShippingSection.next}}" stepKey="waitForNextButton"/>
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
<waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontCheckoutForwardFromShippingStepActionGroup">
<actionGroup name="StorefrontCheckoutForwardFromShippingStepActionGroup" deprecated="[DEPRECATED] Please use StorefrontCheckoutClickNextOnShippingStepActionGroup">
<annotations>
<description>Clicks next on Checkout Shipping step</description>
</annotations>
<waitForElementClickable selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
<waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openShoppingCartPage"/>
<actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="goToCheckout"/>
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRate"/>
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="clickOnPlaceOrder">
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRate"/>
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="clickOnPlaceOrder">
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRate"/>
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="clickOnPlaceOrder">
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
<group value="instant_purchase"/>
<group value="vault"/>
<group value="paypal"/>
<group value="pr_exclude"/>
<group value="3rd_party_integration"/>
</annotations>
<before>
<magentoCLI command="downloadable:domains:add" arguments="example.com static.magento.com" stepKey="addDownloadableDomain"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?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="StorefrontSelectCheckMoneyOrderActionGroup">
<annotations>
<description>Select "Check / Money Order payment method if radio button available otherwise continue."</description>
</annotations>
<conditionalClick selector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('Check / Money order')}}" dependentSelector="{{StorefrontCheckoutPaymentMethodSection.checkPaymentMethodByName('Check / Money order')}}" visible="true" stepKey="selectCheckmoPaymentMethod"/>
<waitForPageLoad stepKey="waitForPageLoad" />
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</actionGroup>
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckout"/>
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRate"/>
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="clickOnPlaceOrder">
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<argument name="customer" value="$$createCustomer$$"/>
</actionGroup>

<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="gotoPaymentStep"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="gotoPaymentStep"/>

<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceOrder">
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<argument name="customer" value="$$createCustomer$$"/>
</actionGroup>

<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="gotoPaymentStep"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="gotoPaymentStep"/>

<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceOrder">
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<group value="Sales"/>
<skip>
<issueId value="DEPRECATED">Use StorefrontOrderCommentWithHTMLTagsDisplayTest instead</issueId>
</skip>
</skip>
</annotations>
<before>
<!-- Create customer -->
Expand Down Expand Up @@ -50,7 +50,7 @@
</actionGroup>
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRate"/>
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="clickOnPlaceOrder">
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@

<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/>
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
<actionGroup ref="StorefrontSelectCheckMoneyOrderActionGroup" stepKey="selectCheckmoIfNeeded" />
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
<comment userInput="BIC workaround" stepKey="grabOrderNumber"/>
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="openOrderViewPage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckout"/>

<!-- Go to Order review -->
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="goToCheckoutReview"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToCheckoutReview"/>

<!-- Apply Discount Coupon to the Order -->
<actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyDiscountCoupon">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="clickProceedToCheckout"/>
<waitForElement selector="{{CheckoutShippingSection.shippingTab}}" stepKey="waitForCheckoutPage"/>
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRate"/>
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToReview"/>
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="clickOnPlaceOrder">
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@

<!-- Go to next step -->
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethodBeforeTranslate"/>
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="gotoPaymentStepBeforeTranslate"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="gotoPaymentStepBeforeTranslate"/>

<!-- Check Progress Bar Review & Payments -->
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.progressBarActive}}" stepKey="waitForProgressBarReviewAndPayments"/>
Expand Down Expand Up @@ -570,7 +570,7 @@

<!-- Go to next step -->
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="gotoPaymentStep"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="gotoPaymentStep"/>

<!-- Check translate Progress Bar Review & Payments-->
<see userInput="Review &amp; Payments Translated" selector="{{InlineTranslationModeCheckoutSection.progressBarActive}}" stepKey="seeTranslateProgressBarReviewAndPayments"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@

<!-- Select shipping and payment methods -->
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="clickNext"/>
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="clickCheckMoneyOrderPayment"/>

<!-- Open summary section for product -->
Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,14 @@
"friendsofphp/php-cs-fixer": "^3.8",
"lusitanian/oauth": "^0.8",
"magento/magento-coding-standard": "*",
"magento/magento2-functional-testing-framework": "^4.2.1",
"magento/magento2-functional-testing-framework": "^4.3.0",
"pdepend/pdepend": "^2.10",
"phpmd/phpmd": "^2.12",
"phpstan/phpstan": "^1.9",
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "<=9.5.22",
"sebastian/phpcpd": "^6.0",
"symfony/finder": "^5.4"
"symfony/finder": "^5.4",
"sebastian/comparator": "<=4.0.6"
},
"suggest": {
"ext-pcntl": "Need for run processes in parallel mode"
Expand Down
Loading

0 comments on commit ca30c47

Please sign in to comment.