Merge remote-tracking branch '38539/fix-38538' into comprs_v2

Author: Indrani Sonawane

app/code/Magento/Config/Model/Config/Backend/Baseurl.php

@@ -5,8 +5,8 @@
  */
 namespace Magento\Config\Model\Config\Backend;
 
-use Magento\Framework\Validator\Url as UrlValidator;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Validator\Url as UrlValidator;
 
 /**
  * @api
@@ -56,7 +56,7 @@ public function __construct(
      */
     public function beforeSave()
     {
-        $value = $this->getValue();
+        $value = strtolower($this->getValue());
         try {
             if (!$this->_validateUnsecure($value) && !$this->_validateSecure($value)) {
                 $this->_validateFullyQualifiedUrl($value);
@@ -68,6 +68,7 @@ public function beforeSave()
             $error = new \Magento\Framework\Exception\LocalizedException($msg, $e);
             throw $error;
         }
+        $this->setValue($value);
     }
 
     /**
@@ -232,6 +233,7 @@ public function afterSave()
      * Get URL Validator
      *
      * @deprecated 100.1.12
+     * @see Nothing
      * @return UrlValidator
      */
     private function getUrlValidator()

app/code/Magento/Config/Test/Unit/Model/Config/Backend/BaseurlTest.php

@@ -17,9 +17,17 @@
 use Magento\Framework\Registry;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Asset\MergeService;
+use Magento\Framework\Validator\Url as UrlValidator;
+use Magento\Framework\App\ObjectManager as AppObjectManager;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Model\Store;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test Class BaseurlTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class BaseurlTest extends TestCase
 {
     public function testSaveMergedJsCssMustBeCleaned()
@@ -61,4 +69,51 @@ public function testSaveMergedJsCssMustBeCleaned()
         $model->setValue('http://example.com/')->setPath(Store::XML_PATH_UNSECURE_BASE_URL);
         $model->afterSave();
     }
+
+    /**
+     * Test beforeSave method to ensure URL is converted to lower case.
+     *
+     * @dataProvider beforeSaveDataProvider
+     * @param string $value
+     * @param string $expectedValue
+     * @return void
+     */
+    public function testBeforeSaveConvertLowerCase(string $value, string $expectedValue): void
+    {
+        $model = (new ObjectManager($this))->getObject(Baseurl::class);
+
+        $urlValidatorMock = $this->getMockBuilder(UrlValidator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManagerInterface = $this->createMock(ObjectManagerInterface::class);
+        $objectManagerInterface->expects($this->exactly(1))
+            ->method('get')
+            ->with(UrlValidator::class)
+            ->willReturn($urlValidatorMock);
+        AppObjectManager::setInstance($objectManagerInterface);
+
+        $urlValidatorMock->expects($this->once())
+            ->method('isValid')
+            ->with($expectedValue, ['http', 'https'])
+            ->willReturn(true);
+
+        $model->setValue($value);
+        $model->beforeSave();
+        $this->assertEquals($expectedValue, $model->getValue());
+    }
+
+    /**
+     * Data provider for testBeforeSaveConvertLowerCase.
+     *
+     * @return array
+     */
+    public static function beforeSaveDataProvider(): array
+    {
+        return [
+            ['https://Example1.com/', 'https://example1.com/'],
+            ['https://EXAMPLE2.COM/', 'https://example2.com/'],
+            ['HTtpS://ExamPLe3.COM/', 'https://example3.com/'],
+        ];
+    }
 }