Merge pull request #726 from magento-fearless-kiwis/FearlessKiwis-MAGETWO-59785-IncorrectUrls-in-sitemap

Fearless kiwis magetwo 59785 incorrect urls in sitemap

Author: Joan He

app/code/Magento/Sitemap/Model/Sitemap.php

@@ -586,7 +586,9 @@ protected function _getBaseDir()
      */
     protected function _getStoreBaseUrl($type = \Magento\Framework\UrlInterface::URL_TYPE_LINK)
     {
-        return rtrim($this->_storeManager->getStore($this->getStoreId())->getBaseUrl($type), '/') . '/';
+        $store = $this->_storeManager->getStore($this->getStoreId());
+        $isSecure = $store->isUrlSecure();
+        return rtrim($store->getBaseUrl($type, $isSecure), '/') . '/';
     }
 
     /**

app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php

@@ -50,6 +50,11 @@ class SitemapTest extends \PHPUnit_Framework_TestCase
      */
     protected $_fileMock;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
     /**
      * Set helper mocks, create resource model mock
      */
@@ -473,6 +478,20 @@ function ($from, $to) {
 
         $model = $this->_getModelMock(true);
 
+        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+            ->setMethods(['isFrontUrlSecure', 'getBaseUrl'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $storeMock->expects($this->atLeastOnce())->method('isFrontUrlSecure')->willReturn(false);
+        $storeMock->expects($this->atLeastOnce())
+            ->method('getBaseUrl')
+            ->with($this->isType('string'), false)
+            ->willReturn('http://store.com/');
+        $this->storeManagerMock->expects($this->atLeastOnce())
+            ->method('getStore')
+            ->with(1)
+            ->willReturn($storeMock);
+
         return $model;
     }
 
@@ -490,7 +509,6 @@ protected function _getModelMock($mockBeforeSave = false)
             '_getBaseDir',
             '_getFileObject',
             '_afterSave',
-            '_getStoreBaseUrl',
             '_getCurrentDateTime',
             '_getCategoryItemsCollection',
             '_getProductItemsCollection',
@@ -562,7 +580,6 @@ protected function _getModelMock($mockBeforeSave = false)
         )->getMock();
 
         $model->expects($this->any())->method('_getResource')->will($this->returnValue($this->_resourceMock));
-        $model->expects($this->any())->method('_getStoreBaseUrl')->will($this->returnValue('http://store.com/'));
         $model->expects(
             $this->any()
         )->method(
@@ -611,13 +628,18 @@ protected function _getModelConstructorArgs()
         )->disableOriginalConstructor()->getMock();
         $cmsFactory->expects($this->any())->method('create')->will($this->returnValue($this->_sitemapCmsPageMock));
 
+        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->setMethods(['getStore'])
+            ->getMockForAbstractClass();
+
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $constructArguments = $objectManager->getConstructArguments(
             \Magento\Sitemap\Model\Sitemap::class,
             [
                 'categoryFactory' => $categoryFactory,
                 'productFactory' => $productFactory,
                 'cmsFactory' => $cmsFactory,
+                'storeManager' => $this->storeManagerMock,
                 'sitemapData' => $this->_helperMockSitemap,
                 'filesystem' => $this->_filesystemMock
             ]