MTA-3901: Add variation for Partial Refund an order placed through Braintree with Partial capture

Rykh Oleksandr · Rykh Oleksandr · commit 0b86f931a9e0 · 2017-01-06T15:46:22.000+02:00
- fixed fail with comments
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart/Items.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart/Items.php
@@ -53,8 +53,6 @@ protected function getModuleName(FixtureInterface $product)
      *
      * @param null|string $key
      * @return array
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getData($key = null)
     {
@@ -65,7 +63,7 @@ public function getData($key = null)
             $this->data[] = $item;
         }
 
-        return $this->data;
+        return parent::getData($key);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/Cart/Item.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/Cart/Item.php
@@ -48,7 +48,11 @@ public function getData($key = null)
             ];
         }
         $attributeKey = implode(' ', $attributeKey);
-        $cartItem['sku'] = $productData['configurable_attributes_data']['matrix'][$attributeKey]['sku'];
+        if (isset($productData['configurable_attributes_data']['matrix'][$attributeKey])) {
+            $cartItem['sku'] = $productData['configurable_attributes_data']['matrix'][$attributeKey]['sku'];
+        } else {
+            $cartItem['sku'] = $productData['sku'];
+        }
         $cartItem['name'] = $productData['name'];
 
         $cartItem['options'] = isset($cartItem['options'])
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
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Sales\Test\TestCase\CreateOnlineCreditMemoTest" summary="Create online credit memo for order placed with online payment method">
         <variation name="CreateOnlineCreditMemoPaymentsProTestVariation1" summary="Create Refund for Order Paid with PayPal Payments Pro" ticketId="MAGETWO-13059">
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="checkoutMethod" xsi:type="string">guest</data>
@@ -38,27 +39,33 @@
                 <item name="transactionType" xsi:type="string">Capture</item>
                 <item name="statusIsClosed" xsi:type="string">Yes</item>
             </data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertRefundInCommentsHistory" />
             <constraint name="Magento\Sales\Test\Constraint\AssertRefundInCreditMemoTab" />
             <constraint name="Magento\Sales\Test\Constraint\AssertTransactionStatus" />
         </variation>
         <variation name="CreateOnlineCreditMemoPayflowProVariation1" summary="Create Refund for Order Paid with PayPal Payflow Pro" ticketId="MAGETWO-13063">
+            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="checkoutMethod" xsi:type="string">guest</data>
-            <data name="refundedPrices" xsi:type="array">
-                <item name="0" xsi:type="string">15.00</item>
+            <data name="order/data/refund" xsi:type="array">
+                <item name="0" 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_creditmemo_total" xsi:type="string">15.00</item>
+                </item>
             </data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="payment/method" xsi:type="string">payflowpro</data>
             <data name="configData" xsi:type="string">payflowpro</data>
             <data name="creditCard/dataset" xsi:type="string">visa_default</data>
-            <data name="data/items_data/0/qty" xsi:type="string">-</data>
             <data name="status" xsi:type="string">Closed</data>
             <data name="transactions/Authorization" xsi:type="array">
                 <item name="transactionType" xsi:type="string">Authorization</item>
@@ -72,7 +79,6 @@
                 <item name="transactionType" xsi:type="string">Capture</item>
                 <item name="statusIsClosed" xsi:type="string">Yes</item>
             </data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertRefundSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertRefundInCommentsHistory" />
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info/CommentsHistoryBlock.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Info/CommentsHistoryBlock.php
@@ -70,8 +70,11 @@ public function getComments()
                 'time' => $item->find($this->commentHistoryTime)->getText(),
                 'status' => $item->find($this->commentHistoryStatus)->getText(),
                 'is_customer_notified' => $item->find($this->commentHistoryNotifiedStatus)->getText(),
-                'comment' => $item->find($this->comment)->getText()
+                'comment' => '',
             ];
+            if ($item->find($this->comment)->isVisible()) {
+                $result[$key]['comment'] = $item->find($this->comment)->getText();
+            }
         }
 
         return $result;
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php
@@ -43,7 +43,7 @@ public function processAssert(
         $comments = $infoTab->getCommentsHistoryBlock()->getComments();
 
         foreach ($comments as $key => $comment) {
-            if (stristr($comment['comment'], 'captured') === false) {
+            if (strstr($comment['comment'], 'Captured') === false) {
                 unset($comments[$key]);
             }
         }
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
@@ -48,7 +48,7 @@ public function processAssert(
                 unset($comments[$key]);
             }
         }
-        $comments = array_values($comments);
+        $comments = array_reverse(array_values($comments));
 
         $refundedPrices = $order->getPrice()['refund'];
         foreach ($refundedPrices as $key => $refundedPrice) {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php
@@ -61,7 +61,6 @@ class SubmitOrderStep implements TestStepInterface
     private $products;
 
     /**
-     * @constructor
      * @param OrderCreateIndex $orderCreateIndex
      * @param SalesOrderView $salesOrderView
      * @param FixtureFactory $fixtureFactory
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Block/Product/ProductList/ProductItem.php
@@ -36,7 +36,9 @@ public function fillData(\Magento\ConfigurableProduct\Test\Fixture\ConfigurableP
         $attributes = $confAttrSource->getAttributes();
 
         foreach ($options as $option) {
-            if (!isset($attributes[$option['title']])) {
+            if (!isset($attributes[$option['title']])
+                || stripos ($attributes[$option['title']]->getFrontendInput(), "swatch") === false
+            ) {
                 continue;
             }
             $availableOptions = $attributes[$option['title']]->getOptions();
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/ConfigurableProduct/CheckoutData.xml b/dev/tests/functional/tests/app/Magento/Swatches/Test/Repository/ConfigurableProduct/CheckoutData.xml
@@ -34,6 +34,10 @@
                         <item name="title" xsi:type="string">attribute_key_0</item>
                         <item name="value" xsi:type="string">option_key_1</item>
                     </item>
+                    <item name="1" xsi:type="array">
+                        <item name="title" xsi:type="string">attribute_key_1</item>
+                        <item name="value" xsi:type="string">option_key_1</item>
+                    </item>
                 </item>
             </field>
             <field name="qty" xsi:type="string">1</field>

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,6 @@ protected function getModuleName(FixtureInterface $product)`
`53`	`53`	`*`
`54`	`54`	`* @param null\|string $key`
`55`	`55`	`* @return array`
`56`		`- *`
`57`		`- * @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`58`	`56`	`*/`
`59`	`57`	`public function getData($key = null)`
`60`	`58`	`{`
`@@ -65,7 +63,7 @@ public function getData($key = null)`
`65`	`63`	`$this->data[] = $item;`
`66`	`64`	`}`
`67`	`65`
`68`		`- return $this->data;`
	`66`	`+ return parent::getData($key);`
`69`	`67`	`}`
`70`	`68`
`71`	`69`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function processAssert(`
`43`	`43`	`$comments = $infoTab->getCommentsHistoryBlock()->getComments();`
`44`	`44`
`45`	`45`	`foreach ($comments as $key => $comment) {`
`46`		`- if (stristr($comment['comment'], 'captured') === false) {`
	`46`	`+ if (strstr($comment['comment'], 'Captured') === false) {`
`47`	`47`	`unset($comments[$key]);`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function processAssert(`
`48`	`48`	`unset($comments[$key]);`
`49`	`49`	`}`
`50`	`50`	`}`
`51`		`- $comments = array_values($comments);`
	`51`	`+ $comments = array_reverse(array_values($comments));`
`52`	`52`
`53`	`53`	`$refundedPrices = $order->getPrice()['refund'];`
`54`	`54`	`foreach ($refundedPrices as $key => $refundedPrice) {`