Merge branch 'release/2.4.1'

GitTools · Jan 15, 2017 · 1f91090 · 1f91090
2 parents 6390adb + 46815cb
commit 1f91090
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/GitLink.Tests/Providers/GitHubProviderFacts.cs b/src/GitLink.Tests/Providers/GitHubProviderFacts.cs
@@ -25,7 +25,7 @@ public void ReturnsValidInitialization()
             }
 
             [TestCase]
-            public void ReturnsInValidInitialization()
+            public void ReturnsInvalidInitialization()
             {
                 var provider = new GitHubProvider();
                 var valid = provider.Initialize("https://bitbucket.org/CatenaLogic/GitLink");
@@ -81,6 +81,15 @@ public void ReturnsValidRawGitUrl()
 
                 Assert.AreEqual("https://raw.github.com/CatenaLogic/GitLink", provider.RawGitUrl);
             }
+
+            [TestCase]
+            public void ReturnsValidRawGitUrlWhenDotGitSuffixIsPresent()
+            {
+                var provider = new GitHubProvider();
+                provider.Initialize("https://github.com/CatenaLogic/GitLink.git");
+
+                Assert.AreEqual("https://raw.github.com/CatenaLogic/GitLink", provider.RawGitUrl);
+            }
         }
     }
 }
diff --git a/src/GitLink/Providers/GitHubProvider.cs b/src/GitLink/Providers/GitHubProvider.cs
@@ -13,7 +13,7 @@ namespace GitLink.Providers
 
     public class GitHubProvider : ProviderBase
     {
-        private readonly Regex _gitHubRegex = new Regex(@"(?<url>(?<companyurl>(?:https://)?github\.com/(?<company>[^/]+))/(?<project>[^/]+))");
+        private readonly Regex _gitHubRegex = new Regex(@"^(?<url>(?<companyurl>(?:https://)?github\.com/(?<company>[^/]+))/(?<project>[^/]+?)(\.git)?)$");
 
         public GitHubProvider() 
             : base(new GitPreparer())