Merge branch '2.4-develop' into add-logic-check-imports-less-for-enabled-modules

Author: mrtuvn

dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Cms\Model\Wysiwyg;
 
+use Magento\Framework\View\DesignInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestModuleWysiwygConfig\Model\Config as TestModuleWysiwygConfig;
 
@@ -18,13 +19,19 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
+    /**
+     * @var DesignInterface
+     */
+    private $design;
+
     /**
      * {@inheritdoc}
      */
     protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->model = $objectManager->create(\Magento\Cms\Model\Wysiwyg\Config::class);
+        $this->design = $objectManager->get(DesignInterface::class);
     }
 
     /**
@@ -46,7 +53,8 @@ public function testGetConfig()
     public function testGetConfigCssUrls()
     {
         $config = $this->model->getConfig();
-        $publicPathPattern = 'http://localhost/static/%s/adminhtml/Magento/backend/en_US/%s';
+        $designTheme = $this->design->getConfigurationDesignTheme('adminhtml');
+        $publicPathPattern = "http://localhost/static/%s/adminhtml/{$designTheme}/en_US/%s";
         $tinyMceConfig = $config->getData('tinymce');
         $contentCss = $tinyMceConfig['content_css'];
         if (is_array($contentCss)) {

dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Newsletter\Model;
 
 use Magento\Framework\App\TemplateTypesInterface;
+use Magento\Framework\View\DesignInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -97,8 +98,11 @@ public function testGetProcessedTemplateArea($area, $design)
      */
     public function getProcessedTemplateAreaDataProvider()
     {
+        $designTheme = Bootstrap::getObjectManager()
+            ->get(DesignInterface::class)
+            ->getConfigurationDesignTheme('adminhtml');
         return [
-            'backend' => ['adminhtml', 'Magento/backend']
+            'backend' => ['adminhtml', $designTheme]
         ];
     }
 

dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php

@@ -147,7 +147,7 @@ private function getDefaultThemePath($area)
             case 'frontend':
                 return $this->design->getConfigurationDesignTheme($area);
             case 'adminhtml':
-                return 'Magento/backend';
+                return $this->design->getConfigurationDesignTheme($area);
             case 'doc':
                 return 'Magento/blank';
             default: