From 28d99cce09602bd74c8d830be3b3efb8d76276d6 Mon Sep 17 00:00:00 2001 From: Andrei Sadovnicov Date: Thu, 26 Oct 2023 08:25:10 +0300 Subject: [PATCH 1/2] Add missing parameter in CoordinatorTests --- NinchatSDKSwiftTests/CoordinatorTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NinchatSDKSwiftTests/CoordinatorTests.swift b/NinchatSDKSwiftTests/CoordinatorTests.swift index a2b3023d..3040551e 100644 --- a/NinchatSDKSwiftTests/CoordinatorTests.swift +++ b/NinchatSDKSwiftTests/CoordinatorTests.swift @@ -16,7 +16,7 @@ class CoordinatorTests: XCTestCase { override func setUp() { let config = SiteConfigurationImpl(configuration: try! openAsset(forResource: "site-configuration-mock"), environments: ["fi-restart", "fi"]) (session.sessionManager as? NINChatSessionManagerImpl)?.setSiteConfiguration(config) - coordinator = NINCoordinator(with: session.sessionManager, delegate: session) { } + coordinator = NINCoordinator(with: session.sessionManager, delegate: session, modalPresentationStyle: .fullScreen) { } } override func tearDown() { } From 58727ab83c12ed3238162fa38d0b47d3ce6ec5ad Mon Sep 17 00:00:00 2001 From: Andrei Sadovnicov Date: Thu, 26 Oct 2023 09:00:14 +0300 Subject: [PATCH 2/2] Fix the isRunningXCTests method --- .../Implementations/Extensions/Thread+Extension.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/NinchatSDKSwift/Implementations/Extensions/Thread+Extension.swift b/NinchatSDKSwift/Implementations/Extensions/Thread+Extension.swift index f9c7ad0a..879aa887 100644 --- a/NinchatSDKSwift/Implementations/Extensions/Thread+Extension.swift +++ b/NinchatSDKSwift/Implementations/Extensions/Thread+Extension.swift @@ -9,6 +9,10 @@ import Foundation extension Thread { /// Taken from `https://stackoverflow.com/a/59732115/7264553` var isRunningXCTests: Bool { - self.threadDictionary.allKeys.compactMap({ $0 as? String }).filter({ $0.split(separator: ".").contains("xctest") }).count > 0 + let allKeys = self.threadDictionary.allKeys + let stringKeys = allKeys.compactMap({ $0 as? String }) + let hasXCTestContextKey = stringKeys.contains("kXCTContextStackThreadKey") + let hasXCTestSubstring = stringKeys.contains(where: { $0.split(separator: ".").contains("xctest") }) + return hasXCTestContextKey || hasXCTestSubstring } }