Skip to content

Commit d290f35

Browse files
internal-magento-queue-manager[bot]internal-magento-queue-manager[bot]
authored
Merge pull request #9030 from magento-gl/ACQE-6652_mainline_PR_deployment
[Bengals Team] Test Fixes and Automation Tasks
2 parents 493e01f + 9215c67 commit d290f35

11 files changed

+247
-1
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundlePlaceOrderWithVirtualAndSimpleChildrenTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/>
8080
<!--Click next button to open payment section-->
8181
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
82+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectDefaultPaymentMethod"/>
8283
<!--Click place order-->
8384
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
8485
<actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="clickOrderLink"/>

‎app/code/Magento/Catalog/Test/Mftf/Data/ImageData.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,14 @@
7979
<data key="filename">png</data>
8080
<data key="file_extension">png</data>
8181
</entity>
82+
<entity name="placeholderDummyBaseImage" type="imageFile">
83+
<data key="file">Dummy(3).jpg</data>
84+
<data key="name">Dummy(3)</data>
85+
<data key="extension">jpg</data>
86+
</entity>
87+
<entity name="PageBuilderBackgroundImage_LargerThan2MB" type="imageFile">
88+
<data key="file">LargerThan2MB.jpg</data>
89+
<data key="name">LargerThan2MB</data>
90+
<data key="extension">jpg</data>
91+
</entity>
8292
</entities>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
</annotations>
2020
<before>
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
22+
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
2223
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
2324
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2425
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
@@ -27,11 +28,12 @@
2728
</before>
2829
<after>
2930
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
30-
<actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
31+
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
3132
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
3233
<argument name="enabled" value="0"/>
3334
</actionGroup>
3435
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
36+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
3537
</after>
3638

3739
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="navigateToNewProduct"/>

‎app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminSelectPaypalStandardPaymentInPaymentPageActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<!--Create Shipment With Tracking Number-->
12+
<actionGroup name="AdminSelectPaypalStandardPaymentInPaymentPageActionGroup">
13+
<waitForElementClickable selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="waitForPayPalRadioButton"/>
14+
<click selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="selectPaypalPayment"/>
15+
<waitForElementClickable selector="{{CheckoutPaymentSection.ContinuePayPalBtn}}" stepKey="waitForPayPalBtn"/>
16+
<click selector="{{CheckoutPaymentSection.ContinuePayPalBtn}}" stepKey="clickPayPalBtn"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalStandardPaymentActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="StorefrontLoginToPayPalStandardPaymentActionGroup" extends="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup">
12+
<annotations>
13+
<description>remove click btn which is not coming when we login with paypal standard payment enabled</description>
14+
</annotations>
15+
<remove keyForRemoval="clickNext"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/CheckoutPaymentSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<element name="smartButtonPayPalFrame" type="iframe" selector=".component-frame" timeout="10"/>
1515
<element name="PayPalPaymentRadio" type="radio" selector="input#paypal_express.radio" timeout="30"/>
1616
<element name="PayPalBtn" type="radio" selector=".paypal-button.paypal-button-number-0" timeout="30"/>
17+
<element name="ContinuePayPalBtn" type="radio" selector="//span[text()='Continue to PayPal']"/>
1718
<element name="PayPalExpressCheckoutPayFlowEdition" type="radio" selector="input#payflow_express.radio"/>
1819
<element name="continueButton" type="button" selector="//div[@class='payment-method _active']//button[@class='action primary checkout']/span[text()='Continue to PayPal']"/>
1920
<element name="PayPalPayflowLinkRadio" type="radio" selector="input#payflow_link.radio" timeout="30"/>

‎app/code/Magento/Paypal/Test/Mftf/Suite/ConfigPayPalStandardSuite.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
9+
<suite name="ConfigPayPalStandardSuite">
10+
<before>
11+
<!-- Login -->
12+
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
13+
<!--Config PayPal Standard-->
14+
<actionGroup ref="AdminPayPalStandardEnableActionGroup" stepKey="ConfigPayPalStandard"/>
15+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache">
16+
<argument name="tags" value="config full_page"/>
17+
</actionGroup>
18+
</before>
19+
<after>
20+
<!-- Cleanup PayPal Standard configurations -->
21+
<magentoCLI command="config:set {{DisablePaypalPayStandard.path}} {{DisablePaypalPayStandard.value}}" stepKey="deleteMerchantId"/>
22+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache">
23+
<argument name="tags" value="config full_page"/>
24+
</actionGroup>
25+
</after>
26+
<include>
27+
<group name="paypalStandard"/>
28+
</include>
29+
</suite>
30+
</suites>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminCancelledPaymentStandardOrderTest.xml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminCancelledPaymentStandardOrderTest">
11+
<annotations>
12+
<features value="PayPal"/>
13+
<stories value="Payment standard method"/>
14+
<title value="Complete a Sales Order Paid with PayPal Payments Standard"/>
15+
<description value="Complete order paid with PayPalStandard and cancelled in backend"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="AC-4808"/>
18+
<group value="paypalStandard"/>
19+
<group value="3rd_party_integration" />
20+
<group value="pr_exclude"/>
21+
</annotations>
22+
<before>
23+
<!-- Login to admin-->
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<!-- Simple product is created -->
26+
<createData entity="simpleProductWithoutCategory" stepKey="createProduct">
27+
<field key="price">140.98</field>
28+
</createData>
29+
<!-- US Customer is created -->
30+
<createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
31+
</before>
32+
<after>
33+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
34+
<!-- Customer Log Out -->
35+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
36+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
37+
<!-- Logout-->
38+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
39+
</after>
40+
<!-- Navigate to StoreFront -->
41+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/>
42+
<!-- Login as customer -->
43+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="storefrontCustomerLogin">
44+
<argument name="Customer" value="$$createCustomer$$"/>
45+
</actionGroup>
46+
<!-- Add product to cart -->
47+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
48+
<argument name="product" value="$$createProduct$$"/>
49+
</actionGroup>
50+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckout"/>
51+
<!-- Click Next button -->
52+
<actionGroup ref="StorefrontGuestCheckoutProceedToPaymentStepActionGroup" stepKey="clickNext"/>
53+
<!-- Click on PayPal payment radio button and click on continue btn -->
54+
<actionGroup ref="AdminSelectPaypalStandardPaymentInPaymentPageActionGroup" stepKey="selectPaypalStandardPaymentAndClickOnContinueButton"/>
55+
<!-- Login to PayPal in-context and verify order total on PayPal page-->
56+
<actionGroup ref="StorefrontLoginToPayPalStandardPaymentActionGroup" stepKey="loginToPayPal"/>
57+
<actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="confirmPaymentAndGoBackToMagento"/>
58+
<waitForElementVisible selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="waitForOrderNumberToBeGrabbed"/>
59+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
60+
<!-- Go to order page -->
61+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderedPage">
62+
<argument name="orderId" value="{$grabOrderNumber}"/>
63+
</actionGroup>
64+
<actionGroup ref="CancelPendingOrderActionGroup" stepKey="cancelPendingOption">
65+
<argument name="orderStatus" value="Canceled"/>
66+
</actionGroup>
67+
<!--Grab the transaction id-->
68+
<waitForElementVisible selector="{{AdminOrderDetailsInformationSection.paymentInformationField('Last Transaction ID')}}" stepKey="waitForTransactionIDFieldToBeAppeared"/>
69+
<grabTextFrom selector="{{AdminOrderDetailsInformationSection.paymentInformationField('Last Transaction ID')}}" stepKey="grabTransactionID"/>
70+
<actionGroup ref="AdminOpenOrderCommentsHistoryActionGroup" stepKey="clickOnCommentsHistory"/>
71+
<waitForText selector="{{AdminOrderCommentsTabSection.orderCommentsWithType('Canceled order')}}" userInput="Canceled order online Amount: $145.98. Transaction ID: &quot;{$grabTransactionID}&quot;" stepKey="seeOrderHistoryNotesAfterCancelingOrder"/>
72+
<actionGroup ref="AdminOpenTransactionsTabActionGroup" stepKey="openTransactionTypeHasAuthorization">
73+
<argument name="transactionType" value="authorization"/>
74+
</actionGroup>
75+
<waitForText selector="{{AdminTransactionsGridSection.transactionData('Is Closed')}}" userInput="Yes" stepKey="seeIfClosedHeaderIsSetAsYesForAuthorization"/>
76+
<waitForElementClickable selector="{{AdminProductFormActionSection.backButton}}" stepKey="waitForBackButtonToBeClicked"/>
77+
<click selector="{{AdminProductFormActionSection.backButton}}" stepKey="clickBackButton"/>
78+
<actionGroup ref="AdminOpenTransactionsTabActionGroup" stepKey="openTransactionTypeHasVoid">
79+
<argument name="transactionType" value="void"/>
80+
</actionGroup>
81+
<waitForText selector="{{AdminTransactionsGridSection.transactionData('Is Closed')}}" userInput="Yes" stepKey="seeIfClosedHeaderIsSetAsYesForVoid"/>
82+
</test>
83+
</tests>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminCompleteOrderPaidWithPayPalStandardTest.xml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminCompleteOrderPaidWithPayPalStandardTest">
11+
<annotations>
12+
<features value="PayPal"/>
13+
<stories value="Payment methods"/>
14+
<title value="Complete a Sales Order Paid with PayPal Payments Standard"/>
15+
<description value="Complete order paid with PayPalStandard"/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="AC-5320"/>
18+
<group value="paypalStandard"/>
19+
<group value="3rd_party_integration" />
20+
<group value="pr_exclude" />
21+
</annotations>
22+
<before>
23+
<!-- Login to admin-->
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<!-- Simple product is created -->
26+
<createData entity="simpleProductWithoutCategory" stepKey="createProduct">
27+
<field key="price">140.98</field>
28+
</createData>
29+
<!-- US Customer is created -->
30+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
31+
</before>
32+
<after>
33+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
34+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
35+
<!-- Logout-->
36+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
37+
</after>
38+
<!-- Navigate to StoreFront -->
39+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/>
40+
<!-- Add product to cart -->
41+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
42+
<argument name="product" value="$$createProduct$$"/>
43+
</actionGroup>
44+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckout"/>
45+
<!--Fill Shipping Address-->
46+
<actionGroup ref="FillGuestCheckoutShippingAddressFormActionGroup" stepKey="fillShippingAddress"/>
47+
<selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="Texas" stepKey="fillState"/>
48+
<waitForPageLoad stepKey="waitForShippingPageToLoad"/>
49+
<!-- Click Next button -->
50+
<actionGroup ref="StorefrontGuestCheckoutProceedToPaymentStepActionGroup" stepKey="clickNext"/>
51+
<!-- Click on PayPal payment radio button and click on continue btn -->
52+
<actionGroup ref="AdminSelectPaypalStandardPaymentInPaymentPageActionGroup" stepKey="selectPaypalStandardPaymentAndClickOnContinuebtn"/>
53+
<!-- Login to Paypal in-context and verify order total on paypal page-->
54+
<actionGroup ref="StorefrontLoginToPayPalStandardPaymentActionGroup" stepKey="loginToPayPal"/>
55+
<actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="confirmPaymentAndGoBackToMagento"/>
56+
<waitForElementVisible selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="waitForOrderNumberToBeGrabbed"/>
57+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
58+
<!--Go to Admin and check order information-->
59+
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGrid">
60+
<argument name="orderId" value="$grabOrderNumber"/>
61+
</actionGroup>
62+
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
63+
<!-- Check status -->
64+
<actionGroup ref="AdminOrderViewCheckStatusActionGroup" stepKey="seeAdminOrderStatus">
65+
<argument name="status" value="Processing"/>
66+
</actionGroup>
67+
<!-- Create Shipment -->
68+
<actionGroup ref="AdminCreateShipmentFromOrderPage" stepKey="createNewShipment">
69+
<argument name="Title" value="Title"/>
70+
<argument name="Number" value="99"/>
71+
<argument name="Qty" value="1"/>
72+
<argument name="Comment" value="comments for shipment"/>
73+
</actionGroup>
74+
<!--Create Invoice for this Order-->
75+
<actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="createInvoice"/>
76+
<actionGroup ref="SubmitInvoiceActionGroup" stepKey="submitInvoice"/>
77+
<actionGroup ref="AdminOpenOrderCommentsHistoryActionGroup" stepKey="clickOnCommentsHistory"/>
78+
<waitForText selector="{{AdminOrderCommentsTabSection.orderComment}}" userInput="Authorized amount of $145.98." stepKey="seeOrderHistoryNotes"/>
79+
</test>
80+
</tests>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@
9696
<argument name="state" value="California"/>
9797
<argument name="postcode" value="90310"/>
9898
</actionGroup>
99+
<!-- Cache Flush-->
100+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
101+
<argument name="tags" value="config"/>
102+
</actionGroup>
99103
<!-- Assert tax and order amount -->
100104
<see selector="{{CheckoutCartSummarySection.taxAmount}}" userInput="8.25" stepKey="assertTaxAmount"/>
101105
<actionGroup ref="AssertStorefrontShoppingCartSummaryItemsActionGroup" stepKey="assertCartTotals">

‎dev/tests/acceptance/tests/_data/Dummy(3).jpg

21.3 KB
Loading

0 commit comments

Comments
 (0)