Fix static and integration tests.

magento · Apr 5, 2019 · 2a343dd · 2a343dd
1 parent 12498b5
commit 2a343dd
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 2 deletions.
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -684,6 +684,7 @@ public function refund($creditmemo)
                         $gateway->refund($this, $baseAmountToRefund);
 
                         $creditmemo->setTransactionId($this->getLastTransId());
+                        // phpcs:ignore Magento2.Exceptions.ThrowCatch
                     } catch (\Magento\Framework\Exception\LocalizedException $e) {
                         if (!$captureTxn) {
                             throw new \Magento\Framework\Exception\LocalizedException(

diff --git a/app/code/Magento/Sales/Model/RefundOrder.php b/app/code/Magento/Sales/Model/RefundOrder.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Model;
 
 use Magento\Framework\App\ResourceConnection;

diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order;
 
 use Magento\Framework\Model\Context;

diff --git a/app/code/Magento/Sales/Test/Unit/Model/RefundOrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/RefundOrderTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model;
 
 use Magento\Framework\App\ResourceConnection;

diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Service\V1;
 
 use Magento\Sales\Model\Order;

diff --git a/...ts/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/...ts/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
@@ -10,15 +10,16 @@
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Model\Order;
-use Magento\TestFramework\TestCase\AbstractBackendController;
 use PHPUnit\Framework\Constraint\StringContains;
 
 /**
  * Provide tests for CreditMemo save controller.
  *
+ * @magentoDbIsolation enabled
  * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/invoice.php
  */
-class SaveTest extends AbstractBackendController
+class SaveTest extends AbstractCreditmemoControllerTest
 {
     /**
      * @var string

diff --git a/...tests/integration/testsuite/Magento/Sales/_files/order_with_invoice_and_custom_status.php b/...tests/integration/testsuite/Magento/Sales/_files/order_with_invoice_and_custom_status.php
@@ -8,6 +8,7 @@
 use Magento\Sales\Model\Order\Status;
 use Magento\TestFramework\Helper\Bootstrap;
 
+// phpcs:ignore Magento2.Security.IncludeFile
 require 'invoice.php';
 
 $orderStatus = Bootstrap::getObjectManager()->create(Status::class);

diff --git a/...egration/testsuite/Magento/Sales/_files/order_with_invoice_and_custom_status_rollback.php b/...egration/testsuite/Magento/Sales/_files/order_with_invoice_and_custom_status_rollback.php
@@ -8,6 +8,7 @@
 use Magento\Sales\Model\Order\Status;
 use Magento\TestFramework\Helper\Bootstrap;
 
+// phpcs:ignore Magento2.Security.IncludeFile
 require 'default_rollback.php';
 
 /** @var Status $orderStatus */