Update TUnit (#521)

* Update TUnit * Update TUnit * DependsOn.cs * Tidy up * Fix * ReleaseNotes.md * HeadRef * Better tests * Formatting Markdown * Fix --------- Co-authored-by: Tom Longhurst <[email protected]>
thomhurst · Jul 5, 2024 · e46f94c · e46f94c
1 parent e314600
commit e46f94c
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -63,7 +63,6 @@ Define your pipeline in .NET! Strong types, intellisense, parallelisation, and t
 | ModularPipelines.WinGet | Helpers for interacting with the Windows Package Manager. | [![nuget](https://img.shields.io/nuget/v/ModularPipelines.WinGet.svg)](https://www.nuget.org/packages/ModularPipelines.WinGet/) |
 | ModularPipelines.Yarn | Helpers for interacting with Yarn CLI. | [![nuget](https://img.shields.io/nuget/v/ModularPipelines.Yarn.svg)](https://www.nuget.org/packages/ModularPipelines.Yarn/) |
 
-
 ## Getting Started
 
 If you want to see how to get started, or want to know more about ModularPipelines, [read the Documentation here](https://thomhurst.github.io/ModularPipelines)

diff --git a/src/ModularPipelines.Build/Modules/CodeFormattedNicelyModule.cs b/src/ModularPipelines.Build/Modules/CodeFormattedNicelyModule.cs
@@ -97,7 +97,7 @@ await context.DotNet().Format(new DotNetFormatOptions
                 Severity = "info",
             }, cancellationToken);
 
-            var branchTriggeringPullRequest = context.GitHub().EnvironmentVariables.RefName!;
+            var branchTriggeringPullRequest = context.GitHub().EnvironmentVariables.HeadRef!;
 
             await GitHelpers.SetUserCommitInformation(context, cancellationToken);
 

diff --git a/src/ModularPipelines.Build/Modules/FormatMarkdownModule.cs b/src/ModularPipelines.Build/Modules/FormatMarkdownModule.cs
@@ -89,7 +89,7 @@ await context.Node().Npx.ExecuteAsync(new NpxOptions
             return await NothingAsync();
         }
 
-        var branchTriggeringPullRequest = context.GitHub().EnvironmentVariables.RefName!;
+        var branchTriggeringPullRequest = context.GitHub().EnvironmentVariables.HeadRef!;
 
         await GitHelpers.SetUserCommitInformation(context, cancellationToken);
 

diff --git a/src/ModularPipelines.Build/ReleaseNotes.md b/src/ModularPipelines.Build/ReleaseNotes.md
@@ -0,0 +1 @@
+null
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -9,7 +9,6 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(MSBuildProjectName)' != 'ModularPipelines.TestsForTests'">
-        <PackageReference Include="TUnit" Version="0.1.379-alpha01" />
-        <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.10.4" />
+        <PackageReference Include="TUnit" Version="0.1.401-alpha01" />
     </ItemGroup>
 </Project>
diff --git a/test/ModularPipelines.TestHelpers/ModularPipelines.TestHelpers.csproj b/test/ModularPipelines.TestHelpers/ModularPipelines.TestHelpers.csproj
@@ -13,7 +13,6 @@
     <ItemGroup>
         <PackageReference Include="Azure.ResourceManager" Version="1.12.0" />
         <PackageReference Include="Azure.Identity" Version="1.12.0" />
-        <PackageReference Update="TUnit" Version="0.1.379-alpha01" />
     </ItemGroup>
 
 </Project>
diff --git a/test/ModularPipelines.UnitTests/DependsOnTests.cs b/test/ModularPipelines.UnitTests/DependsOnTests.cs
@@ -66,7 +66,7 @@ private class DependsOnSelfModule : Module
         }
     }
 
-    [DependsOn(typeof(ModuleFailedException))]
+    [ModularPipelines.Attributes.DependsOn(typeof(ModuleFailedException))]
     private class DependsOnNonModule : Module
     {
         protected override async Task<IDictionary<string, object>?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)

diff --git a/test/ModularPipelines.UnitTests/ModularPipelines.UnitTests.csproj b/test/ModularPipelines.UnitTests/ModularPipelines.UnitTests.csproj
@@ -11,11 +11,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.2.1" />
         <PackageReference Include="Moq" Version="4.20.70" />
         <PackageReference Include="NReco.Logging.File" Version="1.2.1" />
         <PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
-        <PackageReference Update="TUnit" Version="0.1.379-alpha01" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/ModularPipelines.UnitTests/NotInParallelTests.cs b/test/ModularPipelines.UnitTests/NotInParallelTests.cs
@@ -13,7 +13,7 @@ public class Module1 : Module<string>
     {
         protected override async Task<string?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
         {
-            await Task.Delay(TimeSpan.FromSeconds(2), cancellationToken);
+            await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
             return GetType().Name;
         }
     }
@@ -23,7 +23,7 @@ public class Module2 : Module<string>
     {
         protected override async Task<string?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
         {
-            await Task.Delay(TimeSpan.FromSeconds(2), cancellationToken);
+            await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
             return GetType().Name;
         }
     }
@@ -34,7 +34,7 @@ public class NotParallelModuleWithParallelDependency : Module<string>
     {
         protected override async Task<string?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
         {
-            await Task.Delay(TimeSpan.FromSeconds(2), cancellationToken);
+            await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
             return GetType().Name;
         }
     }
@@ -43,7 +43,7 @@ public class ParallelDependency : Module<string>
     {
         protected override async Task<string?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
         {
-            await Task.Delay(TimeSpan.FromSeconds(2), cancellationToken);
+            await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
             return GetType().Name;
         }
     }
@@ -54,7 +54,7 @@ public class NotParallelModuleWithNonParallelDependency : Module<string>
     {
         protected override async Task<string?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
         {
-            await Task.Delay(TimeSpan.FromSeconds(2), cancellationToken);
+            await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
             return GetType().Name;
         }
     }
@@ -70,8 +70,8 @@ public async Task NotInParallel()
         var firstModule = results.Modules.MinBy(x => x.EndTime)!;
         var nextModule = results.Modules.MaxBy(x => x.EndTime)!;
         await Assert.That(nextModule.StartTime)
-            .Is.EqualToWithTolerance(firstModule.StartTime + TimeSpan.FromSeconds(2),
-                TimeSpan.FromMilliseconds(500));
+            .Is.EqualToWithTolerance(firstModule.StartTime + TimeSpan.FromSeconds(5),
+                TimeSpan.FromSeconds(1));
     }
 
     [Test, Retry(3)]
@@ -85,7 +85,7 @@ public async Task NotInParallel_With_ParallelDependency()
         var firstModule = results.Modules.MinBy(x => x.EndTime)!;
         var nextModule = results.Modules.MaxBy(x => x.EndTime)!;
         await Assert.That(nextModule.StartTime)
-            .Is.EqualToWithTolerance(firstModule.StartTime + TimeSpan.FromSeconds(2), TimeSpan.FromMilliseconds(500));
+            .Is.EqualToWithTolerance(firstModule.StartTime + TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(1));
     }
 
     [Test, Retry(3)]
@@ -100,9 +100,9 @@ public async Task NotInParallel_With_NonParallelDependency()
         var firstModule = results.Modules.MinBy(x => x.EndTime)!;
         var nextModule = results.Modules.MaxBy(x => x.EndTime)!;
 
-        var expectedStartTime = firstModule.StartTime + TimeSpan.FromSeconds(4);
+        var expectedStartTime = firstModule.StartTime + TimeSpan.FromSeconds(10);
 
         await Assert.That(nextModule.StartTime)
-            .Is.EqualToWithTolerance(expectedStartTime, TimeSpan.FromMilliseconds(500));
+            .Is.EqualToWithTolerance(expectedStartTime, TimeSpan.FromSeconds(1));
     }
 }