Merge pull request #403 from somia/fix/testing

Fix/testing
somia · Oct 26, 2023 · d58e401 · d58e401
2 parents 8644d3f + 58727ab
commit d58e401
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
     }
 }
diff --git 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() { }