Merge remote-tracking branch 'origin/MC-21860' into 2.3-develop-pr38

serhii-balko · serhii-balko · commit 7b388deab7d7 · 2019-11-28T13:25:26.000+02:00
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Model/SitemapTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Model/SitemapTest.php
@@ -18,7 +18,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Test for Sitemap
+ * Tests \Magento\Sitemap\Model\Sitemap functionality.
  */
 class SitemapTest extends TestCase
 {
@@ -54,8 +54,6 @@ protected function setUp()
      */
     public function testGetSitemapUrlFromParentRootDirectoryPath(): void
     {
-        $baseUrl = 'http://localhost/';
-
         $rootDir = $this->filesystem->getDirectoryRead(DirectoryList::ROOT)
             ->getAbsolutePath();
         $requestPath = dirname($rootDir);
@@ -67,6 +65,6 @@ public function testGetSitemapUrlFromParentRootDirectoryPath(): void
 
         $sitemapUrl = $this->model->getSitemapUrl('/', 'sitemap.xml');
 
-        $this->assertEquals($baseUrl.'sitemap.xml', $sitemapUrl);
+        $this->assertEquals('http://localhost/sitemap.xml', $sitemapUrl);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`use PHPUnit\Framework\TestCase;`
`19`	`19`
`20`	`20`	`/**`
`21`		`- * Test for Sitemap`
	`21`	`+ * Tests \Magento\Sitemap\Model\Sitemap functionality.`
`22`	`22`	`*/`
`23`	`23`	`class SitemapTest extends TestCase`
`24`	`24`	`{`
`@@ -54,8 +54,6 @@ protected function setUp()`
`54`	`54`	`*/`
`55`	`55`	`public function testGetSitemapUrlFromParentRootDirectoryPath(): void`
`56`	`56`	`{`
`57`		`- $baseUrl = 'http://localhost/';`
`58`		`-`
`59`	`57`	`$rootDir = $this->filesystem->getDirectoryRead(DirectoryList::ROOT)`
`60`	`58`	`->getAbsolutePath();`
`61`	`59`	`$requestPath = dirname($rootDir);`
`@@ -67,6 +65,6 @@ public function testGetSitemapUrlFromParentRootDirectoryPath(): void`
`67`	`65`
`68`	`66`	`$sitemapUrl = $this->model->getSitemapUrl('/', 'sitemap.xml');`
`69`	`67`
`70`		`- $this->assertEquals($baseUrl.'sitemap.xml', $sitemapUrl);`
	`68`	`+ $this->assertEquals('http://localhost/sitemap.xml', $sitemapUrl);`
`71`	`69`	`}`
`72`	`70`	`}`