Fedex Shipping Method Configuration Fix

Author: pawan-adobe-security

app/code/Magento/Fedex/Model/Config/Backend/FedexUrl.php

@@ -28,7 +28,6 @@ class FedexUrl extends Value
      * @var Url
      */
     private Url $url;
-
     /**
      * @param Context $context
      * @param Registry $registry
@@ -61,7 +60,8 @@ public function __construct(
      */
     public function beforeSave(): AbstractModel
     {
-        $isValid = $this->url->isValid($this->getValue());
+        $isValid = $this->url->isValid($this->getValue(), ['http', 'https']);
+
         if ($isValid) {
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $host = parse_url((string)$this->getValue(), \PHP_URL_HOST);

app/code/Magento/Fedex/Test/Unit/Model/Config/Backend/FedexUrlTest.php

@@ -8,9 +8,18 @@
 
 namespace Magento\Fedex\Test\Unit\Model\Config\Backend;
 
+use Magento\Fedex\Model\Config\Backend\FedexUrl;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Exception\ValidatorException;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Registry;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Fedex\Model\Config\Backend\FedexUrl;
+use Magento\Framework\Validator\Url;
+use Magento\Rule\Model\ResourceModel\AbstractResource;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -22,39 +31,70 @@ class FedexUrlTest extends TestCase
     /**
      * @var FedexUrl
      */
-    private $config;
+    private $urlConfig;
 
     /**
-     * @return void
+     * @var Url
      */
+    private $url;
+
+    /**
+     * @var Context|MockObject
+     */
+    private $contextMock;
+
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
-        /** @var FedexUrl $fedexUrl */
-        $this->config = $objectManager->getObject(FedexUrl::class);
+        $this->contextMock = $this->createMock(Context::class);
+        $registry = $this->createMock(Registry::class);
+        $config = $this->createMock(ScopeConfigInterface::class);
+        $cacheTypeList = $this->createMock(TypeListInterface::class);
+        $this->url = $this->createMock(Url::class);
+        $resource = $this->createMock(AbstractResource::class);
+        $resourceCollection = $this->createMock(AbstractDb::class);
+        $eventManagerMock = $this->getMockForAbstractClass(ManagerInterface::class);
+        $eventManagerMock->expects($this->any())->method('dispatch');
+        $this->contextMock->expects($this->any())->method('getEventDispatcher')->willReturn($eventManagerMock);
+
+        $this->urlConfig = $objectManager->getObject(
+            FedexUrl::class,
+            [
+                'url' => $this->url,
+                'context' => $this->contextMock,
+                'registry' => $registry,
+                'config' => $config,
+                'cacheTypeList' => $cacheTypeList,
+                'resource' => $resource,
+                'resourceCollection' => $resourceCollection,
+            ]
+        );
     }
 
     /**
      * @dataProvider validDataProvider
      * @param string|null $data The valid data
      * @throws ValidatorException
      */
-    public function testBeforeSave(string $data = null)
+    public function testBeforeSave(string $data = null): void
     {
-        $this->config->setValue($data);
-        $this->config->beforeSave();
+        $this->url->expects($this->any())->method('isValid')->willReturn(true);
+        $this->urlConfig->setValue($data);
+        $this->urlConfig->beforeSave();
+        $this->assertTrue($this->url->isValid($data));
     }
 
     /**
      * @dataProvider invalidDataProvider
      * @param string $data The invalid data
      */
-    public function testBeforeSaveErrors(string $data)
+    public function testBeforeSaveErrors(string $data): void
     {
+        $this->url->expects($this->any())->method('isValid')->willReturn(true);
         $this->expectException('Magento\Framework\Exception\ValidatorException');
         $this->expectExceptionMessage('Fedex API endpoint URL\'s must use fedex.com');
-        $this->config->setValue($data);
-        $this->config->beforeSave();
+        $this->urlConfig->setValue($data);
+        $this->urlConfig->beforeSave();
     }
 
     /**