diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml
index 90f77942815a3f59a4d2cc7e94dc50d625350784..c0ffd06eb479f40552018cd60f4962e1fe0a4984 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml
@@ -11,7 +11,7 @@
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
<data name="products/1" xsi:type="string">bundleProduct::bundle_fixed_100_dollar_product</data>
<data name="customer/dataset" xsi:type="string">default</data>
- <data name="checkoutMethod" xsi:type="string">login</data>
+ <data name="checkoutMethod" xsi:type="string">guest</data>
<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
<data name="order/data/refund" xsi:type="array">
<item name="0" xsi:type="array">
@@ -20,7 +20,7 @@
</data>
<data name="order/data/price/refund" xsi:type="array">
<item name="0" xsi:type="array">
- <item name="grand_refund_total" xsi:type="string">139.90</item>
+ <item name="grand_creditmemo_total" xsi:type="string">139.90</item>
</item>
</data>
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
@@ -29,7 +29,6 @@
<data name="payment/method" xsi:type="string">braintree_paypal</data>
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_sale, braintree_paypal_skip_order_review</data>
<data name="paymentAction" xsi:type="string">sale</data>
- <data name="data/items_data/0/qty" xsi:type="string">-</data>
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertRefundInCreditMemoTab" />
@@ -38,16 +37,24 @@
<variation name="CreateOnlineCreditMemoBraintreePaypalTestVariation2" summary="Partial refund of order placed within Braintree PayPal" ticketId="MAGETWO-48698">
<data name="products/0" xsi:type="string">catalogProductSimple::simple_for_sales</data>
<data name="customer/dataset" xsi:type="string">default</data>
- <data name="checkoutMethod" xsi:type="string">login</data>
+ <data name="checkoutMethod" xsi:type="string">guest</data>
<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
<data name="order/data/refund" xsi:type="array">
<item name="0" xsi:type="array">
<item name="invoiceId" xsi:type="string">0</item>
+ <item name="items_data" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="qty" xsi:type="string">1</item>
+ </item>
+ </item>
+ </item>
+ <item name="1" xsi:type="array">
+ <item name="invoiceId" xsi:type="string">0</item>
</item>
</data>
<data name="order/data/price/refund" xsi:type="array">
<item name="0" xsi:type="array">
- <item name="grand_refund_total" xsi:type="string">621.20</item>
+ <item name="grand_creditmemo_total" xsi:type="string">606.20</item>
</item>
</data>
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
@@ -56,9 +63,6 @@
<data name="payment/method" xsi:type="string">braintree_paypal</data>
<data name="configData" xsi:type="string">braintree, braintree_paypal, braintree_paypal_skip_order_review</data>
<data name="data/items_data/0/qty" xsi:type="string">2</data>
- <data name="refundData/items_data/0/qty" xsi:type="string">1</data>
- <data name="order/dataset" xsi:type="string">default</data>
- <data name="isCreditMemoPartial" xsi:type="string">Yes</data>
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
<constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertRefundInCreditMemoTab" />
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreeTest.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreeTest.xml
index 397d582c85e6b13c53b0e48c9d47dadc88c6d921..fd4dd405ba08408c7e23c6827b79c0c0249812e4 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreeTest.xml
@@ -35,14 +35,13 @@
</data>
<data name="order/data/price/refund" xsi:type="array">
<item name="0" xsi:type="array">
- <item name="grand_refund_total" xsi:type="string">145.98</item>
+ <item name="grand_creditmemo_total" xsi:type="string">145.98</item>
</item>
</data>
<data name="transactions/refund" xsi:type="array">
<item name="transactionType" xsi:type="string">Refund</item>
<item name="statusIsClosed" xsi:type="string">Yes</item>
</data>
- <data name="data/items_data/0/qty" xsi:type="string">-</data>
<constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
<constraint name="Magento\Sales\Test\Constraint\AssertRefundInCommentsHistory" />
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
@@ -84,10 +83,10 @@
</data>
<data name="order/data/price/refund" xsi:type="array">
<item name="0" xsi:type="array">
- <item name="grand_refund_total" xsi:type="string">1.08</item>
+ <item name="grand_creditmemo_total" xsi:type="string">1.08</item>
</item>
<item name="1" xsi:type="array">
- <item name="grand_refund_total" xsi:type="string">134.07</item>
+ <item name="grand_creditmemo_total" xsi:type="string">134.07</item>
</item>
</data>
<data name="transactions/refund" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
index d61e2fff6337a4ddc3c616bd9dbc1ad2c8e0540e..93b4ae77e7cbfcff418d7e186bfffc7a5fd266b6 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php
@@ -11,47 +11,69 @@ use Magento\Checkout\Test\Page\CheckoutOnepage;
use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
use Magento\Mtf\Fixture\FixtureFactory;
use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Sales\Test\Fixture\OrderInjectable;
/**
- * Class PlaceOrderWithPaypalStep
+ * Place order with Paypal in one page checkout.
*/
class PlaceOrderWithPaypalStep implements TestStepInterface
{
/**
+ * Onepage checkout page.
+ *
* @var CheckoutOnepage
*/
private $checkoutOnepage;
/**
+ * Assert that Order Grand Total is correct on checkout page review block.
+ *
* @var AssertGrandTotalOrderReview
*/
private $assertGrandTotalOrderReview;
/**
+ * Assert billing address is not present in selected payment method.
+ *
* @var AssertBillingAddressAbsentInPayment
*/
private $assertBillingAddressAbsentInPayment;
/**
+ * One page checkout success page.
+ *
* @var CheckoutOnepageSuccess
*/
private $checkoutOnepageSuccess;
/**
+ * Price array.
+ *
* @var array
*/
private $prices;
/**
+ * Factory for fixtures.
+ *
* @var FixtureFactory
*/
private $fixtureFactory;
/**
+ * Array of product entities.
+ *
* @var array
*/
private $products;
+ /**
+ * Fixture OrderInjectable.
+ *
+ * @var OrderInjectable
+ */
+ private $order;
+
/**
* @param CheckoutOnepage $checkoutOnepage
* @param AssertGrandTotalOrderReview $assertGrandTotalOrderReview
@@ -59,7 +81,8 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
* @param CheckoutOnepageSuccess $checkoutOnepageSuccess
* @param FixtureFactory $fixtureFactory
* @param array $products
- * @param array $prices
+ * @param array|null $prices
+ * @param OrderInjectable|null $order
*/
public function __construct(
CheckoutOnepage $checkoutOnepage,
@@ -68,7 +91,8 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
CheckoutOnepageSuccess $checkoutOnepageSuccess,
FixtureFactory $fixtureFactory,
array $products,
- array $prices = []
+ array $prices = [],
+ OrderInjectable $order = null
) {
$this->checkoutOnepage = $checkoutOnepage;
$this->assertGrandTotalOrderReview = $assertGrandTotalOrderReview;
@@ -77,10 +101,13 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
$this->fixtureFactory = $fixtureFactory;
$this->products = $products;
$this->prices = $prices;
+ $this->order = $order;
}
/**
- * @inheritdoc
+ * Place order after checking order totals on review step.
+ *
+ * @return array
*/
public function run()
{
@@ -94,15 +121,15 @@ class PlaceOrderWithPaypalStep implements TestStepInterface
->getSelectedPaymentMethodBlock()
->clickPayWithPaypal();
$this->checkoutOnepage->getBraintreePaypalBlock()->process($parentWindow);
-
+ $data = [
+ 'entity_id' => ['products' => $this->products]
+ ];
+ $orderData = $this->order !== null ? $this->order->getData() : [];
$order = $this->fixtureFactory->createByCode(
'orderInjectable',
- [
- 'data' => [
- 'entity_id' => ['products' => $this->products]
- ]
- ]
+ ['data' => array_merge($data, $orderData)]
);
+
return [
'orderId' => $this->checkoutOnepageSuccess->getSuccessBlock()->getGuestOrderId(),
'order' => $order
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php
index e1eed665851e4710f5039c522a9d36c02a9fb59d..7da3383014c28479e5a9b42b09c195343f2f74c6 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php
@@ -72,9 +72,9 @@ class PlaceOrderStep implements TestStepInterface
* @param AssertGrandTotalOrderReview $assertGrandTotalOrderReview
* @param CheckoutOnepageSuccess $checkoutOnepageSuccess
* @param FixtureFactory $fixtureFactory
- * @param OrderInjectable $order
- * @param array $products
- * @param array $prices
+ * @param OrderInjectable|null $order
+ * @param array|null $products
+ * @param array|null $prices
*/
public function __construct(
CheckoutOnepage $checkoutOnepage,
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateOnlineCreditMemoTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateOnlineCreditMemoTest.xml
index 8b0c4417729264e085fa7b7853295a12db2fe129..6c8d7bdc2dc960d661451568ef0e38f3b44d9aa2 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateOnlineCreditMemoTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateOnlineCreditMemoTest.xml
@@ -18,7 +18,7 @@
</data>
<data name="order/data/price/refund" xsi:type="array">
<item name="0" xsi:type="array">
- <item name="grand_refund_total" xsi:type="string">15.00</item>
+ <item name="grand_creditmemo_total" xsi:type="string">15.00</item>
</item>
</data>
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php
index 1cfad8033bd5755df01975559682db88c4b26d61..495bd7bcdab29682659608cb68e2dd2bc0b60ff2 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php
@@ -70,6 +70,7 @@ class Grid extends DataGrid
*/
public function getCreditMemoId()
{
+ $this->resetFilter();
$this->waitForElementNotVisible($this->loader, Locator::SELECTOR_XPATH);
return $this->_rootElement->find($this->creditMemoId)->getText();
}
@@ -82,6 +83,7 @@ class Grid extends DataGrid
public function getIds()
{
$result = [];
+ $this->resetFilter();
$this->waitForElementNotVisible($this->loader, Locator::SELECTOR_XPATH);
$creditMemoIds = $this->_rootElement->getElements($this->creditMemoId);
foreach ($creditMemoIds as $creditMemoId) {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php
index e7c98aa0f7cb69a99d4c6d6b8a6deb749f7f1476..97e99eb9f7b36306bd7595c0fa93d75191cf591b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php
@@ -42,7 +42,7 @@ class AssertRefundInCommentsHistory extends AbstractConstraint
$actualRefundedAmount = $salesOrderView->getOrderHistoryBlock()->getRefundedAmount();
foreach ($refundedPrices as $key => $refundedPrice) {
\PHPUnit_Framework_Assert::assertRegExp(
- sprintf(self::REFUNDED_AMOUNT_PATTERN, $refundedPrice['grand_refund_total']),
+ sprintf(self::REFUNDED_AMOUNT_PATTERN, $refundedPrice['grand_creditmemo_total']),
$actualRefundedAmount[$key],
'Incorrect refunded amount value for the order #' . $orderId
);
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
index f42e1de5ad13c98f40f1adff2f7c0efe99d262b4..67f023784c6fb6a955d0887639e6d1a4c9e6480a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
@@ -37,7 +37,7 @@ class AssertRefundInCreditMemoTab extends AbstractConstraint
$salesOrderView->getOrderForm()->openTab('creditmemos');
/** @var Grid $grid */
$grid = $salesOrderView->getOrderForm()->getTab('creditmemos')->getGridBlock();
- $amount = $order->getPrice();
+ $amount = $order->getPrice()['refund'];
foreach ($ids['creditMemoIds'] as $key => $creditMemoId) {
$filter = [
'id' => $creditMemoId,
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
index 5b63d92a17e8e0e20f60455306cba2dd713c8290..bf61d1018be038a69040e8f84145a86c19bd1e12 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
@@ -11,13 +11,12 @@ use Magento\Sales\Test\Page\Adminhtml\CreditMemoIndex;
use Magento\Mtf\Constraint\AbstractConstraint;
/**
- * Class AssertRefundInRefundsGrid
- * Assert that refund is present in the 'Refunds' grid with correct ID, order ID, refunded amount
+ * Assert that refund is present in the 'Refunds' grid with correct ID, order ID, refunded amount.
*/
class AssertRefundInRefundsGrid extends AbstractConstraint
{
/**
- * Assert that refund is present in the 'Refunds' grid with correct ID, order ID, refunded amount
+ * Assert that refund is present in the 'Refunds' grid with correct ID, order ID, refunded amount.
*
* @param CreditMemoIndex $creditMemoIndex
* @param OrderInjectable $order
@@ -27,7 +26,7 @@ class AssertRefundInRefundsGrid extends AbstractConstraint
public function processAssert(CreditMemoIndex $creditMemoIndex, OrderInjectable $order, array $ids)
{
$creditMemoIndex->open();
- $amount = $order->getPrice();
+ $amount = $order->getPrice()['refund'];
$orderId = $order->getId();
foreach ($ids['creditMemoIds'] as $key => $creditMemoId) {
$filter = [
@@ -47,7 +46,7 @@ class AssertRefundInRefundsGrid extends AbstractConstraint
}
/**
- * Returns a string representation of the object
+ * Returns a string representation of the object.
*
* @return string
*/
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundNotInRefundsGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundNotInRefundsGrid.php
index c754d6529c0ef04a1a6f4e307cd151de917eb871..ffd6e10e8aa0aa5c9770c611dead8b9091eb2a34 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundNotInRefundsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundNotInRefundsGrid.php
@@ -26,7 +26,7 @@ class AssertRefundNotInRefundsGrid extends AbstractConstraint
public function processAssert(CreditMemoIndex $creditMemoIndex, OrderInjectable $order, array $ids)
{
$creditMemoIndex->open();
- $amount = $order->getPrice();
+ $amount = $order->getPrice()['refund'];
$orderId = $order->getId();
foreach ($ids['creditMemoIds'] as $key => $creditMemoId) {
$filter = [
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php
index 83e6082f1054d71b2697aa40375ba53726d13bd6..a6437c64dfdaa970e91d1dff28a99e7f055eff84 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php
@@ -12,12 +12,12 @@ use Magento\Sales\Test\Page\OrderHistory;
use Magento\Sales\Test\Page\CustomerOrderView;
/**
- * Assert that refunded grand total is equal to data from fixture on My Account page
+ * Assert that refunded grand total is equal to data from fixture on My Account page.
*/
class AssertRefundedGrandTotalOnFrontend extends AbstractAssertOrderOnFrontend
{
/**
- * Assert that refunded grand total is equal to data from fixture on My Account page
+ * Assert that refunded grand total is equal to data from fixture on My Account page.
*
* @param OrderHistory $orderHistory
* @param OrderInjectable $order
@@ -38,14 +38,14 @@ class AssertRefundedGrandTotalOnFrontend extends AbstractAssertOrderOnFrontend
$customerOrderView->getOrderViewBlock()->openLinkByName('Refunds');
foreach ($ids['creditMemoIds'] as $key => $creditMemoId) {
\PHPUnit_Framework_Assert::assertEquals(
- number_format($order->getPrice()[$key]['grand_creditmemo_total'], 2),
+ number_format($order->getPrice()['refund'][$key]['grand_creditmemo_total'], 2),
$creditMemoView->getCreditMemoBlock()->getItemBlock($creditMemoId)->getGrandTotal()
);
}
}
/**
- * Returns a string representation of the object
+ * Returns a string representation of the object.
*
* @return string
*/
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml
index 64e2f8808172492ca82dc8cb545f33a0554a3fc5..8c3f31343a9184e05cb5c26f490b8807b417a06b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml
@@ -34,20 +34,27 @@
</dataset>
<dataset name="full_refund">
- <field name="0" xsi:type="array">
- <item name="grand_creditmemo_total" xsi:type="string">565</item>
+ <field name="refund" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="grand_creditmemo_total" xsi:type="string">565</item>
+ </item>
</field>
</dataset>
<dataset name="full_refund_with_zero_shipping_refund">
- <field name="0" xsi:type="array">
- <item name="grand_creditmemo_total" xsi:type="string">555</item>
+ <field name="refund" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="grand_creditmemo_total" xsi:type="string">555</item>
+ </item>
</field>
</dataset>
+
<dataset name="partial_refund">
- <field name="0" xsi:type="array">
- <item name="grand_creditmemo_total" xsi:type="string">110</item>
+ <field name="refund" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="grand_creditmemo_total" xsi:type="string">110</item>
+ </item>
</field>
</dataset>