Merge branch 'master' into fixes/2352-open-fron-github-login

Author: jcansdale

src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs

@@ -186,22 +186,23 @@ async Task LoadItems(bool refresh)
 
         bool FilterItem(object obj)
         {
-            if (obj is IRepositoryItemViewModel item && !string.IsNullOrWhiteSpace(Filter))
+            var trimedFilter = Filter?.Trim();
+            if (obj is IRepositoryItemViewModel item && !string.IsNullOrEmpty(trimedFilter))
             {
-                if (new UriString(Filter).IsHypertextTransferProtocol)
+                if (new UriString(trimedFilter).IsHypertextTransferProtocol)
                 {
                     var urlString = item.Url.ToString();
                     var urlStringWithGit = urlString + ".git";
                     var urlStringWithSlash = urlString + "/";
                     return
-                        urlString.Contains(Filter, StringComparison.OrdinalIgnoreCase) ||
-                        urlStringWithGit.Contains(Filter, StringComparison.OrdinalIgnoreCase) ||
-                        urlStringWithSlash.Contains(Filter, StringComparison.OrdinalIgnoreCase);
+                        urlString.Contains(trimedFilter, StringComparison.OrdinalIgnoreCase) ||
+                        urlStringWithGit.Contains(trimedFilter, StringComparison.OrdinalIgnoreCase) ||
+                        urlStringWithSlash.Contains(trimedFilter, StringComparison.OrdinalIgnoreCase);
                 }
                 else
                 {
                     return
-                        item.Caption.Contains(Filter, StringComparison.CurrentCultureIgnoreCase);
+                        item.Caption.Contains(trimedFilter, StringComparison.CurrentCultureIgnoreCase);
                 }
             }
 

test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositorySelectViewModelTests.cs

@@ -18,6 +18,9 @@ public class TheFilterProperty
         [TestCase("", "owner", "name", "https://github.com/owner/name", 1)]
         [TestCase("owner", "owner", "name", "https://github.com/owner/name", 1)]
         [TestCase("name", "owner", "name", "https://github.com/owner/name", 1)]
+        [TestCase(" name", "owner", "name", "https://github.com/owner/name", 1, Description = "Ignore whitespace before filter")]
+        [TestCase("name ", "owner", "name", "https://github.com/owner/name", 1, Description = "Ignore whitespace after filter")]
+        [TestCase("https://github.com/owner/name ", "owner", "name", "https://github.com/owner/name", 1, Description = "Ignore whitespace in URL filter")]
         [TestCase("owner/name", "owner", "name", "https://github.com/owner/name", 1)]
         [TestCase("OWNER/NAME", "owner", "name", "https://github.com/owner/name", 1)]
         [TestCase("https://github.com/owner/name", "owner", "name", "https://github.com/owner/name", 1)]