From f0f63c22cfb3ea19cef5c1c8f52dd93e56bde701 Mon Sep 17 00:00:00 2001
From: M57 <41645758+Hy4ri@users.noreply.github.com>
Date: Thu, 17 Sep 2026 17:09:58 +0300
Subject: [PATCH] test(#1164): isolate model integration tests from WS
 singleton

---
 .../test/java/com/m57/hermescontrol/E2eIntegrationTest.kt  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/test/java/com/m57/hermescontrol/E2eIntegrationTest.kt b/app/src/test/java/com/m57/hermescontrol/E2eIntegrationTest.kt
index 20d62d60..80fbaf41 100644
--- a/app/src/test/java/com/m57/hermescontrol/E2eIntegrationTest.kt
+++ b/app/src/test/java/com/m57/hermescontrol/E2eIntegrationTest.kt
@@ -50,6 +50,7 @@ import com.m57.hermescontrol.data.remote.CleartextPolicy
 import com.m57.hermescontrol.data.remote.HermesApiService
 import com.m57.hermescontrol.data.remote.ServerEndpoint
 import com.m57.hermescontrol.data.ws.KanbanEventsClient
+import com.m57.hermescontrol.data.ws.ModelOptionsRepository
 import com.m57.hermescontrol.ui.channels.ChannelsViewModel
 import com.m57.hermescontrol.ui.connect.ConnectViewModel
 import com.m57.hermescontrol.ui.cron.CronJobsViewModel
@@ -1293,7 +1294,8 @@ class E2eIntegrationTest {
                     ),
                 )
 
-            val viewModel = ModelViewModel()
+            // Issue #1164: keep the real WS singleton off this test's mocked IO dispatcher.
+            val viewModel = ModelViewModel(ModelOptionsRepository(connected = { false }))
             viewModel.loadAll()
             advanceUntilIdle()
 
@@ -1352,7 +1354,8 @@ class E2eIntegrationTest {
             }
 
             // Default loadAll() must call getModelOptions with refresh = false
-            val viewModel = ModelViewModel()
+            // Issue #1164: keep the real WS singleton off this test's mocked IO dispatcher.
+            val viewModel = ModelViewModel(ModelOptionsRepository(connected = { false }))
             viewModel.loadAll()
             advanceUntilIdle()