From f52638ca756b84c26ec0a54f4a540e527e49092a Mon Sep 17 00:00:00 2001
From: Joey de l'Arago <joeydelarago@gmail.com>
Date: Mon, 12 Dec 2022 14:06:30 +0100
Subject: [PATCH] Update extrudermanager in tests to mock Application.

CURA-9793
---
 tests/conftest.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index efe9141e29..377a525ba7 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -6,6 +6,7 @@
 from unittest.mock import MagicMock, patch
 import pytest
 
+from UM.Application import Application
 from UM.Qt.QtApplication import QtApplication  # QtApplication import is required, even though it isn't used.
 
 from cura.CuraApplication import CuraApplication
@@ -22,6 +23,12 @@ def application() -> CuraApplication:
     app = MagicMock()
     return app
 
+@pytest.fixture()
+def um_application() -> Application:
+    app = MagicMock()
+    app.getInstance = MagicMock(return_value=app)
+    return app
+
 
 # Returns a MachineActionManager instance.
 @pytest.fixture()
@@ -43,14 +50,15 @@ def container_registry(application, global_stack) -> ContainerRegistry:
 
 
 @pytest.fixture()
-def extruder_manager(application, container_registry) -> ExtruderManager:
+def extruder_manager(application, um_application, container_registry) -> ExtruderManager:
     if ExtruderManager.getInstance() is not None:
         # Reset the data
         ExtruderManager._ExtruderManager__instance = None
 
     with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)):
         with patch("UM.Settings.ContainerRegistry.ContainerRegistry.getInstance", MagicMock(return_value=container_registry)):
-            manager = ExtruderManager()
+            with patch("UM.Application.Application.getInstance", um_application):
+                manager = ExtruderManager()
     return manager