Skip to content

Commit 6e7a4b9

Browse files
nikhilsharma-adobenikhilsharma-adobe
committed
ACQE-6376: conflict resolved
2 parents 67a8ad6 + f865586 commit 6e7a4b9

File tree

9 files changed

+194
-0
lines changed

9 files changed

+194
-0
lines changed

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@
7878
<argument name="productCount" value="1"/>
7979
</actionGroup>
8080
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openCart"/>
81+
<!--Select check money order payment if any other option is also there-->
82+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment"/>
8183
<actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder"/>
8284
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderId"/>
8385

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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="SelectShippingAddressOnPayPalPaymentPageActionGroup">
12+
<annotations>
13+
<description>Select shipping address on paypal account payment page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="address"/>
17+
</arguments>
18+
<waitForElementClickable selector="{{PayPalPaymentSection.changeShippingAddressButton}}" stepKey="waitForChangeShippingAddressButton"/>
19+
<click selector="{{PayPalPaymentSection.changeShippingAddressButton}}" stepKey="clickChangeShippingAddressButton"/>
20+
<waitForElementVisible selector="{{PayPalPaymentSection.shippingAddressDropdown}}" stepKey="waitForAddressDropdown"/>
21+
<selectOption selector ="{{PayPalPaymentSection.shippingAddressDropdown}}" userInput="{{address.shippingCustomerName}} - {{address.ShippingAddress}}" stepKey="selectShippingAddress"/>
22+
<waitForElementVisible selector="{{PayPalPaymentSection.selectedShippingAddress(address.ShippingAddress)}}" stepKey="verifyAddressIsSelected"/>
23+
</actionGroup>
24+
</actionGroups>
25+

‎app/code/Magento/Paypal/Test/Mftf/Data/PaypalAddressData.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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="ShippingAddressUS">
12+
<data key="shippingCustomerName">US cust1</data>
13+
<data key="ShippingAddress">6161 West Centinela Avenue, Culver city, CA 90230</data>
14+
</entity>
15+
</entities>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,8 @@
2828
<element name="orderTotalOnPaypalCheckout" type="text" selector="//div[@id='cart']//span[contains(text(),'$')]"/>
2929
<element name="paypalPopupButton1" type="button" selector="//button[text()='Pay with Debit or Credit Card']"/>
3030
<element name="paypalPopupButton2" type="button" selector="//button[text()='Create an Account']"/>
31+
<element name="changeShippingAddressButton" type="button" selector="#change-shipping"/>
32+
<element name="shippingAddressDropdown" type="select" selector="#shippingDropdown"/>
33+
<element name="selectedShippingAddress" type="text" selector="//div/p[contains(text(), '{{selectedAddress}}')]" parameterized="true"/>
3134
</section>
3235
</sections>

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

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
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="GuestCheckoutWithPayPalButtonFromCheckoutPageFreeShippingTest">
12+
<annotations>
13+
<features value="Paypal"/>
14+
<stories value="PayPal Express Checkout"/>
15+
<title value="Guest checkout with PayPal button from Product page and use Free Shipping"/>
16+
<description value="Customer is able to buy goods using Checkout with PayPal button from Product page and use Free Shipping"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="AC-5210"/>
19+
<group value="3rd_party_integration"/>
20+
<group value="pr_exclude"/>
21+
</annotations>
22+
<before>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
24+
<createData entity="_defaultCategory" stepKey="createCategory"/>
25+
<createData entity="SimpleProduct" stepKey="createProduct">
26+
<field key="price">10.00</field>
27+
</createData>
28+
<!-- Enabling PayPal Express Checkout -->
29+
<magentoCLI command="config:set {{StorefrontPaypalExpressAuthorizationPaymentActionOptionConfigData.path}} {{StorefrontPaypalExpressAuthorizationPaymentActionOptionConfigData.value}}" stepKey="setPaymentActionOrder"/>
30+
<actionGroup ref="AdminPayPalExpressCheckoutEnableActionGroup" stepKey="configPayPalExpress">
31+
<argument name="credentials" value="SamplePaypalExpressConfig2"/>
32+
</actionGroup>
33+
<!-- Enable Free Shipping method -->
34+
<createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
35+
<!-- Create Tax Rule w/ NY & CA Tax Rates -->
36+
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
37+
<actionGroup ref="AdminDeleteMultipleTaxRatesActionGroup" stepKey="deleteAllNonDefaultTaxRates"/>
38+
<actionGroup ref="AdminGoToNewTaxRulePageActionGroup" stepKey="goToCreateTaxRulePage"/>
39+
<fillField selector="{{AdminTaxRulesSection.ruleName}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillRuleName"/>
40+
<actionGroup ref="AddNewTaxRateNoZipActionGroup" stepKey="addNYTaxRate">
41+
<argument name="taxCode" value="SimpleTaxNY"/>
42+
</actionGroup>
43+
<actionGroup ref="AddNewTaxRateNoZipActionGroup" stepKey="addCATaxRate">
44+
<argument name="taxCode" value="SimpleTaxCA"/>
45+
</actionGroup>
46+
<actionGroup ref="AdminSaveTaxRuleActionGroup" stepKey="saveTaxRule"/>
47+
</before>
48+
<after>
49+
<!-- Delete Product -->
50+
<deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
51+
<deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
52+
<!-- Disable Free Shipping method -->
53+
<createData entity="FreeShippingMethodDisableConfig" stepKey="disableFreeShipping"/>
54+
<!-- Disable Paypal -->
55+
<actionGroup ref="AdminPayPalExpressCheckoutDisableActionGroup" stepKey="configPaypalExpressCheckoutDisable"/>
56+
<!-- Revert to default tax rate and rule -->
57+
<actionGroup ref="ChangeToDefaultTaxConfigurationUIActionGroup" stepKey="changeToDefaultTaxConfiguration"/>
58+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
59+
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
60+
<argument name="name" value="{{SimpleTaxRule.code}}"/>
61+
<argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
62+
</actionGroup>
63+
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
64+
<actionGroup ref="AdminDeleteMultipleTaxRatesActionGroup" stepKey="deleteAllNonDefaultTaxRates"/>
65+
<!-- Logout -->
66+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
67+
</after>
68+
<!-- Go to StoreFront -->
69+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/>
70+
<!-- Add simple product to cart -->
71+
<actionGroup ref="StorefrontAddSimpleProductWithQtyActionGroup" stepKey="addSimpleProductToCart">
72+
<argument name="product" value="$$createProduct$$"/>
73+
<argument name="quantity" value="1"/>
74+
</actionGroup>
75+
<!-- Open mini cart from product page -->
76+
<actionGroup ref="StorefrontOpenMiniCartActionGroup" stepKey="openMiniShoppingCart"/>
77+
<!--Click Paypal button-->
78+
<actionGroup ref="SwitchToPayPalGroupBtnActionGroup" stepKey="clickPayPalBtn"/>
79+
<!--Login to Paypal in-context-->
80+
<actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="loginToPayPal"/>
81+
<!--Select US shipping address-->
82+
<actionGroup ref="SelectShippingAddressOnPayPalPaymentPageActionGroup" stepKey="selectUSShippingAddress">
83+
<argument name="address" value="ShippingAddressUS"/>
84+
</actionGroup>
85+
<!--Click PayPal button and go back to Magento site-->
86+
<actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="ClickContinueGoBackToMagentoSite"/>
87+
<!--Select free shipping-->
88+
<actionGroup ref="StorefrontSelectShippingMethodOnOrderReviewPageActionGroup" stepKey="selectShippingMethod">
89+
<argument name="shippingMethod" value="Free - $0.00"/>
90+
</actionGroup>
91+
<!--Assert grand total-->
92+
<actionGroup ref="StorefrontAssertOrderReviewSummaryWithTaxActionGroup" stepKey="verifyCheckoutPaymentOrderSummary">
93+
<argument name="orderSummarySubTotal" value="$10.00"/>
94+
<argument name="orderSummaryShippingTotal" value="$0.00"/>
95+
<argument name="orderSummaryTax" value="$0.83"/>
96+
<argument name="orderSummaryTotal" value="$10.83"/>
97+
</actionGroup>
98+
<!--SubmitOrder-->
99+
<actionGroup ref="StorefrontPlaceOrderOnOrderReviewPageActionGroup" stepKey="clickPlaceOrderBtn"/>
100+
<!--See success messages-->
101+
<see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
102+
<see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order # is: " stepKey="seeOrderNumber"/>
103+
<waitForElementVisible selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="waitForOrderNumberToBeGrabbed"/>
104+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
105+
<!-- Go to order page -->
106+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openFirstOrderPage">
107+
<argument name="orderId" value="{$grabOrderNumber}"/>
108+
</actionGroup>
109+
<!-- Check order status -->
110+
<actionGroup ref="AdminOrderViewCheckStatusActionGroup" stepKey="seeAdminOrderStatus">
111+
<argument name="status" value="Processing"/>
112+
</actionGroup>
113+
<!-- Check grand total -->
114+
<waitForText selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$10.83" stepKey="checkGrandTotal"/>
115+
<!-- Check comment history -->
116+
<actionGroup ref="AdminOpenOrderCommentsHistoryActionGroup" stepKey="clickOnCommentsHistory"/>
117+
<waitForText selector="{{AdminOrderCommentsTabSection.orderComment}}" userInput="Authorized amount of $10.83." stepKey="seeOrderHistoryNotes"/>
118+
<!-- Check transaction tab and is closed values-->
119+
<actionGroup ref="AdminOpenOrderTransactionActionGroup" stepKey="clickOnTransactionTab"/>
120+
<waitForElementVisible selector="{{AdminOrderDetailsOrderViewSection.transactionTable('increment_id','{$grabOrderNumber}')}}" stepKey="verifyTransactionIsPresent"/>
121+
<waitForElementVisible selector="{{AdminOrderDetailsOrderViewSection.transactionTable('is_closed','No')}}" stepKey="verifyTransactionIsClosedValue"/>
122+
</test>
123+
</tests>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrderTransactionActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminOpenOrderTransactionActionGroup">
12+
<annotations>
13+
<description>Clicks on the 'Transaction' on Admin View Order page.</description>
14+
</annotations>
15+
<waitForElementClickable selector="{{AdminOrderDetailsOrderViewSection.transaction}}" stepKey="waitForTransactionTab"/>
16+
<click selector="{{AdminOrderDetailsOrderViewSection.transaction}}" stepKey="clickOnTabTransaction"/>
17+
<waitForElementVisible selector="{{AdminOrderDetailsOrderViewSection.transactionTotalCount}}" stepKey="waitForTransactionCountText"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
<element name="creditMemos" type="button" selector="#sales_order_view_tabs_order_creditmemos"/>
1515
<element name="shipments" type="button" selector="#sales_order_view_tabs_order_shipments"/>
1616
<element name="commentsHistory" type="button" selector="#sales_order_view_tabs_order_history"/>
17+
<element name="transaction" type="button" selector="#sales_order_view_tabs_order_transactions"/>
18+
<element name="transactionTable" type="block" selector="//table[@id='order_transactions_table']//tbody//tr//td[@data-column='{{columnName}}'][contains(text(),'{{columnValue}}')]" parameterized="true"/>
19+
<element name="transactionTotalCount" type="text" selector="#order_transactions-total-count"/>
1720
</section>
1821
</sections>

‎app/code/Magento/Swatches/Test/Mftf/ActionGroup/OpenSwatchMenuByIndexActionGroup.xml

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

1919
<!-- I had to use executeJS to perform the click to get around the use of CSS ::before and ::after -->
2020
<executeJS function="jQuery('#swatch_window_option_option_{{index}}').click()" stepKey="clickSwatch1"/>
21+
<scrollTo selector="{{AdminManageSwatchSection.swatchWindow(index)}}" stepKey="scrollToSwatchWindow"/>
2122
</actionGroup>
2223
</actionGroups>

‎app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
<actionGroup ref="OpenSwatchMenuByIndexActionGroup" stepKey="clickSwatch1">
5959
<argument name="index" value="0"/>
6060
</actionGroup>
61+
<waitForElementClickable selector="{{AdminManageSwatchSection.nthChooseColor('1')}}" stepKey="waitToClickChooseColor1"/>
6162
<click selector="{{AdminManageSwatchSection.nthChooseColor('1')}}" stepKey="clickChooseColor1"/>
6263
<actionGroup ref="SetColorPickerByHexActionGroup" stepKey="fillHex1">
6364
<argument name="nthColorPicker" value="1"/>
@@ -69,6 +70,7 @@
6970
<actionGroup ref="OpenSwatchMenuByIndexActionGroup" stepKey="clickSwatch2">
7071
<argument name="index" value="1"/>
7172
</actionGroup>
73+
<waitForElementClickable selector="{{AdminManageSwatchSection.nthChooseColor('2')}}" stepKey="waitToClickChooseColor2"/>
7274
<click selector="{{AdminManageSwatchSection.nthChooseColor('2')}}" stepKey="clickChooseColor2"/>
7375
<actionGroup ref="SetColorPickerByHexActionGroup" stepKey="fillHex2">
7476
<argument name="nthColorPicker" value="2"/>
@@ -80,6 +82,7 @@
8082
<actionGroup ref="OpenSwatchMenuByIndexActionGroup" stepKey="clickSwatch3">
8183
<argument name="index" value="2"/>
8284
</actionGroup>
85+
<waitForElementClickable selector="{{AdminManageSwatchSection.nthChooseColor('3')}}" stepKey="waitToClickChooseColor3"/>
8386
<click selector="{{AdminManageSwatchSection.nthChooseColor('3')}}" stepKey="clickChooseColor3"/>
8487
<actionGroup ref="SetColorPickerByHexActionGroup" stepKey="fillHex3">
8588
<argument name="nthColorPicker" value="3"/>

0 commit comments

Comments
 (0)