From b7690471e678f29b9adff586df411874e20d5de9 Mon Sep 17 00:00:00 2001
From: Jameson Williams <jameson.williams@whatnot.com>
Date: Tue, 10 Dec 2024 22:20:32 -0600
Subject: [PATCH] Fix instrumentation tests.

Resolves #13836
---
 .../v2/items/V2ConversationItemShapeTest.kt          | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt
index af89201882..ec55e36f8f 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt
@@ -5,12 +5,16 @@
 
 package org.thoughtcrime.securesms.conversation.v2.items
 
+import android.content.Context
 import android.net.Uri
 import android.view.View
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.Observer
+import androidx.test.core.app.ApplicationProvider
+import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestManager
-import io.mockk.mockk
 import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
@@ -204,13 +208,15 @@ class V2ConversationItemShapeTest {
 
     private val colorizer = Colorizer()
 
-    override val lifecycleOwner: LifecycleOwner = mockk(relaxed = true)
+    override val lifecycleOwner: LifecycleOwner = object : LifecycleOwner {
+      override val lifecycle: Lifecycle = LifecycleRegistry(this)
+    }
     override val displayMode: ConversationItemDisplayMode = ConversationItemDisplayMode.Standard
     override val clickListener: ConversationAdapter.ItemClickListener = FakeConversationItemClickListener
     override val selectedItems: Set<MultiselectPart> = emptySet()
     override val isMessageRequestAccepted: Boolean = true
     override val searchQuery: String? = null
-    override val requestManager: RequestManager = mockk()
+    override val requestManager: RequestManager = Glide.with(ApplicationProvider.getApplicationContext() as Context)
     override val isParentInScroll: Boolean = false
     override fun getChatColorsData(): ChatColorsDrawable.ChatColorsData = ChatColorsDrawable.ChatColorsData(null, null)