From c5461e4ec72caa94bf39bbfa8e8cac7439d33a49 Mon Sep 17 00:00:00 2001 From: Burak Erol <140210017+erolburak@users.noreply.github.com> Date: Thu, 16 May 2024 21:43:11 +0200 Subject: [PATCH] refactor tip kit and persistent container if debug or release (#83) --- BobbysNews/Presentation/ContentViewModel.swift | 10 ++++++---- .../PersistenceController.swift | 12 +++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/BobbysNews/Presentation/ContentViewModel.swift b/BobbysNews/Presentation/ContentViewModel.swift index bfe3720..6df3d1a 100644 --- a/BobbysNews/Presentation/ContentViewModel.swift +++ b/BobbysNews/Presentation/ContentViewModel.swift @@ -95,7 +95,11 @@ final class ContentViewModel: Sendable { self.deleteTopHeadlinesUseCase = deleteTopHeadlinesUseCase self.fetchTopHeadlinesUseCase = fetchTopHeadlinesUseCase self.readTopHeadlinesUseCase = readTopHeadlinesUseCase +#if DEBUG + return +#else configureTipKit() +#endif } func onAppear(selectedCountry: String) { @@ -161,10 +165,8 @@ final class ContentViewModel: Sendable { private func configureTipKit() { Task { - if ProcessInfo().environment["XCTestConfigurationFilePath"] == nil { - try? Tips.configure([.displayFrequency(.immediate), - .datastoreLocation(.groupContainer(identifier: "com.burakerol.BobbysNews"))]) - } + try? Tips.configure([.displayFrequency(.immediate), + .datastoreLocation(.groupContainer(identifier: "com.burakerol.BobbysNews"))]) } } diff --git a/BobbysNewsData/Sources/BobbysNewsData/DB/PersistenceController/PersistenceController.swift b/BobbysNewsData/Sources/BobbysNewsData/DB/PersistenceController/PersistenceController.swift index 1492a64..a2e8cf7 100644 --- a/BobbysNewsData/Sources/BobbysNewsData/DB/PersistenceController/PersistenceController.swift +++ b/BobbysNewsData/Sources/BobbysNewsData/DB/PersistenceController/PersistenceController.swift @@ -27,11 +27,13 @@ public final class PersistenceController { let managedObjectModel = NSManagedObjectModel(contentsOf: moduleUrl) else { fatalError("Error initializing managed object model with module url!") } - /// Disable cloud kit database if test scheme is running - let isTestScheme = ProcessInfo().environment["XCTestConfigurationFilePath"] != nil - container = isTestScheme ? NSPersistentContainer(name: "BobbysNews", - managedObjectModel: managedObjectModel) : NSPersistentCloudKitContainer(name: "BobbysNews", - managedObjectModel: managedObjectModel) +#if DEBUG + container = NSPersistentContainer(name: "BobbysNews", + managedObjectModel: managedObjectModel) +#else + NSPersistentCloudKitContainer(name: "BobbysNews", + managedObjectModel: managedObjectModel) +#endif container.loadPersistentStores { _, error in if let error = error as NSError? { fatalError("Unresolved error \(error), \(error.userInfo)")