17
17
use Magento \Sales \Model \Order ;
18
18
use Magento \Sales \Model \Order \CreditmemoFactory ;
19
19
use Magento \Sales \Model \ResourceModel \Order \Collection as OrderCollection ;
20
+ use Magento \Sales \Model \ResourceModel \Order \Creditmemo \Collection ;
20
21
use Magento \Sales \Model \Service \CreditmemoService ;
21
22
use Magento \TestFramework \Helper \Bootstrap ;
22
23
use Magento \TestFramework \TestCase \GraphQlAbstract ;
@@ -53,9 +54,6 @@ class CreditmemoTest extends GraphQlAbstract
53
54
/** @var SearchCriteriaBuilder */
54
55
private $ searchCriteriaBuilder ;
55
56
56
- /** @var string */
57
- private $ orderNumber ;
58
-
59
57
/**
60
58
* Set up
61
59
*/
@@ -76,8 +74,8 @@ protected function setUp(): void
76
74
77
75
protected function tearDown (): void
78
76
{
77
+ $ this ->cleanUpCreditMemos ();
79
78
$ this ->deleteOrder ();
80
- $ this ->cleanUpCreditMemos ($ this ->orderNumber );
81
79
}
82
80
83
81
/**
@@ -174,10 +172,9 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
174
172
['sku ' => 'bundle-product-two-dropdown-options ' , 'quantity ' => 2 ]
175
173
);
176
174
$ orderNumber = $ placeOrderResponse ['placeOrder ' ]['order ' ]['order_number ' ];
177
- $ this ->orderNumber = $ orderNumber ;
178
- $ this ->prepareInvoice ($ this ->orderNumber , 2 );
175
+ $ this ->prepareInvoice ($ orderNumber , 2 );
179
176
180
- $ order = $ this ->order ->loadByIncrementId ($ this -> orderNumber );
177
+ $ order = $ this ->order ->loadByIncrementId ($ orderNumber );
181
178
/** @var Order\Item $orderItem */
182
179
$ orderItem = current ($ order ->getAllItems ());
183
180
$ orderItem ->setQtyRefunded (1 );
@@ -277,10 +274,8 @@ public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
277
274
['sku ' => 'bundle-product-two-dropdown-options ' , 'quantity ' => 2 ]
278
275
);
279
276
$ orderNumber = $ placeOrderResponse ['placeOrder ' ]['order ' ]['order_number ' ];
280
- $ this ->orderNumber = $ orderNumber ;
281
- $ this ->prepareInvoice ($ this ->orderNumber , 2 );
282
-
283
- $ order = $ this ->order ->loadByIncrementId ($ this ->orderNumber );
277
+ $ this ->prepareInvoice ($ orderNumber , 2 );
278
+ $ order = $ this ->order ->loadByIncrementId ($ orderNumber );
284
279
/** @var Order\Item $orderItem */
285
280
$ orderItem = current ($ order ->getAllItems ());
286
281
$ orderItem ->setQtyRefunded (1 );
@@ -427,17 +422,21 @@ private function deleteOrder(): void
427
422
}
428
423
429
424
/**
430
- * @param $orderNumber
425
+ * @return void
431
426
*/
432
- private function cleanUpCreditMemos ($ orderNumber ): void
427
+ private function cleanUpCreditMemos (): void
433
428
{
429
+ /** @var \Magento\Framework\Registry $registry */
430
+ $ registry = Bootstrap::getObjectManager ()->get (\Magento \Framework \Registry::class);
431
+ $ registry ->unregister ('isSecureArea ' );
432
+ $ registry ->register ('isSecureArea ' , true );
434
433
$ creditmemoRepository = Bootstrap::getObjectManager ()->get (CreditmemoRepositoryInterface::class);
435
- $ searchCriteria = $ this ->searchCriteriaBuilder ->addFilter ('increment_id ' , $ orderNumber )
436
- ->create ();
437
- $ creditmemos = $ creditmemoRepository ->getList ($ searchCriteria )->getItems ();
438
- foreach ($ creditmemos as $ creditmemo ) {
434
+ $ creditmemoCollection = Bootstrap::getObjectManager ()->create (Collection::class);
435
+ foreach ($ creditmemoCollection as $ creditmemo ) {
439
436
$ creditmemoRepository ->delete ($ creditmemo );
440
437
}
438
+ $ registry ->unregister ('isSecureArea ' );
439
+ $ registry ->register ('isSecureArea ' , false );
441
440
}
442
441
443
442
/**
0 commit comments