Added tests for marker

Author: linkdotnet

src/LinkDotNet.Blog.Web/Shared/Services/MarkerService.cs

@@ -3,7 +3,7 @@
 
 namespace LinkDotNet.Blog.Web.Shared.Services;
 
-public class MarkerService : IMarkerService
+public partial class MarkerService : IMarkerService
 {
     private readonly IJSRuntime jsRuntime;
 
@@ -17,19 +17,12 @@ public async Task<string> GetNewMarkdownForElementAsync(string elementId, string
         var selectionRange = await jsRuntime.InvokeAsync<SelectionRange>("getSelectionFromElement", elementId);
         if (selectionRange.Start == selectionRange.End)
         {
-            return string.Empty;
+            return content;
         }
 
         var beforeMarker = selectionRange.Start > 0 ? content[..selectionRange.Start] : string.Empty;
-        var marker = content.Substring(selectionRange.Start, selectionRange.End - selectionRange.Start);
-        var afterMarker = content.Substring(selectionRange.End, content.Length - selectionRange.End - 1);
+        var marker = content[selectionRange.Start..selectionRange.End];
+        var afterMarker = content[selectionRange.End..];
         return beforeMarker + fenceBegin + marker + fenceEnd + afterMarker;
     }
-
-    private sealed class SelectionRange
-    {
-        public int Start { get; set; }
-
-        public int End { get; set; }
-    }
 }

src/LinkDotNet.Blog.Web/Shared/Services/SelectionRange.cs

@@ -0,0 +1,8 @@
+namespace LinkDotNet.Blog.Web.Shared.Services;
+
+public sealed class SelectionRange
+{
+    public int Start { get; set; }
+
+    public int End { get; set; }
+}

src/LinkDotNet.Blog.Web/wwwroot/components/selection.js

@@ -2,6 +2,5 @@ window.getSelectionFromElement = function (id) {
     const elem = document.getElementById(id)
     const start = elem.selectionStart
     const end = elem.selectionEnd
-    elem.selectionStart = elem.selectionEnd = 0
     return { start, end }
 }

tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/CreateNewBlogPostPageTests.cs

@@ -28,6 +28,7 @@ public async Task ShouldSaveBlogPostOnSave()
         ctx.Services.AddScoped(_ => toastService.Object);
         ctx.ComponentFactories.AddStub<UploadFile>();
         ctx.Services.AddScoped(_ => Mock.Of<IFileProcessor>());
+        ctx.Services.AddScoped(_ => Mock.Of<IMarkerService>());
         using var cut = ctx.RenderComponent<CreateNewBlogPostPage>();
         var newBlogPost = cut.FindComponent<CreateNewBlogPost>();
 

tests/LinkDotNet.Blog.IntegrationTests/Web/Pages/Admin/UpdateBlogPostPageTests.cs

@@ -10,6 +10,7 @@
 using LinkDotNet.Blog.Web.Pages.Admin;
 using LinkDotNet.Blog.Web.Shared;
 using LinkDotNet.Blog.Web.Shared.Admin;
+using LinkDotNet.Blog.Web.Shared.Services;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
@@ -30,6 +31,7 @@ public async Task ShouldSaveBlogPostOnSave()
         ctx.Services.AddScoped<IRepository<BlogPost>>(_ => Repository);
         ctx.Services.AddScoped(_ => toastService.Object);
         ctx.ComponentFactories.AddStub<UploadFile>();
+        ctx.Services.AddScoped(_ => Mock.Of<IMarkerService>());
         using var cut = ctx.RenderComponent<UpdateBlogPostPage>(
             p => p.Add(s => s.BlogPostId, blogPost.Id));
         var newBlogPost = cut.FindComponent<CreateNewBlogPost>();

tests/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/CreateNewBlogPostTests.cs

@@ -6,6 +6,9 @@
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web.Shared;
 using LinkDotNet.Blog.Web.Shared.Admin;
+using LinkDotNet.Blog.Web.Shared.Services;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
 using Xunit;
 
 namespace LinkDotNet.Blog.UnitTests.Web.Shared.Admin;
@@ -14,12 +17,13 @@ public class CreateNewBlogPostTests : TestContext
 {
     public CreateNewBlogPostTests()
     {
-        ComponentFactories.Add<UploadFile, UploadFile>():
+        ComponentFactories.AddStub<UploadFile>();
     }
 
     [Fact]
     public void ShouldCreateNewBlogPostWhenValidDataGiven()
     {
+        Services.AddScoped(_ => Mock.Of<IMarkerService>());
         BlogPost blogPost = null;
         var cut = RenderComponent<CreateNewBlogPost>(
             p => p.Add(c => c.OnBlogPostCreated, bp => blogPost = bp));
@@ -53,6 +57,7 @@ public void ShouldFillGivenBlogPost()
             .WithTags("tag1", "tag2")
             .Build();
         BlogPost blogPostFromComponent = null;
+        Services.AddScoped(_ => Mock.Of<IMarkerService>());
         var cut = RenderComponent<CreateNewBlogPost>(
             p =>
                 p.Add(c => c.OnBlogPostCreated, bp => blogPostFromComponent = bp)
@@ -74,6 +79,7 @@ public void ShouldFillGivenBlogPost()
     public void ShouldNotDeleteModelWhenSet()
     {
         BlogPost blogPost = null;
+        Services.AddScoped(_ => Mock.Of<IMarkerService>());
         var cut = RenderComponent<CreateNewBlogPost>(
             p => p.Add(c => c.ClearAfterCreated, true)
                 .Add(c => c.OnBlogPostCreated, post => blogPost = post));
@@ -94,6 +100,7 @@ public void ShouldNotDeleteModelWhenSet()
     public void ShouldNotDeleteModelWhenNotSet()
     {
         BlogPost blogPost = null;
+        Services.AddScoped(_ => Mock.Of<IMarkerService>());
         var cut = RenderComponent<CreateNewBlogPost>(
             p => p.Add(c => c.ClearAfterCreated, false)
                 .Add(c => c.OnBlogPostCreated, post => blogPost = post));
@@ -113,6 +120,7 @@ public void ShouldNotDeleteModelWhenNotSet()
     [Fact]
     public void ShouldNotUpdateUpdatedDateWhenCheckboxSet()
     {
+        Services.AddScoped(_ => Mock.Of<IMarkerService>());
         var somewhen = new DateTime(1991, 5, 17);
         var originalBlogPost = new BlogPostBuilder().WithUpdatedDate(somewhen).Build();
         BlogPost blogPostFromComponent = null;
@@ -135,6 +143,7 @@ public void ShouldNotUpdateUpdatedDateWhenCheckboxSet()
     [Fact]
     public void ShouldNotSetOptionToNotUpdateUpdatedDateOnInitialCreate()
     {
+        Services.AddScoped(_ => Mock.Of<IMarkerService>());
         var cut = RenderComponent<CreateNewBlogPost>();
 
         var found = cut.FindAll("#updatedate");
@@ -145,6 +154,7 @@ public void ShouldNotSetOptionToNotUpdateUpdatedDateOnInitialCreate()
     [Fact]
     public void ShouldAcceptInputWithoutLosingFocusOrEnter()
     {
+        Services.AddScoped(_ => Mock.Of<IMarkerService>());
         BlogPost blogPost = null;
         var cut = RenderComponent<CreateNewBlogPost>(
             p => p.Add(c => c.OnBlogPostCreated, bp => blogPost = bp));

tests/LinkDotNet.Blog.UnitTests/Web/Shared/Services/MarkerServiceTests.cs

@@ -0,0 +1,33 @@
+using System.Threading.Tasks;
+using Bunit;
+using FluentAssertions;
+using LinkDotNet.Blog.Web.Shared.Services;
+using Xunit;
+
+namespace LinkDotNet.Blog.UnitTests.Web.Shared.Services;
+
+public class MarkerServiceTests : TestContext
+{
+    private readonly MarkerService cut;
+
+    public MarkerServiceTests()
+    {
+        cut = new MarkerService(JSInterop.JSRuntime);
+    }
+
+    [Theory]
+    [InlineData("Test", 0, 2, "**", "**Te**st")]
+    [InlineData("Test", 0, 4, "**", "**Test**")]
+    [InlineData("Test", 0, 0, "**", "Test")]
+    [InlineData("That is a test", 8, 9, "**", "That is **a** test")]
+    public async Task ShouldMarkString(string source, int startSelect, int endSelect, string fence, string expected)
+    {
+        const string element = "id";
+        JSInterop.Setup<SelectionRange>("getSelectionFromElement", element)
+            .SetResult(new SelectionRange { Start = startSelect, End = endSelect });
+
+        var actual = await cut.GetNewMarkdownForElementAsync(element, source, fence, fence);
+
+        actual.Should().Be(expected);
+    }
+}