From 76cde8dcfec9b80ef5c4b7979d8b1497f227a2f2 Mon Sep 17 00:00:00 2001 From: Venkata Uppalapati <vuppalapati@magento.com> Date: Wed, 4 Jan 2017 09:30:14 -0600 Subject: [PATCH] MAGETWO-59785: Incorrect URLs in sitemap when generated from admin with 'Use Secure URLs in Admin' = Yes Removed '_' from variable name. --- app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php index 964d12b8ad1..7ad6b6d4a21 100644 --- a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php +++ b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php @@ -53,7 +53,7 @@ class SitemapTest extends \PHPUnit_Framework_TestCase /** * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */ - private $_storeManagerMock; + private $storeManagerMock; /** * Set helper mocks, create resource model mock @@ -487,7 +487,7 @@ class SitemapTest extends \PHPUnit_Framework_TestCase ->method('getBaseUrl') ->with($this->isType('string'), false) ->willReturn('http://store.com/'); - $this->_storeManagerMock->expects($this->atLeastOnce()) + $this->storeManagerMock->expects($this->atLeastOnce()) ->method('getStore') ->with(1) ->willReturn($storeMock); @@ -628,7 +628,7 @@ class SitemapTest extends \PHPUnit_Framework_TestCase )->disableOriginalConstructor()->getMock(); $cmsFactory->expects($this->any())->method('create')->will($this->returnValue($this->_sitemapCmsPageMock)); - $this->_storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) + $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) ->setMethods(['getStore']) ->getMockForAbstractClass(); @@ -639,7 +639,7 @@ class SitemapTest extends \PHPUnit_Framework_TestCase 'categoryFactory' => $categoryFactory, 'productFactory' => $productFactory, 'cmsFactory' => $cmsFactory, - 'storeManager' => $this->_storeManagerMock, + 'storeManager' => $this->storeManagerMock, 'sitemapData' => $this->_helperMockSitemap, 'filesystem' => $this->_filesystemMock ] -- GitLab