Merge branch 'master' into nunit-4

approvals · May 11, 2024 · 6fb6025 · 6fb6025
2 parents e904407 + 9489957
commit 6fb6025
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 11 deletions.
diff --git a/docs/ApprovalTests/howtos/CustomizingDiffToolSelectionOrder.md b/docs/ApprovalTests/howtos/CustomizingDiffToolSelectionOrder.md
@@ -21,8 +21,6 @@ Once you create the class, you select it with the `[UseReporter(typeof(CustomDif
 <!-- snippet: CustomDiffReporter.cs -->
 <a id='snippet-CustomDiffReporter.cs'></a>
 ```cs
-using ApprovalTests.Reporters.TestFrameworks;
-
 public class CustomDiffReporter :
     FirstWorkingReporter
 {
@@ -44,7 +42,7 @@ public class CustomDiffReporter :
     }
 }
 ```
-<sup><a href='/src/ApprovalTests.Tests/Reporters/CustomDiffReporter.cs#L1-L22' title='Snippet source file'>snippet source</a> | <a href='#snippet-CustomDiffReporter.cs' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/ApprovalTests.Tests/Reporters/CustomDiffReporter.cs#L1-L20' title='Snippet source file'>snippet source</a> | <a href='#snippet-CustomDiffReporter.cs' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 You can also override the default order while using `DiffReporter` by defining `DiffEngine_ToolOrder` environment variable. The value of that variable should contain a delimiter (`,`, `|`, ` `) separated list of the diff tool names in the desired order. More details about that in [Diff Tool Order](https://github.com/VerifyTests/DiffEngine/blob/main/docs/diff-tool.order.md)

diff --git a/src/ApprovalTests.Tests/GlobalUsings.cs b/src/ApprovalTests.Tests/GlobalUsings.cs
@@ -14,6 +14,7 @@
 global using ApprovalTests.Namers;
 global using ApprovalTests.Namers.StackTraceParsers;
 global using ApprovalTests.Reporters;
+global using ApprovalTests.Reporters.TestFrameworks;
 global using ApprovalTests.Scrubber;
 global using ApprovalTests.Utilities;
 global using ApprovalTests.WindowsRegistry;

diff --git a/src/ApprovalTests.Tests/Reporters/CustomDiffReporter.cs b/src/ApprovalTests.Tests/Reporters/CustomDiffReporter.cs
@@ -1,6 +1,4 @@
-using ApprovalTests.Reporters.TestFrameworks;
-
-public class CustomDiffReporter :
+public class CustomDiffReporter :
     FirstWorkingReporter
 {
     public CustomDiffReporter()

diff --git a/src/ApprovalTests.Tests/Reporters/MultiReporterTest.cs b/src/ApprovalTests.Tests/Reporters/MultiReporterTest.cs
@@ -1,5 +1,3 @@
-using ApprovalTests.Reporters.TestFrameworks;
-
 [TestFixture]
 public class MultiReporterTest
 {

diff --git a/src/ApprovalTests.Tests/Reporters/NUnitReporterTest.cs b/src/ApprovalTests.Tests/Reporters/NUnitReporterTest.cs
@@ -1,4 +1,3 @@
-using ApprovalTests.Reporters.TestFrameworks;
 using NUnit.Framework.Internal;
 
 [TestFixture]

diff --git a/src/ApprovalTests.Tests/Reporters/NUnitReporterWithCleanup.cs b/src/ApprovalTests.Tests/Reporters/NUnitReporterWithCleanup.cs
@@ -1,5 +1,3 @@
-using ApprovalTests.Reporters.TestFrameworks;
-
 public class NUnitReporterWithCleanup : NUnitReporter
 {
     public override void Report(string approved, string received)