Skip to content

Commit

Permalink
fix: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ohassine committed Aug 16, 2024
1 parent 5727232 commit 6db39d1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import com.wire.kalium.logic.data.conversation.Conversation
import com.wire.kalium.logic.data.id.ConversationId
import com.wire.kalium.logic.data.id.GroupID
import com.wire.kalium.logic.data.id.QualifiedIdMapperImpl
import com.wire.kalium.logic.data.call.CallStatus
import com.wire.kalium.logic.data.call.CallHelper
import com.wire.kalium.logic.data.mls.CipherSuite
import com.wire.kalium.logic.framework.TestUser
Expand Down Expand Up @@ -317,7 +316,7 @@ class OnCloseCallTest {
}.wasInvoked(once)

coVerify {
mlsCallHelper.handleCallTermination(eq(conversationId), any())
callHelper.handleCallTermination(eq(conversationId), any())
}.wasInvoked(once)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class OnParticipantListChangedTest {

fun withShouldEndSFTOneOnOneCall(result: Boolean) = apply {
every {
mlsCallHelper.shouldEndSFTOneOnOneCall(any(), any(), any(), any(), any())
callHelper.shouldEndSFTOneOnOneCall(any(), any(), any(), any(), any())
}.returns(result)
}

Expand Down

0 comments on commit 6db39d1

Please sign in to comment.