From 8907a336756765f64c6475412d655a0e964c1f4d Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Mon, 24 Oct 2022 17:12:02 +1100 Subject: [PATCH] Fixed the broken unit tests Increased the build & version numbers --- Session.xcodeproj/project.pbxproj | 24 ++++++------ .../Open Groups/OpenGroupManagerSpec.swift | 38 ++++++++++--------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 50d030a0d..642093112 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -6032,7 +6032,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 383; + CURRENT_PROJECT_VERSION = 385; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -6057,7 +6057,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.2.0; + MARKETING_VERSION = 2.2.1; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.ShareExtension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -6105,7 +6105,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 383; + CURRENT_PROJECT_VERSION = 385; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = SUQ8J2PCT7; ENABLE_NS_ASSERTIONS = NO; @@ -6135,7 +6135,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.2.0; + MARKETING_VERSION = 2.2.1; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.ShareExtension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -6171,7 +6171,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 383; + CURRENT_PROJECT_VERSION = 385; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -6194,7 +6194,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.2.0; + MARKETING_VERSION = 2.2.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.NotificationServiceExtension"; @@ -6245,7 +6245,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 383; + CURRENT_PROJECT_VERSION = 385; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = SUQ8J2PCT7; ENABLE_NS_ASSERTIONS = NO; @@ -6273,7 +6273,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.2.0; + MARKETING_VERSION = 2.2.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.NotificationServiceExtension"; @@ -7173,7 +7173,7 @@ CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 383; + CURRENT_PROJECT_VERSION = 385; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -7212,7 +7212,7 @@ "$(SRCROOT)", ); LLVM_LTO = NO; - MARKETING_VERSION = 2.2.0; + MARKETING_VERSION = 2.2.1; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger"; @@ -7245,7 +7245,7 @@ CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 383; + CURRENT_PROJECT_VERSION = 385; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -7284,7 +7284,7 @@ "$(SRCROOT)", ); LLVM_LTO = NO; - MARKETING_VERSION = 2.2.0; + MARKETING_VERSION = 2.2.1; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger"; PRODUCT_NAME = Session; diff --git a/SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift b/SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift index e2f8d711e..03618a3b5 100644 --- a/SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift +++ b/SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift @@ -500,7 +500,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -515,7 +515,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "http://testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -530,7 +530,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "https://testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -551,7 +551,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -566,7 +566,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "http://testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -581,7 +581,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "https://testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -602,7 +602,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -617,7 +617,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "http://testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -632,7 +632,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "https://testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -665,7 +665,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "http://open.getsession.org", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -697,7 +697,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "http://116.203.70.33", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -715,7 +715,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "%%%", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -732,7 +732,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -752,7 +752,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, dependencies: dependencies ) } @@ -785,7 +785,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, isConfigMessage: false, dependencies: dependencies ) @@ -816,7 +816,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, isConfigMessage: false, dependencies: dependencies ) @@ -853,7 +853,9 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey + .replacingOccurrences(of: "c3", with: "00") + .replacingOccurrences(of: "b3", with: "00"), isConfigMessage: false, dependencies: dependencies ) @@ -905,7 +907,7 @@ class OpenGroupManagerSpec: QuickSpec { db, roomToken: "testRoom", server: "testServer", - publicKey: "testKey", + publicKey: TestConstants.serverPublicKey, isConfigMessage: false, dependencies: dependencies )