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

@@ -1,28 +1,32 @@
 <?php
-
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 namespace Magento\Sitemap\Model;
 
 use Magento\Framework\App\CacheInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\App\Filesystem;
 
 /**
- * Tests Magento\Framework\ComposerInformation
+ * Tests class for Magento\Sitemap\Model\Sitemap.
+ *
  */
 class SitemapTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var \Magento\Framework\ObjectManagerInterface.
      */
     private $objectManager;
 
     /**
-     * @var \Magento\Sitemap\Model\Sitemap
+     * @var \Magento\Sitemap\Model\Sitemap.
      */
     private $sitemap;
 
     /**
-     * Remove cached configuration and reinitialize the application
+     * Remove cached configuration and reinitialize the application.
      */
     private function refreshConfiguration()
     {
@@ -41,14 +45,13 @@ public function setUp()
     }
 
     /**
-     * Test generation sitemap when secure url is on
+     * Test generating sitemap.xml file when secure url option is on.
      *
      * @magentoDataFixture Magento/Sitemap/_files/sitemap_secure.php
      */
     public function testGenerationWithAdminSecureUrl()
     {
         self::refreshConfiguration();
-
         $this->sitemap->setData(
             [
                 'sitemap_id' => '1',
@@ -57,15 +60,11 @@ public function testGenerationWithAdminSecureUrl()
                 '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

@@ -1,4 +1,8 @@
 <?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 

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

@@ -1,4 +1,8 @@
 <?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();