Merge branch 'MAGETWO-93497' of https://github.com/magento-mpi/magento2ce into PR-05-28-2019

Spandana Chittimala · Spandana Chittimala · commit 76b985331abe · 2019-05-28T10:58:06.000-05:00
diff --git a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
@@ -239,11 +239,7 @@ public function getCurrentUrl()
     {
         if (!$this->_currentUrl) {
             $path = $this->getCurrentPath();
-            $mediaUrl = $this->_storeManager->getStore(
-                $this->_storeId
-            )->getBaseUrl(
-                \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
-            );
+            $mediaUrl = $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
             $this->_currentUrl = $mediaUrl . $this->_directory->getRelativePath($path) . '/';
         }
         return $this->_currentUrl;
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 
+/**
+ * @magentoAppArea adminhtml
+ */
 class ImagesTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetStorageRoot()
@@ -23,6 +26,12 @@ public function testGetStorageRoot()
         $this->assertStringStartsWith($mediaPath, $helper->getStorageRoot());
     }
 
+    /**
+     * @magentoConfigFixture default_store admin/url/use_custom 1
+     * @magentoConfigFixture default_store admin/url/custom http://backend/
+     * @magentoConfigFixture admin_store web/secure/base_url http://backend/
+     * @magentoConfigFixture admin_store web/unsecure/base_url http://backend/
+     */
     public function testGetCurrentUrl()
     {
         $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(

Original file line number	Diff line number	Diff line change
`@@ -239,11 +239,7 @@ public function getCurrentUrl()`
`239`	`239`	`{`
`240`	`240`	`if (!$this->_currentUrl) {`
`241`	`241`	`$path = $this->getCurrentPath();`
`242`		`- $mediaUrl = $this->_storeManager->getStore(`
`243`		`- $this->_storeId`
`244`		`- )->getBaseUrl(`
`245`		`- \Magento\Framework\UrlInterface::URL_TYPE_MEDIA`
`246`		`- );`
	`242`	`+ $mediaUrl = $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);`
`247`	`243`	`$this->_currentUrl = $mediaUrl . $this->_directory->getRelativePath($path) . '/';`
`248`	`244`	`}`
`249`	`245`	`return $this->_currentUrl;`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`
`8`	`8`	`use Magento\Framework\App\Filesystem\DirectoryList;`
`9`	`9`
	`10`	`+/**`
	`11`	`+ * @magentoAppArea adminhtml`
	`12`	`+ */`
`10`	`13`	`class ImagesTest extends \PHPUnit\Framework\TestCase`
`11`	`14`	`{`
`12`	`15`	`public function testGetStorageRoot()`
`@@ -23,6 +26,12 @@ public function testGetStorageRoot()`
`23`	`26`	`$this->assertStringStartsWith($mediaPath, $helper->getStorageRoot());`
`24`	`27`	`}`
`25`	`28`
	`29`	`+ /**`
	`30`	`+ * @magentoConfigFixture default_store admin/url/use_custom 1`
	`31`	`+ * @magentoConfigFixture default_store admin/url/custom http://backend/`
	`32`	`+ * @magentoConfigFixture admin_store web/secure/base_url http://backend/`
	`33`	`+ * @magentoConfigFixture admin_store web/unsecure/base_url http://backend/`
	`34`	`+ */`
`26`	`35`	`public function testGetCurrentUrl()`
`27`	`36`	`{`
`28`	`37`	`$helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(`