Skip to content

Commit b4d9583

Browse files
committed
MC-29206: Orders in Payment System but not in Magento
- fix test builds failures
1 parent 1621e5d commit b4d9583

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
5656
*/
5757
private $logger;
5858

59-
/**
60-
* @var ResourceConnection
61-
*/
62-
private $connectionPool;
63-
6459
/**
6560
* @param \Magento\Quote\Api\GuestBillingAddressManagementInterface $billingAddressManagement
6661
* @param \Magento\Quote\Api\GuestPaymentMethodManagementInterface $paymentMethodManagement

dev/tests/integration/testsuite/Magento/SalesRule/Model/Observer/AssignCouponDataAfterOrderCustomerAssignTest.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
use Magento\Customer\Model\Data\Customer;
1010
use Magento\Customer\Model\GroupManagement;
11-
use Magento\Framework\Controller\Result\Redirect;
1211
use Magento\Sales\Model\Order;
12+
use Magento\Sales\Model\Service\OrderService;
1313
use Magento\SalesRule\Api\CouponRepositoryInterface;
1414
use Magento\SalesRule\Model\Coupon;
1515
use Magento\SalesRule\Model\Rule;
@@ -80,6 +80,11 @@ class AssignCouponDataAfterOrderCustomerAssignTest extends \PHPUnit\Framework\Te
8080
*/
8181
private $customer;
8282

83+
/**
84+
* @var OrderService
85+
*/
86+
private $orderService;
87+
8388
/**
8489
* @inheritdoc
8590
*/
@@ -94,6 +99,7 @@ protected function setUp()
9499
$this->assignCouponToCustomerObserver = $this->objectManager->get(
95100
\Magento\SalesRule\Observer\AssignCouponDataAfterOrderCustomerAssignObserver::class
96101
);
102+
$this->orderService = $this->objectManager->get(OrderService::class);
97103

98104
$this->salesRule = $this->prepareSalesRule();
99105
$this->coupon = $this->attachSalesruleCoupon($this->salesRule);
@@ -142,7 +148,7 @@ public function testOrderCancelingDecreasesCouponUsages()
142148
$this->processOrder($this->order);
143149

144150
// Should not throw exception as bux is fixed now
145-
$this->order->cancel();
151+
$this->orderService->cancel($this->order->getId());
146152
$ruleCustomer = $this->getSalesruleCustomerUsage($this->customer, $this->salesRule);
147153

148154
// Assert, that rule customer model has been created for specific customer

0 commit comments

Comments
 (0)