ToWebUrl needs to normalize URLs

Author: haacked

src/GitHub.Exports/Primitives/UriString.cs

@@ -121,19 +121,19 @@ bool ParseScpSyntax(string scpString)
 
         public Uri ToWebUri()
         {
-            if (url == null || (url.Scheme != Uri.UriSchemeHttp && url.Scheme != Uri.UriSchemeHttps))
+            var scheme = url != null && IsHypertextTransferProtocol
+                ? url.Scheme
+                : Uri.UriSchemeHttps;
+
+            return new UriBuilder
             {
-                return new UriBuilder
-                {
-                    Scheme = Uri.UriSchemeHttps,
-                    Host = Host,
-                    Path = NameWithOwner,
-                    Port = url?.Port == 80
-                        ? -1
-                        : (url?.Port ?? -1)
-                }.Uri;
-            }
-            return url;
+                Scheme = scheme,
+                Host = Host,
+                Path = NameWithOwner,
+                Port = url?.Port == 80
+                    ? -1
+                    : (url?.Port ?? -1)
+            }.Uri;
         }
 
         /// <summary>

src/UnitTests/GitHub.Primitives/UriStringTests.cs

@@ -165,6 +165,8 @@ public class TheToUriMethod
         [InlineData("http://example.com/", "http://example.com/")]
         [InlineData("http://[email protected]/foo/bar", "http://example.com/foo/bar")]
         [InlineData("https://github.com/github/Windows", "https://github.com/github/Windows")]
+        [InlineData("https://github.com/github/Windows.git", "https://github.com/github/Windows")]
+        [InlineData("https://[email protected]/github/Windows.git", "https://github.com/github/Windows")]
         [InlineData("http://example.com:4000/github/Windows", "http://example.com:4000/github/Windows")]
         [InlineData("[email protected]:github/Windows.git", "https://192.168.1.2/github/Windows")]
         [InlineData("[email protected]:org/repo.git", "https://example.com/org/repo")]

src/UnitTests/GitHub.VisualStudio/TeamExplorer/Home/GraphsNavigationItemTests.cs

@@ -10,6 +10,8 @@ public class GraphsNavigationItemTests
     public class TheExecuteMethod
     {
         [Theory]
+        [InlineData("https://github.com/foo/bar.git", "https://github.com/foo/bar/graphs")]
+        [InlineData("https://[email protected]/foo/bar.git", "https://github.com/foo/bar/graphs")]
         [InlineData("https://github.com/foo/bar", "https://github.com/foo/bar/graphs")]
         [InlineData("https://github.com/foo/bar/", "https://github.com/foo/bar/graphs")]
         public void BrowsesToTheCorrectURL(string origin, string expectedUrl)