Skip to content

Commit a9f0b47

Browse files
committed
Merge remote-tracking branch 'anzin/php8-compatibility/fix-unit-tests-to-be-comptaible-with-php8' into platform-health
2 parents 11c679b + 0cae025 commit a9f0b47

File tree

1 file changed

+22
-1
lines changed

1 file changed

+22
-1
lines changed

app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,25 @@ public function testRequestToShipment(array $requestData, array $expectedRequest
445445
{
446446
/** @var \Magento\Shipping\Model\Shipment\Request $request */
447447
$request = $this->helper->getObject(\Magento\Shipping\Model\Shipment\Request::class);
448+
$shipmentMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment::class)
449+
->disableOriginalConstructor()
450+
->onlyMethods(['getOrder'])
451+
->getMock();
452+
$orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
453+
->disableOriginalConstructor()
454+
->onlyMethods(['getIncrementId'])
455+
->getMock();
456+
457+
$shipmentMock->expects($this->any())
458+
->method('getOrder')
459+
->willReturn($orderMock);
460+
$orderMock->expects($this->any())
461+
->method('getIncrementId')
462+
->willReturn('100000001');
463+
464+
$requestData['order_shipment'] = $shipmentMock;
448465
$request->setData($requestData);
449-
$request->setPackages([['items' => []]]);
466+
$request->setPackages([['items' => [], 'params' => ['container' => '']]]);
450467
$this->model->requestToShipment($request);
451468
$this->assertEquals($expectedRequestData, array_intersect_key($request->getData(), $expectedRequestData));
452469
}
@@ -630,6 +647,10 @@ private function getXmlFactory(): MockObject
630647
function ($data) {
631648
$helper = new ObjectManager($this);
632649

650+
if (empty($data['data'])) {
651+
$data['data'] = '<?xml version = "1.0" ?><ShipmentAcceptRequest/>';
652+
}
653+
633654
return $helper->getObject(
634655
Element::class,
635656
['data' => $data['data']]

0 commit comments

Comments
 (0)