Fixed HTTPS bug (#1805720)

floehopper · Nov 30, 2007 · 66e346e · 66e346e
1 parent 60ad765
commit 66e346e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/Classes/NSString+CCMAdditions.m b/Classes/NSString+CCMAdditions.m
@@ -34,7 +34,7 @@ - (NSString *)completeCruiseControlURLForServerType:(CCMServerType)serverType wi
 			result = [result stringByAppendingString:@"/"];
 		result = [result stringByAppendingString:completion];
 	}
-	if(![result hasPrefix:@"http://"])
+	if(![result hasPrefix:@"http://"] && ![result hasPrefix:@"https://"])
 	{
 		result = [@"http://" stringByAppendingString:result];
 	}

diff --git a/RELEASENOTES.txt b/RELEASENOTES.txt
@@ -6,6 +6,7 @@ CCMenu 1.0.0
 
 * Improved URL handling in 'add projects' dialog
 * Now automatically determines full URL in 'add projects' dialog
+* Fixed HTTPS bug (#1805720)
 
 
 CCMenu 0.9.5

diff --git a/Resources/Info.plist b/Resources/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleVersion</key>
 	<string>1.0.0d2</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0d2</string>
+	<string>1.0.0d3</string>
 	<key>LSUIElement</key>
 	<string>1</string>
 	<key>NSMainNibFile</key>

diff --git a/Tests/NSString+CCMAdditionsTest.m b/Tests/NSString+CCMAdditionsTest.m
@@ -53,6 +53,12 @@ - (void)testAddsHTTPSchemeWhenCompletingURLs
 	STAssertEqualObjects(@"http://localhost/cctray.xml", url, @"Should have completed URL.");
 }
 
+- (void)testLeavesHTTPSSchemeWhenCompletingURLs
+{
+	NSString *url = [@"https://localhost/cctray.xml" completeCruiseControlURLForServerType:CCMCruiseControlDashboard];
+	STAssertEqualObjects(@"https://localhost/cctray.xml", url, @"Should have kept HTTPS scheme.");
+}
+
 - (void)testCompletesCruiseControlClassicURLs
 {
 	NSString *url = [@"localhost" completeCruiseControlURLForServerType:CCMCruiseControlClassic];