Updated changelog, renamed render methods in TestContextBase for better overloading possibilities in the future

Author: egil

.github/workflows/deploy-docs.yml

@@ -22,9 +22,9 @@ jobs:
         with:
           setAllVars: true
 
-      - name: Setting VERSION
-        run: echo "::set-env name=VERSION::$NBGV_NuGetPackageVersion"
-      
+      - name: Setting VERSION env
+        run: echo "VERSION=$NBGV_NuGetPackageVersion" >> $GITHUB_ENV
+
       - name: Update tokens in project files
         uses: cschleiden/replace-tokens@v1
         with:

.github/workflows/main.yml

@@ -70,9 +70,6 @@ jobs:
 
   verify-template:
     if: github.event_name != 'schedule'
-    env:
-      BRANCH: ''
-      VERSION: ''
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -84,10 +81,11 @@ jobs:
         with:
           setAllVars: true
 
+      - uses: nelonoel/branch-name@v1.0.1
       - name: Setting VERSION and BRANCH env
         run: |
-          echo "::set-env name=VERSION::$NBGV_NuGetPackageVersion"
-          echo "::set-env name=BRANCH::$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')"
+          echo "VERSION=$NBGV_NuGetPackageVersion" >> $GITHUB_ENV
+          echo "BRANCH=$BRANCH_NAME" >> $GITHUB_ENV
 
       - name: Update tokens in project files
         uses: cschleiden/replace-tokens@v1
@@ -121,79 +119,78 @@ jobs:
     if: github.event_name != 'schedule' && github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0w
-
-    - uses: dotnet/nbgv@master
-      with:
-        setAllVars: true
-
-    - name: Setting VERSION and BRANCH env
-      run: |
-        echo "::set-env name=VERSION::$NBGV_NuGetPackageVersion"
-        echo "::set-env name=BRANCH::$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')"
-
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.x'
-
-    - name: Install dotnet-sonarscanner
-      run: dotnet tool install --global dotnet-sonarscanner
-    - name: Running dotnet-sonarscanner
-      shell: bash
-      env:
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        dotnet sonarscanner begin /k:"egil_bUnit" /o:"egil" /n:"bUnit" /v:"$NBGV_NuGetPackageVersion" /d:sonar.login="$SONAR_TOKEN" /d:sonar.host.url=https://sonarcloud.io /d:sonar.branch.name="$BRANCH" /d:sonar.verbose="true" /d:sonar.cs.opencover.reportsPaths="tests/**/coverage/*.opencover.xml"
-        dotnet build
-        dotnet test tests/bunit.core.tests/ /p:CollectCoverage=true /p:CoverletOutput=./coverage/ /p:CoverletOutputFormat=opencover /p:ExcludeByAttribute=\"Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute\"
-        dotnet test tests/bunit.web.tests/ /p:CollectCoverage=true /p:CoverletOutput=./coverage/ /p:CoverletOutputFormat=opencover /p:ExcludeByAttribute=\"Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute\"
-        dotnet test tests/bunit.xunit.tests/ /p:CollectCoverage=true /p:CoverletOutput=./coverage/ /p:CoverletOutputFormat=opencover /p:ExcludeByAttribute=\"Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute\"
-        dotnet sonarscanner end /d:sonar.login="$SONAR_TOKEN"
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - uses: dotnet/nbgv@master
+        with:
+          setAllVars: true
+
+      - uses: nelonoel/branch-name@v1.0.1
+
+      - name: Setting VERSION and BRANCH env
+        run: |
+          echo "VERSION=$NBGV_NuGetPackageVersion" >> $GITHUB_ENV
+          echo "BRANCH=$BRANCH_NAME" >> $GITHUB_ENV
+
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '3.1.x'
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.x'
+
+      - name: Install dotnet-sonarscanner
+        run: dotnet tool install --global dotnet-sonarscanner
+      - name: Running dotnet-sonarscanner
+        shell: bash
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          dotnet sonarscanner begin /k:"egil_bUnit" /o:"egil" /n:"bUnit" /v:"$NBGV_NuGetPackageVersion" /d:sonar.login="$SONAR_TOKEN" /d:sonar.host.url=https://sonarcloud.io /d:sonar.branch.name="$BRANCH" /d:sonar.verbose="true" /d:sonar.cs.opencover.reportsPaths="tests/**/coverage/*.opencover.xml"
+          dotnet build
+          dotnet test tests/bunit.core.tests/ /p:CollectCoverage=true /p:CoverletOutput=./coverage/ /p:CoverletOutputFormat=opencover /p:ExcludeByAttribute=\"Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute\"
+          dotnet test tests/bunit.web.tests/ /p:CollectCoverage=true /p:CoverletOutput=./coverage/ /p:CoverletOutputFormat=opencover /p:ExcludeByAttribute=\"Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute\"
+          dotnet test tests/bunit.xunit.tests/ /p:CollectCoverage=true /p:CoverletOutput=./coverage/ /p:CoverletOutputFormat=opencover /p:ExcludeByAttribute=\"Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute\"
+          dotnet sonarscanner end /d:sonar.login="$SONAR_TOKEN"
 
   code-ql:
     if: github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 0
-
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.x'
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: csharp
-        config-file: ./.github/codeql/codeql-config.yml
-
-    - name: Building library
-      run: dotnet build -p:ContinuousIntegrationBuild=true
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          # We must fetch at least the immediate parents so that if this is
+          # a pull request then we can checkout the head.
+          fetch-depth: 0
+
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '3.1.x'
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.x'
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: csharp
+          config-file: ./.github/codeql/codeql-config.yml
+
+      - name: Building library
+        run: dotnet build -p:ContinuousIntegrationBuild=true
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
 
   publish-nuget-packages:
     if: (github.event_name == 'push' && github.ref == 'refs/heads/dev') || github.event_name == 'release'
     needs: [dotnet-build, dotnet-test, verify-template]
     runs-on: ubuntu-latest
-    env:
-      VERSION: ''
-      BRANCH: ''
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
@@ -204,10 +201,11 @@ jobs:
         with:
           setAllVars: true
 
+      - uses: nelonoel/branch-name@v1.0.1
       - name: Setting VERSION and BRANCH env
         run: |
-          echo "::set-env name=VERSION::$NBGV_NuGetPackageVersion"
-          echo "::set-env name=BRANCH::$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')"
+          echo "VERSION=$NBGV_NuGetPackageVersion" >> $GITHUB_ENV
+          echo "BRANCH=$BRANCH_NAME" >> $GITHUB_ENV
 
       - name: Update tokens in project files
         uses: cschleiden/replace-tokens@v1

CHANGELOG.md

@@ -13,7 +13,19 @@ List of new features.
 
 - Added support for triggering `@ontoggle` event handlers through a dedicated `Toggle()` method. By [@egil](https://github.com/egil) in [#256](https://github.com/egil/bUnit/pull/256).
 
-- Added out of the box support for `<Virtualize>` component. When a `<Virtualize>` component is used in a component under test, it's JavaScript interop-calls are faked by bUnits JSInterop, and it should result in all items being rendered immediately.
+- Added support for components that call `ElementReference.FocusAsync`. These calls are handled by the bUnits JSInterop, that also allows you to verify that `FocusAsync` has been called for a specific element. For example, if a component has rendered an `<input>` element, then the following code will verify that it has been focused using `FocusAsync`:
+
+  ```csharp
+  var cut = RenderComponent<FocusingComponent>();
+
+  var input = cut.Find("input");
+
+  JSInterop.VerifyFocusAsyncInvoke()
+    .Arguments[0] // the first argument is the ElemenetReference
+    .ShouldBeElementReferenceTo(input);
+  ```
+
+  By [@egil](https://github.com/egil) in [#260](https://github.com/egil/bUnit/pull/260).
 
 ### Changed
 List of changes in existing functionality.

src/bunit.core/TestContextBase.cs

@@ -57,9 +57,9 @@ protected TestContextBase()
 		/// Renders a component, declared in the <paramref name="renderFragment"/>, inside the <see cref="RenderTree"/>.
 		/// </summary>
 		/// <typeparam name="TComponent">The type of component to render.</typeparam>
-		/// <param name="renderFragment">The <see cref="RenderFragment"/> that contains a declaration of the component.</param>
+		/// <param name="renderFragment">The <see cref="RenderFragmentBase"/> that contains a declaration of the component.</param>
 		/// <returns>A <see cref="IRenderedComponentBase{TComponent}"/>.</returns>
-		protected IRenderedComponentBase<TComponent> RenderComponent<TComponent>(RenderFragment renderFragment) where TComponent : IComponent
+		protected IRenderedComponentBase<TComponent> RenderComponentBase<TComponent>(RenderFragment renderFragment) where TComponent : IComponent
 		{
 			// Wrap TComponent in any layout components added to the test context.
 			// If one of the layout components is the same type as TComponent,
@@ -79,9 +79,9 @@ protected IRenderedComponentBase<TComponent> RenderComponent<TComponent>(RenderF
 		/// <summary>
 		/// Renders a fragment, declared in the <paramref name="renderFragment"/>, inside the <see cref="RenderTree"/>.
 		/// </summary>
-		/// <param name="renderFragment">The <see cref="RenderFragment"/> to render.</param>
+		/// <param name="renderFragment">The <see cref="RenderFragmentBase"/> to render.</param>
 		/// <returns>A <see cref="IRenderedFragmentBase"/>.</returns>
-		protected IRenderedFragmentBase RenderFragment(RenderFragment renderFragment)
+		protected IRenderedFragmentBase RenderFragmentBase(RenderFragment renderFragment)
 		{
 			// Wrap fragment in a FragmentContainer so the start of the test supplied
 			// razor fragment can be found after, and then wrap in any layout components

src/bunit.web/RazorTesting/Fixture.cs

@@ -142,12 +142,12 @@ private ComponentUnderTest SelectComponentUnderTest(string _)
 
 		private IRenderedComponent<TComponent> Factory<TComponent>(RenderFragment fragment) where TComponent : IComponent
 		{
-			return (IRenderedComponent<TComponent>)RenderComponent<TComponent>(fragment);
+			return (IRenderedComponent<TComponent>)RenderComponentBase<TComponent>(fragment);
 		}
 
 		private IRenderedFragment Factory(RenderFragment fragment)
 		{
-			return (IRenderedFragment)RenderFragment(fragment);
+			return (IRenderedFragment)RenderFragmentBase(fragment);
 		}
 
 		private static IRenderedComponent<TComponent> TryCastTo<TComponent>(IRenderedFragment target, [System.Runtime.CompilerServices.CallerMemberName] string sourceMethod = "") where TComponent : IComponent

src/bunit.web/RazorTesting/SnapshotTest.cs

@@ -68,10 +68,10 @@ protected override async Task Run()
 			if (SetupAsync is not null)
 				await TryRunAsync(SetupAsync, this).ConfigureAwait(false);
 
-			var renderedTestInput = (IRenderedFragment)RenderFragment(TestInput!);
+			var renderedTestInput = (IRenderedFragment)RenderFragmentBase(TestInput!);
 			var inputHtml = renderedTestInput.Markup;
 
-			var renderedExpectedRender = (IRenderedFragment)RenderFragment(ExpectedOutput!);
+			var renderedExpectedRender = (IRenderedFragment)RenderFragmentBase(ExpectedOutput!);
 			var expectedHtml = renderedExpectedRender.Markup;
 
 			VerifySnapshot(inputHtml, expectedHtml);

src/bunit.web/TestContext.cs

@@ -37,7 +37,7 @@ public TestContext()
 		public virtual IRenderedComponent<TComponent> RenderComponent<TComponent>(params ComponentParameter[] parameters) where TComponent : IComponent
 		{
 			var renderFragment = new ComponentParameterCollection { parameters }.ToRenderFragment<TComponent>();
-			return (IRenderedComponent<TComponent>)RenderComponent<TComponent>(renderFragment);
+			return (IRenderedComponent<TComponent>)RenderComponentBase<TComponent>(renderFragment);
 		}
 
 		/// <summary>
@@ -49,7 +49,7 @@ public virtual IRenderedComponent<TComponent> RenderComponent<TComponent>(params
 		public virtual IRenderedComponent<TComponent> RenderComponent<TComponent>(Action<ComponentParameterCollectionBuilder<TComponent>> parameterBuilder) where TComponent : IComponent
 		{
 			var renderFragment = new ComponentParameterCollectionBuilder<TComponent>(parameterBuilder).Build().ToRenderFragment<TComponent>();
-			return (IRenderedComponent<TComponent>)RenderComponent<TComponent>(renderFragment);
+			return (IRenderedComponent<TComponent>)RenderComponentBase<TComponent>(renderFragment);
 		}
 	}
 }

tests/bunit.web.tests/JSInterop/InvocationHandlers/FocusAsyncInvocationHandlerTest.cs

@@ -1,8 +1,4 @@
 #if NET5_0
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;