Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1334: CreateOrderBackendTest rework to support MSI 'Reorder' button new behaviour. #16006

Merged
merged 4 commits into from
Jun 18, 2018
Merged

1334: CreateOrderBackendTest rework to support MSI 'Reorder' button new behaviour. #16006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0501e17
1334: CreateOrderBackendTest rework to support MSI 'Reorder button' n…
nmalevanec Jun 11, 2018
731b58f
1334: CreateOrderBackendTest rework to support MSI 'Reorder button' n…
nmalevanec Jun 12, 2018
7c3d53f
1334: CreateOrderBackendTest rework to support MSI 'Reorder button' n…
nmalevanec Jun 13, 2018
0d06ad8
1334: CreateOrderBackendTest rework to support MSI 'Reorder button' n…
nmalevanec Jun 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<data name="creditCard/data/payment_code" xsi:type="string">braintree</data>
<data name="configData" xsi:type="string">braintree</data>
<data name="status" xsi:type="string">Processing</data>
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Hold, Invoice, Ship, Reorder, Edit</data>
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
<data name="orderButtonsAvailable" xsi:type="string">Back, Cancel, Send Email, Invoice, Reorder, Edit</data>
<constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
Expand All @@ -55,9 +55,9 @@
<data name="creditCard/dataset" xsi:type="string">visa_default</data>
<data name="creditCard/data/payment_code" xsi:type="string">braintree</data>
<data name="configData" xsi:type="string">braintree, braintree_sale</data>
<data name="status" xsi:type="string">Processing</data>
<data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Hold, Ship, Reorder</data>
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
<data name="status" xsi:type="string">Complete</data>
<data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Reorder</data>
<constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
Expand All @@ -83,7 +83,7 @@
<data name="creditCard/dataset" xsi:type="string">visa_braintree_fraud_rejected</data>
<data name="configData" xsi:type="string">braintree</data>
<data name="status" xsi:type="string">Processing</data>
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
<constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
</variation>
Expand Down
10 changes: 10 additions & 0 deletions dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,16 @@ class Actions extends Block
*/
protected $confirmModal = '.confirm._show[data-role=modal]';

/**
* Is shipment can be created.
*
* @return bool
*/
public function canShip()
{
return $this->_rootElement->find($this->ship)->isVisible();
}

/**
* Ship order.
*
Expand Down
4 changes: 2 additions & 2 deletions dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</data>
<data name="payment/method" xsi:type="string">cashondelivery</data>
<data name="configData" xsi:type="string">cashondelivery</data>
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
<constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Catalog\Test\Constraint\AssertProductsOutOfStock" />
</variation>
Expand All @@ -35,7 +35,7 @@
</data>
<data name="payment/method" xsi:type="string">cashondelivery</data>
<data name="configData" xsi:type="string">cashondelivery</data>
<constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
<constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
<constraint name="Magento\Sales\Test\Constraint\AssertReorderButtonIsNotVisibleOnFrontend" />
</variation>
Expand Down
18 changes: 13 additions & 5 deletions dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateShipmentStep.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,21 @@ public function run()
{
$this->orderIndex->open();
$this->orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $this->order->getId()]);
$this->salesOrderView->getPageActions()->ship();
if (!empty($this->data)) {
$this->orderShipmentNew->getFormBlock()->fillData($this->data, $this->order->getEntityId()['products']);
$shipmentIds = [];
/**
* As this step is used in general scenarios and not all test cases has shippable items(ex: virtual product)
* we need to check, if it possible to create shipment for given order.
*/
if ($this->salesOrderView->getPageActions()->canShip()) {
$this->salesOrderView->getPageActions()->ship();
if (!empty($this->data)) {
$this->orderShipmentNew->getFormBlock()->fillData($this->data, $this->order->getEntityId()['products']);
}
$this->orderShipmentNew->getFormBlock()->submit();
$shipmentIds = $this->getShipmentIds();
}
$this->orderShipmentNew->getFormBlock()->submit();

return ['shipmentIds' => $this->getShipmentIds()];
return ['shipmentIds' => $shipmentIds];
}

/**
Expand Down
3 changes: 2 additions & 1 deletion dev/tests/functional/tests/app/Magento/Sales/Test/etc/testcase.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
<step name="fillShippingAddress" module="Magento_Sales" next="selectShippingMethodForOrder" />
<step name="selectShippingMethodForOrder" module="Magento_Sales" next="selectPaymentMethodForOrder" />
<step name="selectPaymentMethodForOrder" module="Magento_Sales" next="submitOrder" />
<step name="submitOrder" module="Magento_Sales" />
<step name="submitOrder" module="Magento_Sales" next="createShipment"/>
<step name="createShipment" module="Magento_Sales"/>
</scenario>
<scenario name="CreateOrderBackendPartOneTest" firstStep="setupConfiguration">
<step name="setupConfiguration" module="Magento_Config" next="createProducts" />
Expand Down