[#349] Improve the duplicated codes

nimblehq · Dec 4, 2023 · fcec223 · fcec223
1 parent e778575
commit fcec223
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/Tuist/Interfaces/SwiftUI/Project/Podfile b/Tuist/Interfaces/SwiftUI/Project/Podfile
@@ -61,7 +61,6 @@ target 'Data' do
 end
 
 target 'Domain' do
-  # Pods for Domain
   target 'DomainTests' do
     testing_pods
   end

diff --git a/Tuist/Interfaces/UIKit/Project/Podfile b/Tuist/Interfaces/UIKit/Project/Podfile
@@ -51,15 +51,13 @@ end
 
 target 'Data' do
   data_dependencies
-
   target 'DataTests' do
     data_dependencies
     testing_pods
   end
 end
 
 target 'Domain' do
-  # Pods for Domain
   target 'DomainTests' do
     testing_pods
   end

diff --git a/Tuist/ProjectDescriptionHelpers/Module.swift b/Tuist/ProjectDescriptionHelpers/Module.swift
@@ -35,7 +35,7 @@ public enum Module: CaseIterable {
     }
 
     public var sources: ProjectDescription.SourceFilesList {
-        return ["\(frameworkPath)/\(Constant.sourcesPath)/**"]
+        ["\(frameworkPath)/\(Constant.sourcesPath)/**"]
     }
 
     public var resources: ProjectDescription.ResourceFileElements {

diff --git a/Tuist/ProjectDescriptionHelpers/Scheme+Initializing.swift b/Tuist/ProjectDescriptionHelpers/Scheme+Initializing.swift
@@ -5,9 +5,7 @@ extension Scheme {
     public static func productionScheme(name: String) -> Scheme {
         let debugConfigName = BuildConfiguration.debugProduction.name
         let releaseConfigName = BuildConfiguration.releaseProduction.name
-
-        var testModules = Module.allCases.map { TestableTarget("\($0.name)\(Constant.testsPath)") }
-        testModules.append(contentsOf: ["\(name)Tests", "\(name)KIFUITests"])
+        let testModules = testSchemes(name)
 
         return Scheme(
             name: name,
@@ -24,9 +22,7 @@ extension Scheme {
     public static func stagingScheme(name: String) -> Scheme {
         let debugConfigName = BuildConfiguration.debugStaging.name
         let releaseConfigName = BuildConfiguration.releaseStaging.name
-
-        var testModules = Module.allCases.map { TestableTarget("\($0.name)\(Constant.testsPath)") }
-        testModules.append(contentsOf: ["\(name)Tests", "\(name)KIFUITests"])
+        let testModules = testSchemes(name)
 
         return Scheme(
             name: "\(name) Staging",
@@ -47,4 +43,10 @@ extension Scheme {
             hidden: true
         )
     }
+
+    private static func testSchemes(_ name: String) -> [TestableTarget] {
+        var modules = Module.allCases.map { TestableTarget("\($0.name)\(Constant.testsPath)") }
+        modules.append(contentsOf: ["\(name)Tests", "\(name)KIFUITests"])
+        return modules
+    }
 }