Merge pull request Carthage#1371 from Carthage/test-for-1366

Add a test for Carthage#1366

Author: ikesyo

Source/CarthageKitTests/ProjectSpec.swift

@@ -15,44 +15,69 @@ import Tentacle
 
 class ProjectSpec: QuickSpec {
 	override func spec() {
-		let directoryURL = NSBundle(forClass: self.dynamicType).URLForResource("CartfilePrivateOnly", withExtension: nil)!
+		describe("loadCombinedCartfile") {
+			it("should load a combined Cartfile when only a Cartfile is present") {
+				let directoryURL = NSBundle(forClass: self.dynamicType).URLForResource("CartfileOnly", withExtension: nil)!
+				let result = Project(directoryURL: directoryURL).loadCombinedCartfile().single()
+				expect(result).notTo(beNil())
+				expect(result?.value).notTo(beNil())
+				
+				let dependencies = result?.value?.dependencies
+				expect(dependencies?.count) == 1
+				expect(dependencies?.first?.project.name) == "Carthage"
+			}
 
-		it("should load a combined Cartfile when only a Cartfile.private is present") {
-			let result = Project(directoryURL: directoryURL).loadCombinedCartfile().single()
-			expect(result).notTo(beNil())
-			expect(result?.value).notTo(beNil())
+			it("should load a combined Cartfile when only a Cartfile.private is present") {
+				let directoryURL = NSBundle(forClass: self.dynamicType).URLForResource("CartfilePrivateOnly", withExtension: nil)!
+				let result = Project(directoryURL: directoryURL).loadCombinedCartfile().single()
+				expect(result).notTo(beNil())
+				expect(result?.value).notTo(beNil())
 
-			let dependencies = result?.value?.dependencies
-			expect(dependencies?.count) == 1
-			expect(dependencies?.first?.project.name) == "Carthage"
-		}
+				let dependencies = result?.value?.dependencies
+				expect(dependencies?.count) == 1
+				expect(dependencies?.first?.project.name) == "Carthage"
+			}
 
-        it("should detect duplicate dependencies across Cartfile and Cartfile.private") {
-            let directoryURL = NSBundle(forClass: self.dynamicType).URLForResource("DuplicateDependencies", withExtension: nil)!
-            let result = Project(directoryURL: directoryURL).loadCombinedCartfile().single()
-			expect(result).notTo(beNil())
+			it("should detect duplicate dependencies across Cartfile and Cartfile.private") {
+				let directoryURL = NSBundle(forClass: self.dynamicType).URLForResource("DuplicateDependencies", withExtension: nil)!
+				let result = Project(directoryURL: directoryURL).loadCombinedCartfile().single()
+				expect(result).notTo(beNil())
 
-			let resultError = result?.error
-			expect(resultError).notTo(beNil())
+				let resultError = result?.error
+				expect(resultError).notTo(beNil())
 
-			let makeDependency: (String, String, [String]) -> DuplicateDependency = { (repoOwner, repoName, locations) in
-				let project = ProjectIdentifier.GitHub(Repository(owner: repoOwner, name: repoName))
-				return DuplicateDependency(project: project, locations: locations)
-			}
+				let makeDependency: (String, String, [String]) -> DuplicateDependency = { (repoOwner, repoName, locations) in
+					let project = ProjectIdentifier.GitHub(Repository(owner: repoOwner, name: repoName))
+					return DuplicateDependency(project: project, locations: locations)
+				}
 
-			let mainLocation = ["\(CarthageProjectCartfilePath)"]
-			let bothLocations = ["\(CarthageProjectCartfilePath)", "\(CarthageProjectPrivateCartfilePath)"]
+				let mainLocation = ["\(CarthageProjectCartfilePath)"]
+				let bothLocations = ["\(CarthageProjectCartfilePath)", "\(CarthageProjectPrivateCartfilePath)"]
 
-			let expectedError = CarthageError.DuplicateDependencies([
-				makeDependency("self2", "self2", mainLocation),
-				makeDependency("self3", "self3", mainLocation),
-				makeDependency("1", "1", bothLocations),
-				makeDependency("3", "3", bothLocations),
-				makeDependency("5", "5", bothLocations),
-			])
+				let expectedError = CarthageError.DuplicateDependencies([
+					makeDependency("self2", "self2", mainLocation),
+					makeDependency("self3", "self3", mainLocation),
+					makeDependency("1", "1", bothLocations),
+					makeDependency("3", "3", bothLocations),
+					makeDependency("5", "5", bothLocations),
+				])
 
-			expect(resultError) == expectedError
-        }
+				expect(resultError) == expectedError
+			}
+			
+			it("should error when neither a Cartfile nor a Cartfile.private exists") {
+				let directoryURL = NSBundle(forClass: self.dynamicType).URLForResource("NoCartfile", withExtension: nil)!
+				let result = Project(directoryURL: directoryURL).loadCombinedCartfile().single()
+				expect(result).notTo(beNil())
+				
+				if case let .ReadFailed(_, underlyingError)? = result?.error {
+					expect(underlyingError?.domain) == NSCocoaErrorDomain
+					expect(underlyingError?.code) == NSFileReadNoSuchFileError
+				} else {
+					fail()
+				}
+			}
+		}
 
 		describe("cloneOrFetchProject") {
 			// https://github.com/Carthage/Carthage/issues/1191

Source/CarthageKitTests/fixtures/CartfileOnly.zip

@@ -6,7 +6,7 @@
 
 destination="${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
-for fixture in "ReactiveCocoaLayout" "CartfilePrivateOnly" "SchemeDiscoverySampleForCarthage-0.2" "Swell-0.5.0" "SampleMultipleSubprojects" "SampleGitSubmodule"
+for fixture in "ReactiveCocoaLayout" "CartfileOnly" "CartfilePrivateOnly" "NoCartfile" "SchemeDiscoverySampleForCarthage-0.2" "Swell-0.5.0" "SampleMultipleSubprojects" "SampleGitSubmodule"
 do
 	rm -Rf "$destination/$fixture"
 	unzip -q -d "$destination" "Source/CarthageKitTests/fixtures/$fixture.zip"