Skip to content

Commit af41d5a

Browse files
tomreecetomreece
authored
Merge pull request #4625 from magento-pangolin/MQE-1688
[pangolins] MQE-1688: Part five fixing skipped tests
2 parents 7e1857d + c0d5c98 commit af41d5a

10 files changed

+5
-28
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</annotations>
1515
<arguments>
1616
<argument name="itemQtyToRefund" type="string" defaultValue="1"/>
17-
<argument name="shippingRefund" type="string"/>
17+
<argument name="shippingRefund" type="string" defaultValue="0"/>
1818
<argument name="adjustmentRefund" type="string" defaultValue="0"/>
1919
<argument name="adjustmentFee" type="string" defaultValue="0"/>
2020
<argument name="rowNumber" type="string" defaultValue="1"/>
@@ -29,12 +29,13 @@
2929
<scrollTo selector="{{AdminCreditMemoItemsSection.header}}" stepKey="scrollToItemsToRefund"/>
3030
<fillField selector="{{AdminCreditMemoItemsSection.itemQtyToRefund(rowNumber)}}" userInput="{{itemQtyToRefund}}" stepKey="fillQtyToRefund"/>
3131
<waitForLoadingMaskToDisappear stepKey="waitForActivateButton"/>
32-
<click selector="{{AdminCreditMemoItemsSection.updateQty}}" stepKey="clickUpdateButton"/>
32+
<conditionalClick selector="{{AdminCreditMemoItemsSection.updateQty}}" dependentSelector="{{AdminCreditMemoItemsSection.disabledUpdateQty}}" visible="false" stepKey="clickUpdateButton"/>
3333
<waitForLoadingMaskToDisappear stepKey="waitForUpdate"/>
3434
<fillField userInput="{{shippingRefund}}" selector="{{AdminCreditMemoTotalSection.refundShipping}}" stepKey="fillShipping"/>
3535
<fillField userInput="{{adjustmentRefund}}" selector="{{AdminCreditMemoTotalSection.adjustmentRefund}}" stepKey="fillAdjustmentRefund"/>
3636
<fillField userInput="{{adjustmentFee}}" selector="{{AdminCreditMemoTotalSection.adjustmentFee}}" stepKey="fillAdjustmentFee"/>
3737
<checkOption selector="{{AdminCreditMemoTotalSection.emailCopy}}" stepKey="checkSendEmailCopy"/>
38+
<conditionalClick selector="{{AdminCreditMemoTotalSection.updateTotals}}" dependentSelector="{{AdminCreditMemoTotalSection.disabledUpdateTotals}}" visible="false" stepKey="clickUpdateTotalsButton"/>
3839
</actionGroup>
3940

4041
<!-- Open and fill CreditMemo refund with back to stock -->

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<element name="itemDiscountAmount" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-discont .price" parameterized="true"/>
2222
<element name="itemTotal" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-total .price" parameterized="true"/>
2323
<element name="updateQty" type="button" selector=".order-creditmemo-tables tfoot button[data-ui-id='order-items-update-button']" timeout="30"/>
24+
<element name="disabledUpdateQty" type="button" selector=".order-creditmemo-tables tfoot button[data-ui-id='order-items-update-button'].disabled" timeout="30"/>
2425
<element name="nameColumn" type="text" selector=".order-creditmemo-tables .product-title"/>
2526
<element name="skuColumn" type="text" selector=".order-creditmemo-tables .product-sku-block"/>
2627
</section>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@
2323
<element name="viewMemo" type="text" selector="div#sales_order_view_tabs_order_creditmemos_content a.action-menu-item"/>
2424
<element name="refundOffline" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-offline']"/>
2525
<element name="updateTotals" type="button" selector=".update-totals-button" timeout="30"/>
26+
<element name="disabledUpdateTotals" type="button" selector=".update-totals-button.disabled" timeout="30"/>
2627
</section>
2728
</sections>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<testCaseId value="MC-15862"/>
1818
<group value="sales"/>
1919
<group value="mtf_migrated"/>
20-
<skip>
21-
<issueId value="MC-17140"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -86,7 +83,6 @@
8683
</actionGroup>
8784

8885
<!-- On order's page click 'Refund offline' button -->
89-
<scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollTOButton"/>
9086
<click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
9187
<waitForPageLoad stepKey="waitForResultPage"/>
9288

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoConfigurableProductTest.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<testCaseId value="MC-15865"/>
1818
<group value="sales"/>
1919
<group value="mtf_migrated"/>
20-
<skip>
21-
<issueId value="MC-17140"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -143,7 +140,6 @@
143140
</actionGroup>
144141

145142
<!-- On order's page click 'Refund offline' button -->
146-
<scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollTOButton"/>
147143
<click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
148144
<waitForPageLoad stepKey="waitForResultPage"/>
149145

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<testCaseId value="MC-15861"/>
1818
<group value="sales"/>
1919
<group value="mtf_migrated"/>
20-
<skip>
21-
<issueId value="MC-17140"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -79,7 +76,6 @@
7976
</actionGroup>
8077

8178
<!-- On order's page click 'Refund offline' button -->
82-
<scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollTOButton"/>
8379
<click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
8480
<waitForPageLoad stepKey="waitForResultPage"/>
8581

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<testCaseId value="MC-15863"/>
1818
<group value="sales"/>
1919
<group value="mtf_migrated"/>
20-
<skip>
21-
<issueId value="MC-17140"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -87,7 +84,6 @@
8784
</actionGroup>
8885

8986
<!-- On order's page click 'Refund offline' button -->
90-
<scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollTOButton"/>
9187
<click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
9288
<waitForPageLoad stepKey="waitForResultPage"/>
9389

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<testCaseId value="MC-15864"/>
1818
<group value="sales"/>
1919
<group value="mtf_migrated"/>
20-
<skip>
21-
<issueId value="MC-17140"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -90,7 +87,6 @@
9087
</actionGroup>
9188

9289
<!-- On order's page click 'Refund offline' button -->
93-
<scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollTOButton"/>
9490
<click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
9591
<waitForPageLoad stepKey="waitForResultPage"/>
9692

‎app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<testCaseId value="MC-16183"/>
1818
<group value="sales"/>
1919
<group value="mtf_migrated"/>
20-
<skip>
21-
<issueId value="MC-18275"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<testCaseId value="MC-16184"/>
1818
<group value="sales"/>
1919
<group value="mtf_migrated"/>
20-
<skip>
21-
<issueId value="MC-18275"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>

0 commit comments

Comments
 (0)