Skip to content
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ List of added functionality in this release.

List of fixes in this release.

- Fixed JSInterop error message when trying to import an unconfigured module (#398).

- Fixed issue where a registered fall-back service provider was not made available to resolve service dependencies of components under test. Thanks to [@dady8889](https://github.com/dady8889) for the reporting the issue.

## [1.1.5] - 2021-04-30
Expand Down
53 changes: 40 additions & 13 deletions src/bunit.web/JSInterop/JSRuntimeUnhandledInvocationException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using Microsoft.JSInterop;

namespace Bunit
{
Expand All @@ -13,6 +14,10 @@ namespace Bunit
[Serializable]
public sealed class JSRuntimeUnhandledInvocationException : Exception
{
#if NET5_0_OR_GREATER
private const string DefaultImportIdentifier = "import";
#endif

/// <summary>
/// Gets the unplanned invocation.
/// </summary>
Expand Down Expand Up @@ -53,22 +58,29 @@ private static string CreateErrorMessage(JSRuntimeInvocation invocation)
sb.AppendLine("Configure bUnit's JSInterop to handle the call with following:");
sb.AppendLine();

if (invocation.IsVoidResultInvocation)
if (IsImportModuleInvocation(invocation))
{
sb.AppendLine($" SetupVoid({GetArguments(invocation)})");
sb.AppendLine($" SetupModule({GetArguments(invocation, includeIdentifier: false)})");
}
else
{
sb.AppendLine($" Setup<{GetReturnTypeName(invocation.ResultType)}>({GetArguments(invocation)})");
}

if (invocation.Arguments.Any())
{
sb.AppendLine("or the following, to match any arguments:");
if (invocation.IsVoidResultInvocation)
sb.AppendLine($" SetupVoid(\"{invocation.Identifier}\", _ => true)");
{
sb.AppendLine($" SetupVoid({GetArguments(invocation)})");
}
else
sb.AppendLine($" Setup<{GetReturnTypeName(invocation.ResultType)}>(\"{invocation.Identifier}\", _ => true)");
{
sb.AppendLine($" Setup<{GetReturnTypeName(invocation.ResultType)}>({GetArguments(invocation)})");
}

if (invocation.Arguments.Any())
{
sb.AppendLine("or the following, to match any arguments:");
if (invocation.IsVoidResultInvocation)
sb.AppendLine($" SetupVoid(\"{invocation.Identifier}\", _ => true)");
else
sb.AppendLine($" Setup<{GetReturnTypeName(invocation.ResultType)}>(\"{invocation.Identifier}\", _ => true)");
}
}

sb.AppendLine();
Expand Down Expand Up @@ -113,11 +125,26 @@ private static string GetGenericInvocationArguments(JSRuntimeInvocation invocati
}
}

private static string GetArguments(JSRuntimeInvocation invocation)
#pragma warning disable S1172 // Unused method parameters should be removed
private static bool IsImportModuleInvocation(JSRuntimeInvocation invocation)
#pragma warning restore S1172 // Unused method parameters should be removed
{
#if NET5_0_OR_GREATER
return string.Equals(invocation.Identifier, DefaultImportIdentifier, StringComparison.Ordinal)
&& typeof(IJSObjectReference).IsAssignableFrom(invocation.ResultType);
#else
return false;
#endif
}

private static string GetArguments(JSRuntimeInvocation invocation, bool includeIdentifier = true)
{
var args = invocation.Arguments
.Select(x => x is string s ? $"\"{s}\"" : x?.ToString() ?? "null")
.Prepend($"\"{invocation.Identifier}\"");
.Select(x => x is string s ? $"\"{s}\"" : x?.ToString() ?? "null");
if (includeIdentifier)
{
args = args.Prepend($"\"{invocation.Identifier}\"");
}

return string.Join(", ", args);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
using System;
using System.Diagnostics.CodeAnalysis;
using AutoFixture.Xunit2;
using Microsoft.JSInterop;
using Xunit;

namespace Bunit.JSInterop
{
[SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1118:Parameter should not span multiple lines", Justification = "Makes error message easier to read.")]
[SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "Dummy types are visible for testing purposes.")]
public class JSRuntimeUnhandledInvocationExceptionTest
public partial class JSRuntimeUnhandledInvocationExceptionTest
{
private const string CodeIdent = " ";

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#if NET5_0_OR_GREATER
using System;
using System.Diagnostics.CodeAnalysis;
using AutoFixture.Xunit2;
using Microsoft.JSInterop;
using Xunit;

namespace Bunit.JSInterop
{
public partial class JSRuntimeUnhandledInvocationExceptionTest
{
[Theory(DisplayName = "Message prints correctly when trying to import an unconfigured module")]
[AutoData]
public void Test036(string moduleName)
{
var identifier = "import";
var returnType = typeof(IJSObjectReference);
var invocationMethodName = "InvokeAsync";
var exectedErrorMessage = CreateExpectedErrorMessage(
$"{CodeIdent}{invocationMethodName}<{returnType.Name}>(\"{identifier}\", \"{moduleName}\")",
$"{CodeIdent}SetupModule(\"{moduleName}\")");

var sut = new JSRuntimeUnhandledInvocationException(new JSRuntimeInvocation(identifier, new object?[] { moduleName }, returnType, invocationMethodName));

Assert.Equal(exectedErrorMessage, sut.Message);
}
}
}
#endif