Missed a change and fixed broken tests

pull/894/head
Morgan Pretty 5 months ago
parent 9596dbf248
commit ab2debc29a

@ -3,6 +3,7 @@
import Foundation import Foundation
import Combine import Combine
import GRDB import GRDB
import SessionUtil
import SessionUIKit import SessionUIKit
import SessionUtilitiesKit import SessionUtilitiesKit
import SessionSnodeKit import SessionSnodeKit
@ -68,7 +69,7 @@ public enum ProcessPendingGroupMemberRemovalsJob: JobExecutor {
/// If there are no pending removals then we can just complete /// If there are no pending removals then we can just complete
guard guard
let pendingRemovals: [String: Bool] = try? LibSession.getPendingMemberRemovals( let pendingRemovals: [String: GROUP_MEMBER_STATUS] = try? LibSession.getPendingMemberRemovals(
groupSessionId: groupSessionId, groupSessionId: groupSessionId,
using: dependencies using: dependencies
), ),
@ -87,7 +88,7 @@ public enum ProcessPendingGroupMemberRemovalsJob: JobExecutor {
) )
let messageSendTimestamp: Int64 = dependencies[cache: .snodeAPI].currentOffsetTimestampMs() let messageSendTimestamp: Int64 = dependencies[cache: .snodeAPI].currentOffsetTimestampMs()
let memberIdsToRemoveContent: Set<String> = pendingRemovals let memberIdsToRemoveContent: Set<String> = pendingRemovals
.filter { _, shouldRemoveContent -> Bool in shouldRemoveContent } .filter { _, status -> Bool in status == GROUP_MEMBER_STATUS_REMOVED_MEMBER_AND_MESSAGES }
.map { memberId, _ -> String in memberId } .map { memberId, _ -> String in memberId }
.asSet() .asSet()

@ -90,6 +90,7 @@ class LibSessionGroupInfoSpec: QuickSpec {
.thenReturn(createGroupOutput.groupState[.groupKeys]) .thenReturn(createGroupOutput.groupState[.groupKeys])
cache.when { $0.configNeedsDump(.any) }.thenReturn(true) cache.when { $0.configNeedsDump(.any) }.thenReturn(true)
cache.when { try $0.createDump(config: .any, for: .any, sessionId: .any, timestampMs: .any) }.thenReturn(nil) cache.when { try $0.createDump(config: .any, for: .any, sessionId: .any, timestampMs: .any) }.thenReturn(nil)
cache.when { try $0.performAndPushChange(.any, for: .any, sessionId: .any, change: { _ in }) }.thenReturn(nil)
} }
) )

@ -24,6 +24,10 @@ class MockLibSessionCache: Mock<LibSessionCacheType>, LibSessionCacheType {
mockNoReturn(args: [userConfigVariants, groups, userSessionId, userEd25519KeyPair]) mockNoReturn(args: [userConfigVariants, groups, userSessionId, userEd25519KeyPair])
} }
func hasConfig(for variant: ConfigDump.Variant, sessionId: SessionId) -> Bool {
return mock(args: [variant, sessionId])
}
func config(for variant: ConfigDump.Variant, sessionId: SessionId) -> LibSession.Config? { func config(for variant: ConfigDump.Variant, sessionId: SessionId) -> LibSession.Config? {
return mock(args: [variant, sessionId]) return mock(args: [variant, sessionId])
} }

@ -28,6 +28,10 @@ class MockJobRunner: Mock<JobRunnerType>, JobRunnerType {
return mock(args: [jobs, state, variant]) return mock(args: [jobs, state, variant])
} }
func deferCount(for jobId: Int64?, of variant: Job.Variant) -> Int {
return mock(args: [jobId, variant])
}
func appDidFinishLaunching() {} func appDidFinishLaunching() {}
func appDidBecomeActive() {} func appDidBecomeActive() {}
func startNonBlockingQueues() {} func startNonBlockingQueues() {}

Loading…
Cancel
Save