Merge pull request Carthage#2121 from Carthage/improve-giturl-normali…

…zedurlstring-tests

[GitURL] Improve `normalizedURLString` tests to be more granular

Source/CarthageKit/GitURL.swift

@@ -8,7 +8,7 @@ public struct GitURL {
 	/// A normalized URL string, without protocol, authentication, or port
 	/// information. This is mostly useful for comparison, and not for any
 	/// actual Git operations.
-	fileprivate var normalizedURLString: String {
+	internal var normalizedURLString: String {
 		let parsedURL: URL? = URL(string: urlString)
 
 		if let parsedURL = parsedURL, let host = parsedURL.host {

Tests/CarthageKitTests/GitURLSpec.swift

@@ -1,22 +1,29 @@
-import CarthageKit
 import Foundation
 import Nimble
 import Quick
 
+@testable import CarthageKit
+
 class GitURLSpec: QuickSpec {
 	override func spec() {
 		describe("GitURL") {
 			describe("normalizedURLString") {
 				it("should parse normal URL") {
-					expect(GitURL("https://github.com/antitypical/Result.git")) == GitURL("https://user:password@github.com:443/antitypical/Result")
+					let expected = "github.com/antitypical/Result"
+					expect(GitURL("https://github.com/antitypical/Result.git").normalizedURLString) == expected
+					expect(GitURL("https://user:password@github.com:443/antitypical/Result").normalizedURLString) == expected
 				}
 
-				it("should parse local path") {
-					expect(GitURL("/path/to/git/repo.git")) == GitURL("/path/to/git/repo")
+				it("should parse local absolute path") {
+					let expected = "/path/to/git/repo"
+					expect(GitURL("/path/to/git/repo.git").normalizedURLString) == expected
+					expect(GitURL("/path/to/git/repo").normalizedURLString) == expected
 				}
 
 				it("should parse scp syntax") {
-					expect(GitURL("git@github.com:antitypical/Result.git")) == GitURL("github.com:antitypical/Result")
+					let expected = "github.com/antitypical/Result"
+					expect(GitURL("git@github.com:antitypical/Result.git").normalizedURLString) == expected
+					expect(GitURL("github.com:antitypical/Result").normalizedURLString) == expected
 				}
 			}
 		}