Change close issue caption when comment has body.

Author: grokys

src/GitHub.App/ViewModels/Documents/IssueishCommentViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.Composition;
 using System.Reactive;
+using System.Reactive.Linq;
 using System.Threading.Tasks;
 using GitHub.Models;
 using GitHub.Services;
@@ -15,6 +16,8 @@ namespace GitHub.ViewModels.Documents
     [PartCreationPolicy(CreationPolicy.NonShared)]
     public class IssueishCommentViewModel : CommentViewModel, IIssueishCommentViewModel
     {
+        ObservableAsPropertyHelper<string> closeIssueishCaption;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="CommentViewModel"/> class.
         /// </summary>
@@ -29,7 +32,7 @@ public IssueishCommentViewModel(ICommentService commentService)
         public bool CanCloseIssueish { get; private set; }
 
         /// <inheritdoc/>
-        public string CloseIssueishCaption { get; private set; }
+        public string CloseIssueishCaption => closeIssueishCaption?.Value;
 
         /// <inheritdoc/>
         public ReactiveCommand<Unit, Unit> CloseIssueish { get; }
@@ -49,7 +52,13 @@ await base.InitializeAsync(
                     .ConfigureAwait(true);
 
             CanCloseIssueish = closeCaption != null;
-            CloseIssueishCaption = closeCaption;
+
+            if (closeCaption != null)
+            {
+                closeIssueishCaption = this.WhenAnyValue(x => x.Body)
+                    .Select(x => string.IsNullOrWhiteSpace(x) ? closeCaption : Resources.CloseAndComment)
+                    .ToProperty(this, x => x.CloseIssueishCaption);
+            }
         }
     }
 }

src/GitHub.Resources/Resources.Designer.cs

@@ -848,4 +848,7 @@ https://git-scm.com/download/win</value>
   <data name="CloseIssue" xml:space="preserve">
     <value>Close issue</value>
   </data>
+  <data name="CloseAndComment" xml:space="preserve">
+    <value>Close and comment</value>
+  </data>
 </root>

src/GitHub.Resources/Resources.resx

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using GitHub.Models;
+using GitHub.Services;
+using GitHub.ViewModels;
+using GitHub.ViewModels.Documents;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace GitHub.App.UnitTests.ViewModels.Documents
+{
+    public class IssueishCommentViewModelTests
+    {
+        [Test]
+        public async Task CloseIssueishCaption_Is_Set_When_Body_Empty()
+        {
+            var target = await CreateAndInitializeTarget(
+                new CommentModel(),
+                "Close issue");
+
+            Assert.That(target.CloseIssueishCaption, Is.EqualTo("Close issue"));
+        }
+
+        [Test]
+        public async Task CommitCaption_Is_Update_When_Body_Not_Empty()
+        {
+            var target = await CreateAndInitializeTarget(
+                new CommentModel(),
+                "Close issue");
+
+            target.Body = "Body";
+
+            Assert.That(target.CloseIssueishCaption, Is.EqualTo("Close and comment"));
+        }
+
+        async Task<IssueishCommentViewModel> CreateAndInitializeTarget(
+            CommentModel comment,
+            string closeCaption,
+            ICommentService commentService = null,
+            ICommentThreadViewModel thread = null,
+            ActorModel currentUser = null)
+        {
+            thread = thread ?? Substitute.For<ICommentThreadViewModel>();
+            currentUser = currentUser ?? new ActorModel { Login = "grokys" };
+
+            var target = CreateTarget(commentService);
+            await target.InitializeAsync(
+                thread,
+                currentUser,
+                comment,
+                closeCaption);
+            return target;
+        }
+
+        IssueishCommentViewModel CreateTarget(
+            ICommentService commentService = null)
+        {
+            commentService = commentService ?? Substitute.For<ICommentService>();
+
+            return new IssueishCommentViewModel(commentService);
+        }
+    }
+}