Skip to content

Commit 83e4609

Browse files
NeeloferAnsariNeeloferAnsari
committed
Incorporated Review comments
1 parent 78485aa commit 83e4609

File tree

3 files changed

+23
-22
lines changed

3 files changed

+23
-22
lines changed

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@
7272
<element name="billingAddressSameAsShippingCashOnDeliveryCheckbox" type="checkbox" selector="#billing-address-same-as-shipping-cashondelivery"/>
7373
<element name="errormessage" type="text" selector="//div[@data-ui-id='checkout-cart-validationmessages-message-error']"/>
7474
<element name="productQuantityInCartBlock" type="text" selector="//div[@class='details-qty']/span[@class='value']" />
75-
<element name="productChargedFor" type="text" selector="tr.totals.charge span.price" />
75+
<element name="productChargedFor" type="text" selector="tr.totals.charge span.price"/>
7676
</section>
7777
</sections>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@
2626
<element name="updateTotals" type="button" selector=".update-totals-button" timeout="30"/>
2727
<element name="disabledUpdateTotals" type="button" selector=".update-totals-button.disabled" timeout="30"/>
2828
<element name="orderTotalPrices" type="text" selector="//strong[text()='{{GrandTotal}}']//ancestor::tr//span[@class = 'price' and text()='{{price}}']" parameterized="true"/>
29-
<element name="subtotalAndShipping" type="text" selector="//td[@class='label' and contains(text(),'{{SubTotal}}')]//parent::tr//span[@class='price' and text()='{{price}}']" parameterized="true"/> </section>
29+
<element name="subTotalAndShipping" type="text" selector="//td[@class='label' and contains(text(),'{{SubTotal}}')]//parent::tr//span[@class='price' and text()='{{price}}']" parameterized="true"/>
30+
</section>
3031
</sections>

‎app/code/Magento/Sales/Test/Mftf/Test/CreateCreditMemowithBaseCurrencyUSDandDisplayCurrencyEuroTest.xml renamed to ‎app/code/Magento/Sales/Test/Mftf/Test/CreateCreditMemoWithBaseCurrencyUSDAndDisplayCurrencyEuroTest.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="CreateCreditMemowithBaseCurrencyUSDandDisplayCurrencyEuroTest">
10+
<test name="CreateCreditMemoWithBaseCurrencyUSDAndDisplayCurrencyEuroTest">
1111
<annotations>
1212
<features value="Order"/>
1313
<stories value="Create Credit Memo"/>
@@ -22,11 +22,11 @@
2222
<!-- Create SimpleProductWithPrice100 -->
2323
<createData entity="SimpleProduct_100" stepKey="createProduct"/>
2424
<!-- Currency Options settings -->
25-
<magentoCLI command="config:set {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}},{{SetAllowedCurrenciesConfigForEUR.value}}" stepKey="setAllowedCurrencyEURandUSD"/>
25+
<magentoCLI command="config:set {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}},{{SetAllowedCurrenciesConfigForEUR.value}}" stepKey="setAllowedCurrencyEURAndUSD"/>
2626
<magentoCLI command="config:set {{SetDefaultCurrencyEURConfig.path}} {{SetDefaultCurrencyEURConfig.value}}" stepKey="setCurrencyDefaultEUR"/>
2727
<!-- Login as Admin -->
2828
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
29-
<!-- Navigate to curency rates page -->
29+
<!-- Navigate to currency rates page -->
3030
<actionGroup ref="AdminOpenCurrencyRatesPageActionGroup" stepKey="naviagteToCurrencyRatesPage"/>
3131
<!-- Currency Rates (Stores > Currency Rates): 1.000 USD = 0.7067 EUR -->
3232
<actionGroup ref="AdminSetCurrencyRatesActionGroup" stepKey="setCurrencyRates">
@@ -53,15 +53,15 @@
5353
<!-- Admin log out -->
5454
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5555
</after>
56-
<!--Login as customer -->
56+
<!-- Login as customer -->
5757
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
5858
<argument name="Customer" value="$$createCustomer$$"/>
5959
</actionGroup>
60-
<!--Navigate To Simple Product Page -->
60+
<!-- Navigate To Simple Product Page -->
6161
<actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="navigateToSimpleProductPage">
6262
<argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
6363
</actionGroup>
64-
<!-- Verify product prices for simple product-->
64+
<!-- Verify product prices for simple product -->
6565
<actionGroup ref="AssertStorefrontProductPricesActionGroup" stepKey="assertSimpleProductPrices">
6666
<argument name="productPrice" value="€70.67"/>
6767
<argument name="productFinalPrice" value="€70.67"/>
@@ -72,8 +72,8 @@
7272
</actionGroup>
7373
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCart"/>
7474
<actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="goToCheckout"/>
75-
<!-- verify flat rate €3.53-->
76-
<waitForText selector="{{CheckoutShippingMethodsSection.price}}" stepKey="seeflatRate" userInput="€3.53"/>
75+
<!-- verify flat rate €3.53 -->
76+
<waitForText selector="{{CheckoutShippingMethodsSection.price}}" stepKey="seeFlatRate" userInput="€3.53"/>
7777
<!-- click on Next button -->
7878
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
7979
<!-- verify order summary -->
@@ -84,43 +84,43 @@
8484
<argument name="total" value="€74.20"/>
8585
</actionGroup>
8686
<waitForText userInput="$105.00" selector="{{CheckoutPaymentSection.productChargedFor}}" stepKey="assertProductChargedFor"/>
87-
<!-- Place order-->
87+
<!-- Place order -->
8888
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
8989
<waitForElement selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="waitForOrderId"/>
9090
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
91-
<!-- Navigate to Sales order page-->
91+
<!-- Navigate to Sales order page -->
9292
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="navigateToSalesOrderPage"/>
9393
<!-- Open created order -->
9494
<actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="filterOrdersGridById">
9595
<argument name="entityId" value="{$orderId}"/>
9696
</actionGroup>
97-
<!-- Submit invoice-->
97+
<!-- Submit invoice -->
9898
<actionGroup ref="AdminClickInvoiceButtonOrderViewActionGroup" stepKey="clickOnInvoiceBtn"/>
9999
<actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
100100
<waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
101-
<!-- Click 'Credit Memo' button and create new memo -->
101+
<!-- Click 'Credit Memo' button and create new memo -->
102102
<actionGroup ref="AdminStartToCreateCreditMemoFromOrderPageActionGroup" stepKey="createCreditMemo"/>
103-
<!-- Assert Credit Memo refund prices-->
103+
<!-- Assert Credit Memo refund prices -->
104104
<actionGroup ref="AssertAdminCreditMemoNewPageTotalsActionGroup" stepKey="assertCreditMemoRefundTotals">
105105
<argument name="refundShipping" value="5.00"/>
106106
<argument name="adjustmentRefund" value="0.00"/>
107107
<argument name="adjustmentFee" value="0.00"/>
108108
<argument name="subtotalRow" value="$100.00"/>
109109
<argument name="grandTotal" value="$105.00"/>
110110
</actionGroup>
111-
<!-- Assert Grand total and subtotal value-->
112-
<waitForElementVisible selector="{{AdminCreditMemoTotalSection.orderTotalPrices('Grand Total','€74.20')}}" stepKey="seeGrandTotalValueEURO"/>
113-
<waitForElementVisible selector="{{AdminCreditMemoTotalSection.subtotalAndShipping('Subtotal','€70.67')}}" stepKey="seeSubTotalValueEURO"/>
114-
<!-- Refund Offline-->
111+
<!-- Assert Grand total and subtotal value -->
112+
<waitForElementVisible selector="{{AdminCreditMemoTotalSection.orderTotalPrices('Grand Total','€74.20')}}" stepKey="waitForGrandTotalValueEURO"/>
113+
<waitForElementVisible selector="{{AdminCreditMemoTotalSection.subTotalAndShipping('Subtotal','€70.67')}}" stepKey="waitForSubTotalValueEURO"/>
114+
<!-- Refund Offline -->
115115
<actionGroup ref="AdminClickRefundOfflineOnCreditMemoDetailPageActionGroup" stepKey="clickRefundOffline"/>
116116
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="navigateToSalesOrderPageAgain"/>
117117
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
118118
<waitForElementClickable selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="waitForColumnsDropdownToBeOpened"/>
119-
<click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="openColumnsdropDown"/>
120-
<!-- Enable to display Total Refunded column and validate currency -->
119+
<click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="openColumnsDropDown"/>
120+
<!-- Enable to display Total Refunded column and validate currency -->
121121
<checkOption selector="{{AdminProductGridFilterSection.viewColumnOption('Total Refunded')}}" stepKey="showRefundedColumn"/>
122122
<waitForElementClickable selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="waitForColumnsDropdownToBeClickedToClose"/>
123-
<click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="closeColumnsdropDown"/>
123+
<click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="closeColumnsDropDown"/>
124124
<waitForElement selector="{{AdminGridHeaders.headerNameandValueOtherCurrency('Grand Total (Base)','105.00')}}" stepKey="waitForGrandTotalBaseValue"/>
125125
<grabTextFrom selector="{{AdminGridHeaders.headerNameandValueOtherCurrency('Grand Total (Base)','105.00')}}" stepKey="grabGrandTotalBaseValue"/>
126126
<assertEquals stepKey="seeGrandTotalBase">

0 commit comments

Comments
 (0)