Merge remote-tracking branch 'origin/MC-23024' into 2.4-develop-pr119

Author: zakdma

app/code/Magento/Ups/Model/Carrier.php

@@ -807,21 +807,24 @@ protected function _getXmlQuotes()
         $httpResponse = $this->asyncHttpClient->request(
             new Request($url, Request::METHOD_POST, ['Content-Type' => 'application/xml'], $xmlRequest)
         );
-
+        $debugData['request'] = $xmlParams;
         return $this->deferredProxyFactory->create(
             [
                 'deferred' => new CallbackDeferred(
-                    function () use ($httpResponse) {
+                    function () use ($httpResponse, $debugData) {
                         $responseResult = null;
                         $xmlResponse = '';
                         try {
                             $responseResult = $httpResponse->get();
-                        } catch (HttpException $exception) {
-                            $this->_logger->critical($exception);
+                        } catch (HttpException $e) {
+                            $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
+                            $this->_logger->critical($e);
                         }
                         if ($responseResult) {
                             $xmlResponse = $responseResult->getStatusCode() >= 400 ? '' : $responseResult->getBody();
                         }
+                        $debugData['result'] = $xmlResponse;
+                        $this->_debug($debugData);
 
                         return $this->_parseXmlResponse($xmlResponse);
                     }
@@ -1125,6 +1128,7 @@ protected function _getXmlTracking($trackings)
         /** @var HttpResponseDeferredInterface[] $trackingResponses */
         $trackingResponses = [];
         $tracking = '';
+        $debugData = [];
         foreach ($trackings as $tracking) {
             /**
              * RequestOption==>'1' to request all activities
@@ -1141,7 +1145,7 @@ protected function _getXmlTracking($trackings)
     <IncludeFreight>01</IncludeFreight>
 </TrackRequest>
 XMLAuth;
-
+            $debugData[$tracking] = ['request' => $this->filterDebugData($this->_xmlAccessRequest) . $xmlRequest];
             $trackingResponses[$tracking] = $this->asyncHttpClient->request(
                 new Request(
                     $url,
@@ -1155,6 +1159,8 @@ protected function _getXmlTracking($trackings)
             $httpResponse = $response->get();
             $xmlResponse = $httpResponse->getStatusCode() >= 400 ? '' : $httpResponse->getBody();
 
+            $debugData[$tracking]['result'] = $xmlResponse;
+            $this->_debug($debugData);
             $this->_parseXmlTrackingResponse($tracking, $xmlResponse);
         }
 

dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php

@@ -19,7 +19,9 @@
 use Magento\Quote\Model\Quote\Address\RateRequestFactory;
 use Magento\TestFramework\HTTP\AsyncClientInterfaceMock;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 use Magento\Shipping\Model\Shipment\Request;
+use Psr\Log\LoggerInterface;
 
 /**
  * Integration tests for Carrier model class
@@ -43,14 +45,32 @@ class CarrierTest extends TestCase
      */
     private $config;
 
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var string[]
+     */
+    private $logs = [];
+
     /**
      * @inheritDoc
      */
     protected function setUp(): void
     {
-        $this->carrier = Bootstrap::getObjectManager()->create(Carrier::class);
         $this->httpClient = Bootstrap::getObjectManager()->get(AsyncClientInterface::class);
         $this->config = Bootstrap::getObjectManager()->get(ReinitableConfigInterface::class);
+        $this->logs = [];
+        $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->loggerMock->method('debug')
+            ->willReturnCallback(
+                function (string $message) {
+                    $this->logs[] = $message;
+                }
+            );
+        $this->carrier = Bootstrap::getObjectManager()->create(Carrier::class, ['logger' => $this->loggerMock]);
     }
 
     /**
@@ -136,6 +156,7 @@ public function testCollectFreeRates()
      * @magentoConfigFixture default_store carriers/ups/username user
      * @magentoConfigFixture default_store carriers/ups/password pass
      * @magentoConfigFixture default_store carriers/ups/access_license_number acn
+     * @magentoConfigFixture default_store carriers/ups/debug 1
      * @magentoConfigFixture default_store currency/options/allow GBP,USD,EUR
      * @magentoConfigFixture default_store currency/options/base GBP
      */
@@ -172,6 +193,17 @@ public function testCollectRates(int $negotiable, int $tax, int $responseId, str
         $rates = $this->carrier->collectRates($request)->getAllRates();
         $this->assertEquals($price, $rates[0]->getPrice());
         $this->assertEquals($method, $rates[0]->getMethod());
+
+        $requestFound = false;
+        foreach ($this->logs as $log) {
+            if (mb_stripos($log, 'RatingServiceSelectionRequest') &&
+                mb_stripos($log, 'RatingServiceSelectionResponse')
+            ) {
+                $requestFound = true;
+                break;
+            }
+        }
+        $this->assertTrue($requestFound);
     }
 
     /**
@@ -304,6 +336,7 @@ public function testRequestToShipment(): void
      * @magentoConfigFixture default_store carriers/ups/username user
      * @magentoConfigFixture default_store carriers/ups/password pass
      * @magentoConfigFixture default_store carriers/ups/access_license_number acn
+     * @magentoConfigFixture default_store carriers/ups/debug 1
      * @magentoConfigFixture default_store currency/options/allow GBP,USD,EUR
      * @magentoConfigFixture default_store currency/options/base GBP
      */