From cc9504bf404737118139db0b534427805044e752 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Mon, 14 Aug 2023 13:38:06 +1000 Subject: [PATCH] reenable the failed unit test --- ...sageReceiverDisappearingMessagesSpec.swift | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/SessionTests/MessagingKit/MessageReceiverDisappearingMessagesSpec.swift b/SessionTests/MessagingKit/MessageReceiverDisappearingMessagesSpec.swift index 0d15bdb13..f0996cb0a 100644 --- a/SessionTests/MessagingKit/MessageReceiverDisappearingMessagesSpec.swift +++ b/SessionTests/MessagingKit/MessageReceiverDisappearingMessagesSpec.swift @@ -36,8 +36,8 @@ class MessageReceiverDisappearingMessagesSpec: QuickSpec { let proto = SNProtoContent.builder() let dataMessage = SNProtoDataMessage.builder() - proto.setExpirationType(.deleteAfterSend) - proto.setExpirationTimer(UInt32(DisappearingMessagesConfiguration.DefaultDuration.disappearAfterSend.seconds)) + proto.setExpirationType(.deleteAfterRead) + proto.setExpirationTimer(UInt32(DisappearingMessagesConfiguration.DefaultDuration.disappearAfterRead.seconds)) proto.setLastDisappearingMessageChangeTimestamp((1234567890 - (60 * 10)) * 1000) dataMessage.setBody("Test") proto.setDataMessage(try! dataMessage.build()) @@ -66,32 +66,6 @@ class MessageReceiverDisappearingMessagesSpec: QuickSpec { mockProto = nil } -// // MARK: - when receiving a newer disappearing message config update -// context("when receiving a newer disappearing message config update") { -// // MARK: -- updates the local config properly -// it("updates the local config properly") { -// mockStorage.write { db in -// try MessageReceiver.handle( -// db, -// threadId: "TestId", -// threadVariant: .contact, -// message: mockMessage, -// serverExpirationTimestamp: nil, -// associatedWithProto: mockProto -// ) -// } -// -// let updatedConfig: DisappearingMessagesConfiguration? = mockStorage.read { db in -// try DisappearingMessagesConfiguration.fetchOne(db, id: "TestId") -// } -// -// expect(updatedConfig?.isEnabled).to(beTrue()) -// expect(updatedConfig?.durationSeconds) -// .to(equal(DisappearingMessagesConfiguration.DefaultDuration.disappearAfterSend.seconds)) -// expect(updatedConfig?.type).to(equal(.disappearAfterSend)) -// } -// } - // MARK: - when receiving an outdated disappearing message config update context("when receiving an outdated disappearing message config update") { // MARK: -- does NOT update local config @@ -127,6 +101,32 @@ class MessageReceiverDisappearingMessagesSpec: QuickSpec { expect(updatedConfig?.type).to(equal(.unknown)) } } + + // MARK: - when receiving a newer disappearing message config update + context("when receiving a newer disappearing message config update") { + // MARK: -- updates the local config properly + it("updates the local config properly") { + mockStorage.write { db in + try MessageReceiver.handle( + db, + threadId: "TestId", + threadVariant: .contact, + message: mockMessage, + serverExpirationTimestamp: nil, + associatedWithProto: mockProto + ) + } + + let updatedConfig: DisappearingMessagesConfiguration? = mockStorage.read { db in + try DisappearingMessagesConfiguration.fetchOne(db, id: "TestId") + } + + expect(updatedConfig?.isEnabled).to(beTrue()) + expect(updatedConfig?.durationSeconds) + .to(equal(DisappearingMessagesConfiguration.DefaultDuration.disappearAfterRead.seconds)) + expect(updatedConfig?.type).to(equal(.disappearAfterRead)) + } + } } } }