MAGETWO-89079: Different order statuses with zero value and none zero statuses

- Order States fix

- Tests fix

Author: SeruyV

app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml

@@ -9,10 +9,10 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="CONST" type="CONST">
-        <data key="Complete">Complete</data>
-        <data key="Closed">Closed</data>
-        <data key="Pending">Pending</data>
-        <data key="Processing">Processing</data>
+        <data key="orderStatusComplete">Complete</data>
+        <data key="orderStatusClosed">Closed</data>
+        <data key="orderStatusPending">Pending</data>
+        <data key="orderStatusProcessing">Processing</data>
     </entity>
 </entities>
 

app/code/Magento/Sales/Test/Mftf/Test/AdminAbleToShipPartiallyInvoicedItemsTest.xml

@@ -59,7 +59,7 @@
         <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" after="grabOrderId" stepKey="seeViewOrderPage"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You created the order." after="seeViewOrderPage" stepKey="seeSuccessMessage"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.Pending}}" stepKey="seeOrderPending"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusPending}}" stepKey="seeOrderPending"/>
         <grabTextFrom selector="|Order # (\d+)|" after="seeSuccessMessage" stepKey="getOrderId"/>
         <scrollTo selector="{{AdminOrderItemsOrderedSection.qtyColumn}}" after="getOrderId" stepKey="scrollToItemsOrdered"/>
         <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Ordered 10" after="scrollToItemsOrdered" stepKey="seeQtyOfItemsOrdered"/>
@@ -80,7 +80,7 @@
         <waitForPageLoad stepKey="waitForInvoiceToSubmit1"/>
         <!--Invoice created successfully-->
         <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceSuccessMessage"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.Processing}}" stepKey="seeOrderProcessing1"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusProcessing}}" stepKey="seeOrderProcessing1"/>
         <scrollTo selector="{{AdminOrderItemsOrderedSection.itemStatus('1')}}" stepKey="scrollToOrderItems"/>
         <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Invoiced 5" stepKey="see5itemsInvoiced"/>
         <scrollTo selector="{{AdminHeaderSection.pageTitle}}" stepKey="scrollToTopOfPage"/>
@@ -100,7 +100,7 @@
         <waitForLoadingMaskToDisappear stepKey="waitForShipmentToSubmit"/>
         <!--Verify shipment created successfully-->
         <see selector="{{AdminMessagesSection.success}}" userInput="The shipment has been created." after="submitShipment" stepKey="successfullShipmentCreation"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.Processing}}" stepKey="seeOrderProcessing2"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusProcessing}}" stepKey="seeOrderProcessing2"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="$getOrderId" stepKey="seeOrderIdInPageTitleAfterShip"/>
         <scrollTo selector="{{AdminOrderItemsOrderedSection.itemStatus('1')}}" stepKey="scrollToOrderItems1"/>
         <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Shipped 5" stepKey="see5itemsShipped"/>
@@ -120,7 +120,7 @@
         <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="submitRefundOffline"/>
         <!--Verify Credit Memo created successfully-->
         <see selector="{{AdminMessagesSection.success}}" userInput="You created the credit memo." after="submitRefundOffline" stepKey="seeCreditMemoSuccessMsg"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.Processing}}" stepKey="seeOrderProcessing3"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusProcessing}}" stepKey="seeOrderProcessing3"/>
         <scrollTo selector="{{AdminOrderItemsOrderedSection.itemStatus('1')}}" stepKey="scrollToOrderItems2"/>
         <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Refunded 5" stepKey="see5itemsRefunded"/>
         <scrollTo selector="{{AdminHeaderSection.pageTitle}}" stepKey="scrollToTopOfPage2"/>
@@ -142,7 +142,7 @@
         <waitForPageLoad stepKey="waitForInvoiceToSubmit2"/>
         <!--Invoice created successfully for the rest of the ordered items-->
         <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceSuccessMessage2"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.Processing}}" stepKey="seeOrderProcessing4"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusProcessing}}" stepKey="seeOrderProcessing4"/>
         <scrollTo selector="{{AdminOrderItemsOrderedSection.itemStatus('1')}}" stepKey="scrollToOrderItems3"/>
         <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Invoiced 10" stepKey="see10itemsInvoiced"/>
         <scrollTo selector="{{AdminHeaderSection.pageTitle}}" stepKey="scrollToTopOfPage3"/>
@@ -161,7 +161,7 @@
         <!--Submit Shipment-->
         <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" after="fillRestOfItemsToShip" stepKey="submitShipment2" />
         <see selector="{{AdminMessagesSection.success}}" userInput="The shipment has been created." after="submitShipment2" stepKey="successfullyCreatedShipment"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.Complete}}" stepKey="seeOrderComplete"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusComplete}}" stepKey="seeOrderComplete"/>
 
         <!--Verify Items Status and Shipped Qty in the Items Ordered section-->
         <scrollTo selector="{{AdminOrderItemsOrderedSection.itemStatus('1')}}" stepKey="scrollToItemsOrdered2"/>

app/code/Magento/Sales/Test/Mftf/Test/AdminCreditMemoTotalAfterShippingDiscountTest.xml

@@ -99,7 +99,7 @@
         <!-- Create invoice -->
         <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.Pending}}" stepKey="seeOrderPending"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusPending}}" stepKey="seeOrderPending"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
 
@@ -117,7 +117,7 @@
         <grabTextFrom selector="{{AdminInvoiceTotalSection.grandTotal}}" stepKey="grabInvoiceGrandTotal" after="seeCorrectGrandTotal"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
         <see selector="{{OrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage1"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.Processing}}" stepKey="seeOrderProcessing"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusProcessing}}" stepKey="seeOrderProcessing"/>
 
         <!--Create Credit Memo-->
         <comment userInput="Admin creates credit memo" stepKey="createCreditMemoComment"/>

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php

@@ -53,9 +53,11 @@ function () {
     protected function waitForElementEnabled(string $selector, string $strategy = Locator::SELECTOR_CSS)
     {
         $browser = $this->browser;
+
         return $browser->waitUntil(
             function () use ($browser, $selector, $strategy) {
                 $element = $browser->find($selector, $strategy);
+
                 return !$element->isDisabled() ? true : null;
             }
         );