Sort GitIgnoreTemplates by recommended first

src/GitHub.App/ViewModels/RepositoryCreationViewModel.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel.Composition;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Text.RegularExpressions;
@@ -68,12 +69,14 @@ namespace GitHub.ViewModels
 
             GitIgnoreTemplates = new ReactiveList<GitIgnoreItem>();
 
-            hosts.GitHubHost.ApiClient
-                .GetGitIgnoreTemplates()
-                .ObserveOn(RxApp.MainThreadScheduler)
-                .Select(templateName => new GitIgnoreItem(templateName))
+            Observable.Return(new GitIgnoreItem("None")).Concat(
+                hosts.GitHubHost.ApiClient
+                    .GetGitIgnoreTemplates()
+                    .ObserveOn(RxApp.MainThreadScheduler)
+                    .Select(templateName => new GitIgnoreItem(templateName)))
                 .ToList()
-                .Subscribe(templates => GitIgnoreTemplates.AddRange(templates));
+                .Subscribe(templates =>
+                    GitIgnoreTemplates.AddRange(templates.OrderByDescending(template => template.Recommended)));
         }
 
         public string Title { get { return "Create a GitHub Repository"; } } // TODO: this needs to be contextual

src/UnitTests/GitHub.App/ViewModels/RepositoryCreationViewModelTests.cs

@@ -294,23 +294,37 @@ public class RepositoryCreationViewModelTests
     public class TheGitIgnoreTemplatesProperty
     {
         [Fact]
-        public void IsPopulatedByTheApi()
+        public void IsPopulatedByTheApiAndSortedWithRecommendedFirst()
         {
+            var gitIgnoreTemplates = new[]
+            {
+                "Delphi",
+                "VisualStudio",
+                "Node",
+                "Waf",
+                "WordPress"
+            };
             var hosts = Substitute.For<IRepositoryHosts>();
             hosts.GitHubHost.ApiClient
                 .GetGitIgnoreTemplates()
-                .Returns(new[] { "VisualStudio", "Waf", "WordPress" }.ToObservable());
+                .Returns(gitIgnoreTemplates.ToObservable());
             var vm = new RepositoryCreationViewModel(Substitute.For<IOperatingSystem>(), hosts);
 
             var result = vm.GitIgnoreTemplates;
 
-            Assert.Equal(3, result.Count);
-            Assert.Equal("VisualStudio", result[0].Name);
+            Assert.Equal(6, result.Count);
+            Assert.Equal("None", result[0].Name);
             Assert.True(result[0].Recommended);
-            Assert.Equal("Waf", result[1].Name);
-            Assert.False(result[1].Recommended);
-            Assert.Equal("WordPress", result[2].Name);
-            Assert.False(result[2].Recommended);
+            Assert.Equal("VisualStudio", result[1].Name);
+            Assert.True(result[1].Recommended);
+            Assert.Equal("Node", result[2].Name);
+            Assert.True(result[2].Recommended);
+            Assert.Equal("Delphi", result[3].Name);
+            Assert.False(result[3].Recommended);
+            Assert.Equal("Waf", result[4].Name);
+            Assert.False(result[4].Recommended);
+            Assert.Equal("WordPress", result[5].Name);
+            Assert.False(result[5].Recommended);
         }
     }
 }