Merge branch 'develop' into PB-170

Author: davemacaulay

app/code/Magento/PageBuilder/Model/Stage/Config.php

@@ -152,7 +152,7 @@ public function getConfig()
             'menu_sections' => $this->getMenuSections(),
             'content_types' => $this->getContentTypes(),
             'stage_config' => $this->data,
-            'media_url' => $this->urlBuilder->getBaseUrl(['_type' => UrlInterface::URL_TYPE_MEDIA]),
+            'media_url' => $this->frontendUrlBuilder->getBaseUrl(['_type' => UrlInterface::URL_TYPE_MEDIA]),
             'preview_url' => $this->urlBuilder->getUrl('pagebuilder/stage/preview'),
             'render_url' => $this->urlBuilder->getUrl('pagebuilder/stage/render'),
             'column_grid_default' => $this->scopeConfig->getValue(self::XML_PATH_COLUMN_GRID_DEFAULT),

dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Model\Stage;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test config for page builder
+ */
+class ConfigTest extends TestCase
+{
+    /**
+     * @var Config
+     */
+    private $model;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->model = $objectManager->get(Config::class);
+    }
+
+    /**
+     * Test that "media_url" should be the same as storefront media URL
+     *
+     * @magentoConfigFixture admin/url/use_custom 1
+     * @magentoConfigFixture admin/url/custom https://backend.magento.test/
+     * @magentoConfigFixture admin_store web/secure/base_url https://backend.magento.test/
+     * @magentoConfigFixture admin_store web/unsecure/base_url https://backend.magento.test/
+     * @magentoConfigFixture admin/url/use_custom_path 1
+     * @magentoConfigFixture admin/url/custom_path secret
+     * @magentoAppIsolation enabled
+     * @magentoAppArea adminhtml
+     */
+    public function testMediaUrlShouldBeTheSameAsStorefrontMediaURL()
+    {
+        $this->assertEquals('http://localhost/pub/media/', $this->model->getConfig()['media_url']);
+    }
+}