MAGETWO-61060: [Backport] - Incorrect URLs in sitemap when generated from admin with 'Use Secure URLs in Admin' = Yes - for 2.0

Author: svitja

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

@@ -201,7 +201,7 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init('Magento\Sitemap\Model\ResourceModel\Sitemap');
+        $this->_init(\Magento\Sitemap\Model\ResourceModel\Sitemap::class);
     }
 
     /**
@@ -586,7 +586,12 @@ protected function _getBaseDir()
      */
     protected function _getStoreBaseUrl($type = \Magento\Framework\UrlInterface::URL_TYPE_LINK)
     {
-        return rtrim($this->_storeManager->getStore($this->getStoreId())->getBaseUrl($type), '/') . '/';
+        /** @var \Magento\Store\Model\Store $store */
+        $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,22 +50,27 @@ 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
      */
     protected function setUp()
     {
         $this->_sitemapCategoryMock = $this->getMockBuilder(
-            'Magento\Sitemap\Model\ResourceModel\Catalog\Category'
+            \Magento\Sitemap\Model\ResourceModel\Catalog\Category::class
         )->disableOriginalConstructor()->getMock();
         $this->_sitemapProductMock = $this->getMockBuilder(
-            'Magento\Sitemap\Model\ResourceModel\Catalog\Product'
+            \Magento\Sitemap\Model\ResourceModel\Catalog\Product::class
         )->disableOriginalConstructor()->getMock();
         $this->_sitemapCmsPageMock = $this->getMockBuilder(
-            'Magento\Sitemap\Model\ResourceModel\Cms\Page'
+            \Magento\Sitemap\Model\ResourceModel\Cms\Page::class
         )->disableOriginalConstructor()->getMock();
         $this->_helperMockSitemap = $this->getMock(
-            'Magento\Sitemap\Helper\Data',
+            \Magento\Sitemap\Helper\Data::class,
             [
                 'getCategoryChangefreq',
                 'getProductChangefreq',
@@ -114,23 +119,23 @@ protected function setUp()
         $this->_helperMockSitemap->expects($this->any())->method('getPagePriority')->will($this->returnValue('0.25'));
 
         $this->_resourceMock = $this->getMockBuilder(
-            'Magento\Sitemap\Model\ResourceModel\Sitemap'
+            \Magento\Sitemap\Model\ResourceModel\Sitemap::class
         )->setMethods(
             ['_construct', 'beginTransaction', 'rollBack', 'save', 'addCommitCallback', 'commit', '__wakeup']
         )->disableOriginalConstructor()->getMock();
         $this->_resourceMock->expects($this->any())->method('addCommitCallback')->will($this->returnSelf());
 
         $this->_fileMock = $this->getMockBuilder(
-            'Magento\Framework\Filesystem\File\Write'
+            \Magento\Framework\Filesystem\File\Write::class
         )->disableOriginalConstructor()->getMock();
 
         $this->_directoryMock = $this->getMockBuilder(
-            'Magento\Framework\Filesystem\Directory\Write'
+            \Magento\Framework\Filesystem\Directory\Write::class
         )->disableOriginalConstructor()->getMock();
         $this->_directoryMock->expects($this->any())->method('openFile')->will($this->returnValue($this->_fileMock));
 
         $this->_filesystemMock = $this->getMockBuilder(
-            'Magento\Framework\Filesystem'
+            \Magento\Framework\Filesystem::class
         )->setMethods(
             ['getDirectoryWrite']
         )->disableOriginalConstructor()->getMock();
@@ -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',
@@ -554,15 +572,14 @@ protected function _getModelMock($mockBeforeSave = false)
 
         /** @var $model \Magento\Sitemap\Model\Sitemap */
         $model = $this->getMockBuilder(
-            'Magento\Sitemap\Model\Sitemap'
+            \Magento\Sitemap\Model\Sitemap::class
         )->setMethods(
             $methods
         )->setConstructorArgs(
             $this->_getModelConstructorArgs()
         )->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(
@@ -585,7 +602,7 @@ protected function _getModelMock($mockBeforeSave = false)
     protected function _getModelConstructorArgs()
     {
         $categoryFactory = $this->getMockBuilder(
-            'Magento\Sitemap\Model\ResourceModel\Catalog\CategoryFactory'
+            \Magento\Sitemap\Model\ResourceModel\Catalog\CategoryFactory::class
         )->setMethods(
             ['create']
         )->disableOriginalConstructor()->getMock();
@@ -598,26 +615,31 @@ protected function _getModelConstructorArgs()
         );
 
         $productFactory = $this->getMockBuilder(
-            'Magento\Sitemap\Model\ResourceModel\Catalog\ProductFactory'
+            \Magento\Sitemap\Model\ResourceModel\Catalog\ProductFactory::class
         )->setMethods(
             ['create']
         )->disableOriginalConstructor()->getMock();
         $productFactory->expects($this->any())->method('create')->will($this->returnValue($this->_sitemapProductMock));
 
         $cmsFactory = $this->getMockBuilder(
-            'Magento\Sitemap\Model\ResourceModel\Cms\PageFactory'
+            \Magento\Sitemap\Model\ResourceModel\Cms\PageFactory::class
         )->setMethods(
             ['create']
         )->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',
+            \Magento\Sitemap\Model\Sitemap::class,
             [
                 'categoryFactory' => $categoryFactory,
                 'productFactory' => $productFactory,
                 'cmsFactory' => $cmsFactory,
+                'storeManager' => $this->storeManagerMock,
                 'sitemapData' => $this->_helperMockSitemap,
                 'filesystem' => $this->_filesystemMock
             ]
@@ -641,7 +663,7 @@ public function testGetSitemapUrl($storeBaseUrl, $documentRoot, $baseDir, $sitem
     {
         /** @var $model \Magento\Sitemap\Model\Sitemap */
         $model = $this->getMockBuilder(
-            'Magento\Sitemap\Model\Sitemap'
+            \Magento\Sitemap\Model\Sitemap::class
         )->setMethods(
             ['_getStoreBaseUrl', '_getDocumentRoot', '_getBaseDir', '_construct']
         )->setConstructorArgs(