Fixed tests.

Integrated testing into CI-CD. bumped coverage to 94%, something to brag about.
ddjerqq · Mar 5, 2024 · 3c813ab · 3c813ab
1 parent 68ef98f
commit 3c813ab
Show file tree

Hide file tree

Showing 27 changed files with 361 additions and 560 deletions.
diff --git a/.github/workflows/publish-docs-to-gh-pages.yaml b/.github/workflows/publish-docs-to-gh-pages.yaml
@@ -5,9 +5,28 @@ on:
     branches: [ "master" ]
 
 jobs:
+  test:
+    concurrency: ci-${{ github.ref }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/[email protected]
+
+      - name: Load Cache 📦
+        uses: actions/cache@v2
+        with:
+          key: ${{ github.ref }}
+          path: .cache/test
+
+      - name: Test 🧪
+        run: dotnet test --verbosity normal
+
+
   build-and-publish-docs:
     concurrency: ci-${{ github.ref }}
     runs-on: ubuntu-latest
+    needs: test
 
     permissions:
       contents: write
@@ -25,7 +44,7 @@ jobs:
         uses: actions/cache@v2
         with:
           key: ${{ github.ref }}
-          path: .cache
+          path: .cache/docs
 
       - name: Install Python mkdocs-material 🐍
         run: pip install mkdocs-material

diff --git a/.github/workflows/publish-to-nuget-on-release.yaml b/.github/workflows/publish-to-nuget-on-release.yaml
@@ -5,17 +5,33 @@ on:
     types: [published]
 
 jobs:
-  build-and-publish:
+  test:
     concurrency: ci-${{ github.ref }}
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout 🛎️
         uses: actions/[email protected]
 
+      - name: Load Cache 📦
+        uses: actions/cache@v2
+        with:
+          key: ${{ github.ref }}
+          path: .cache/test
+
       - name: Test 🧪
         run: dotnet test --verbosity normal
 
+
+  build-and-publish:
+    concurrency: ci-${{ github.ref }}
+    runs-on: ubuntu-latest
+    needs: test
+
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/[email protected]
+
       - name: Pack 📦
         run: dotnet pack --configuration Release --output .
 

diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 [![docs](https://img.shields.io/badge/read_the-docs-blue)](https://ddjerqq.github.io/quickform)
+![docs](https://img.shields.io/badge/test_coverage-94%25-green)
 
 [![Discord](https://dcbadge.vercel.app/api/server/DsAXsMuEbx?style=flat)](https://discord.gg/DsAXsMuEbx)
 [![Nuget](https://img.shields.io/nuget/v/QuickForm)](https://www.nuget.org/packages/QuickForm/)

diff --git a/docs/attributes.md b/docs/attributes.md
@@ -32,6 +32,11 @@ title: Attributes
 | `DataType.PhoneNumber`                | `tel`               |
 | `DataType.Url` or `DataType.ImageUrl` | `url`               |
 | `DataType.MultilineText`              | `null`              |
+| `DataType("custom")`                  | `custom`            |
+
+!!! info "Custom data types"
+
+    Custom data types are useful for `hidden`, `search`, or other relatively-rare input types.
 
 ## DateTypes
 

diff --git a/src/QuickForm/Components/QuickForm.razor.cs b/src/QuickForm/Components/QuickForm.razor.cs
@@ -33,7 +33,12 @@ public partial class QuickForm<TEntity> : ComponentBase, IDisposable
     /// Gets or sets the template for the fields in this form.
     /// </summary>
     [Parameter]
-    public virtual RenderFragment<IQuickFormField> ChildContent { get; set; } = default!;
+    public virtual RenderFragment<IQuickFormField> ChildContent { get; set; } = ctx => builder =>
+    {
+        builder.OpenElement(0, "div");
+        builder.AddContent(1, "You must provide ChildContent unless you are using a custom form template.");
+        builder.CloseElement();
+    };
 
     /// <summary>
     /// Gets or sets the submit button template of the form.

diff --git a/test/QuickForm.Test/BaseTest.cs b/test/QuickForm.Test/BaseTest.cs
@@ -3,12 +3,13 @@
 using Bunit;
 using Bunit.Diffing;
 using NUnit.Framework;
+using TestContext = Bunit.TestContext;
 
 namespace QuickForm.Test;
 
 [TestFixture]
 [FixtureLifeCycle(LifeCycle.InstancePerTestCase)]
-public class BaseTest : Bunit.TestContext
+public class BaseTest : TestContext
 {
     private static readonly HtmlParser HtmlParser = new();
 

diff --git a/test/QuickForm.Test/Components/TestBsQuickForm.razor b/test/QuickForm.Test/Components/TestBsQuickForm.razor
@@ -0,0 +1,37 @@
+@using System.ComponentModel.DataAnnotations
+@inherits BaseTest
+
+@code
+{
+    [SuppressMessage("ReSharper", "UnusedMember.Local")]
+    private class Model
+    {
+        [Required]
+        public string A { get; set; } = default!;
+    }
+
+    [Test]
+    public void Test()
+    {
+        var model = new Model();
+
+        var cut = Render(
+            @<text>
+                 <BsQuickForm Model="model" />
+             </text>);
+
+        cut.MarkupMatches(
+            @<text>
+                <form diff:ignoreAttributes >
+                    <div diff:ignoreAttributes>
+                        <label for:ignoreCase:regex="@IdRegex" diff:ignoreAttributes>A</label>
+                        <input id:ignoreCase:regex="@IdRegex" diff:ignoreAttributes>
+                    </div>
+
+                    <button type="submit" diff:ignoreAttributes>submit</button>
+                </form>
+             </text>);
+
+        Print(cut);
+    }
+}
diff --git a/test/QuickForm.Test/Components/TestCustomTemplate.razor b/test/QuickForm.Test/Components/TestCustomTemplate.razor
@@ -1,5 +1,5 @@
-@using QuickForm.Attributes
-@using System.ComponentModel.DataAnnotations
+@using System.ComponentModel.DataAnnotations
+@using QuickForm.Attributes
 @inherits BaseTest
 
 @code
@@ -22,62 +22,15 @@
             @<text>
                  <QuickForm Model="model">
                      <ChildContent>
-                         <label for="@context.EditorId"></label>
+                         <div>hello</div>
                      </ChildContent>
-
-                     <SubmitButtonTemplate>
-                         <button type="submit" class="submit-button">
-                             submit
-                         </button>
-                     </SubmitButtonTemplate>
                  </QuickForm>
              </text>);
 
         cut.MarkupMatches(
             @<text>
                  <form diff:ignoreAttributes>
-                     <div>
-                         <label for:ignoreCase:regex="@IdRegex" diff:ignoreChildren></label>
-                         <div class="input">
-                             <input id:ignoreCase:regex="@IdRegex" required autofocus/>
-                         </div>
-                         <div class="description">description-text</div>
-                         <div class="valid-feedback">valid-feedback-text</div>
-                         <div class="invalid-feedback"></div>
-                     </div>
-
-                     <button type="submit" class="submit-button">
-                         submit
-                     </button>
-                 </form>
-             </text>);
-
-        Print(cut);
-
-        cut.Find("input").Change(string.Empty);
-
-        cut.MarkupMatches(
-            @<text>
-                 <form diff:ignoreAttributes>
-                     <div>
-                         <label for:ignoreCase:regex="@IdRegex" diff:ignoreChildren></label>
-                         <div class="input">
-                             <input id:ignoreCase:regex="@IdRegex" aria-invalid="true" required autofocus class="modified invalid" value=""/>
-                         </div>
-                         <div class="description">
-                             description-text
-                         </div>
-                         <div class="valid-feedback">
-                             valid-feedback-text
-                         </div>
-                         <div class="invalid-feedback">
-                             <div class="validation-message">required-error-message</div>
-                         </div>
-                     </div>
-
-                     <button type="submit" class="submit-button">
-                         submit
-                     </button>
+                     <div>hello</div>
                  </form>
              </text>);
 

diff --git a/test/QuickForm.Test/Components/TestDataList.razor b/test/QuickForm.Test/Components/TestDataList.razor
@@ -6,8 +6,7 @@
     [SuppressMessage("ReSharper", "UnusedMember.Local")]
     private class Model
     {
-        [DataList("list")]
-        public string A { get; set; } = default!;
+        [DataList("list")] public string A { get; set; } = default!;
     }
 
     [Test]
@@ -17,17 +16,16 @@
 
         var cut = Render(
             @<text>
-                <QuickForm Model="model"/>
+                 <QuickForm Model="model">
+                     @context.InputComponent(string.Empty)
+                 </QuickForm>
              </text>);
 
         cut.MarkupMatches(
             @<text>
-                <form novalidate blazor:onsubmit="1">
-                    <div>
-                        <label for:ignoreCase:regex="@IdRegex" diff:ignoreChildren></label>
-                        <input id:ignoreCase:regex="@IdRegex" list="list" autofocus/>
-                    </div>
-                </form>
+                 <form diff:ignoreAttributes>
+                     <input list="list" diff:ignoreAttributes/>
+                 </form>
              </text>);
 
         Print(cut);