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

Author: svitja

dev/tests/integration/testsuite/Magento/Sitemap/Model/SitemapTest.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace Magento\Sitemap\Model;
+
+use Magento\Framework\App\CacheInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Filesystem;
+
+/**
+ * Tests Magento\Framework\ComposerInformation
+ */
+class SitemapTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Sitemap\Model\Sitemap
+     */
+    private $sitemap;
+
+    /**
+     * Remove cached configuration and reinitialize the application
+     */
+    private function refreshConfiguration()
+    {
+        $this->objectManager->get(CacheInterface::class)
+            ->clean([\Magento\Framework\App\Config::CACHE_TAG]);
+        Bootstrap::getInstance()->reinitialize();
+    }
+
+    /**
+     * Set up
+     */
+    public function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->sitemap = $this->objectManager->create(Sitemap::class);
+    }
+
+    /**
+     * Test generation sitemap when secure url is on
+     *
+     * @magentoDataFixture Magento/Sitemap/_files/sitemap_secure.php
+     */
+    public function testGenerationWithAdminSecureUrl()
+    {
+        self::refreshConfiguration();
+
+        $this->sitemap->setData(
+            [
+                'sitemap_id' => '1',
+                'sitemap_filename' => 'sitemap.xml',
+                'sitemap_path' => '/',
+                'store_id' => '1'
+            ]
+        );
+
+        $result = $this->sitemap->generateXml();
+
+        $filename = BP . $result->getSitemapPath() . $result->getSitemapFilename();
+
+        $this->assertFileExists($filename, 'File not exists! ' . $filename);
+
+        $file = $this->objectManager->get(\Magento\Framework\Filesystem\Io\File::class);
+
+        $file_content = $file->read($filename);
+
+        $this->assertNotContains('https', $file_content, "File must not contain https in sitemap file! ");
+    }
+}

dev/tests/integration/testsuite/Magento/Sitemap/_files/sitemap_secure.php

@@ -0,0 +1,27 @@
+<?php
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$scopeInterface = $objectManager->get(
+    \Magento\Framework\App\Config\ScopeConfigInterface::class
+);
+$writerInterface = $objectManager->get(
+    \Magento\Framework\App\Config\Storage\WriterInterface::class
+);
+
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$webSecureBaseUrl = $scopeInterface->getValue('web/secure/base_url');
+$webSecureUseInAdminhtml = $scopeInterface->getValue('web/secure/use_in_adminhtml');
+
+$registry->register('web_secure_base_url', $webSecureBaseUrl);
+$registry->register('web_secure_use_in_adminhtml', $webSecureUseInAdminhtml);
+
+$writerInterface->save(
+    'web/secure/base_url',
+    'https://example.com/'
+);
+$writerInterface->save(
+    'web/secure/use_in_adminhtml',
+    '1'
+);

dev/tests/integration/testsuite/Magento/Sitemap/_files/sitemap_secure_rollback.php

@@ -0,0 +1,26 @@
+<?php
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$writerInterface = $objectManager->get(
+    \Magento\Framework\App\Config\Storage\WriterInterface::class
+);
+
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+if (null !== $registry->registry('web_secure_base_url')) {
+    $writerInterface->save(
+        'web/secure/base_url',
+        $registry->registry('web_secure_base_url')
+    );
+}
+
+if (null !== $registry->registry('web_secure_use_in_adminhtml')) {
+    $writerInterface->save(
+        'web/secure/use_in_adminhtml',
+        $registry->registry('web_secure_use_in_adminhtml')
+    );
+}
+
+$registry->unregister('web_secure_base_url');
+$registry->unregister('web_secure_use_in_adminhtml');