Fix regression in plugin order determination, new param keepUnresolved is not used in function.vue-plugin-order-regression

2 files changed, 21 insertions, 0 deletions

diff --git a/core/AssetManager/UIAssetFetcher/PluginUmdAssetFetcher.php b/core/AssetManager/UIAssetFetcher/PluginUmdAssetFetcher.php
index 64c7a0f4cb..d56283bbaa 100644
--- a/core/AssetManager/UIAssetFetcher/PluginUmdAssetFetcher.php
+++ b/core/AssetManager/UIAssetFetcher/PluginUmdAssetFetcher.php
@@ -230,6 +230,7 @@ class PluginUmdAssetFetcher extends UIAssetFetcher
                 // check if dependency is not activated
                 if (!in_array($pluginDependency, $plugins)
                     && !in_array($pluginDependency, $result)
+                    && !$keepUnresolved
                 ) {
                     return;
                 }
diff --git a/tests/PHPUnit/Integration/AssetManager/UIAssetFetcher/PluginUmdAssetFetcherTest.php b/tests/PHPUnit/Integration/AssetManager/UIAssetFetcher/PluginUmdAssetFetcherTest.php
index 1346fa4bf1..f14708ba49 100644
--- a/tests/PHPUnit/Integration/AssetManager/UIAssetFetcher/PluginUmdAssetFetcherTest.php
+++ b/tests/PHPUnit/Integration/AssetManager/UIAssetFetcher/PluginUmdAssetFetcherTest.php
@@ -315,6 +315,26 @@ class PluginUmdAssetFetcherTest extends UnitTestCase
         $this->assertEquals($expectedAssets, $assets);
     }
 
+    public function test_orderPluginsByPluginDependencies()
+    {
+        $pluginList = PluginUmdAssetFetcher::orderPluginsByPluginDependencies([
+            'TestPlugin4',
+            'TestPlugin1',
+            'TestPlugin2',
+        ]);
+        $this->assertEquals(['TestPlugin4', 'TestPlugin1', 'TestPlugin2'], $pluginList);
+    }
+
+    public function test_orderPluginsByPluginDependencies_whenKeepUnresolvedIsFalse()
+    {
+        $pluginList = PluginUmdAssetFetcher::orderPluginsByPluginDependencies([
+            'TestPlugin4',
+            'TestPlugin1',
+            'TestPlugin2',
+        ], $keepUnresolved = false);
+        $this->assertEquals(['TestPlugin1', 'TestPlugin2'], $pluginList);
+    }
+
     private static function getUmdFile(string $pluginName)
     {
         $relativeRoot = str_replace(PIWIK_INCLUDE_PATH, '', self::TEST_PLUGINS_DIR);