Merge branch 'release-4.0.0'

Author: MehdiK

Packages.build

@@ -3,7 +3,10 @@
   <Import Project="Resource\Build\MSBuild.Community.Tasks.targets" />
 
   <PropertyGroup>
+    <Version Condition="$(GitVersion_SemVer)!=''">$(GitVersion_SemVer)</Version>
     <Version Condition="$(Version)==''">0.0.0.0</Version>
+    <NuGetVersion Condition="$(GitVersion_MajorMinorPatch)==''">$(Version)</NuGetVersion>
+    <NuGetVersion Condition="$(GitVersion_MajorMinorPatch)!=''">$(GitVersion_MajorMinorPatch)$(GitVersion_PreReleaseTagWithDash.Replace('.', ''))</NuGetVersion>
     <BuildPath>$(MSBuildProjectDirectory)\Build</BuildPath>
     <ArtifactPath>$(BuildPath)\Library</ArtifactPath>
     <PackageWorkingPath>$(MSBuildProjectDirectory)\PackageBuild</PackageWorkingPath>
@@ -68,7 +71,7 @@
     </CreateItem>
     <CallTarget Targets="CopyBDDfyLibs;CopyBDDfySampleFiles;CopyNuspecFiles" />
     <MakeDir Directories="$(PackageOutput)" ContinueOnError="true"/>
-    <Exec Command='$(NuGetExe) pack "%(NuGetSpec.FullPath)" -version $(Version)' WorkingDirectory="$(PackageOutput)"/>
+    <Exec Command='$(NuGetExe) pack "%(NuGetSpec.FullPath)" -version $(NuGetVersion)' WorkingDirectory="$(PackageOutput)"/>
   </Target>
 
   <Target Name="Release" DependsOnTargets="Clean;Prepare;Build;Pack"/>

Resource/Build/GitVersion.exe

@@ -0,0 +1,13 @@
+Story: Text reporter tests
+
+Scenario: Scenario Text
+	Given a normal length title                                  [Not executed] 
+	When something of normal length happens                      [Not executed] 
+	Then some long state should be: #Title                       [Not executed] 
+
+Some more stuff which is quite long on the second line
+
+And finally another really long line
+	  And a normal length assertion                              [Not executed] 
+
+

Resource/Build/GitVersion.pdb

@@ -84,9 +84,9 @@ Story: Unhappy examples
 	So that I can diagnose what's wrong
 
 Scenario: Example Scenario
-	Given a <sign> account balance        
+	Given a <sign> account balance
 	When the account holder requests money
-	Then money <action> dispensed         
+	Then money <action> dispensed
 
 Examples: 
 | sign     | action | Result | Errors                                                                                                |
@@ -104,9 +104,9 @@ Story: Happy Examples
 	So that the report is clean and readable
 
 Scenario: Example Scenario
-	Given a <sign> account balance        
+	Given a <sign> account balance
 	When the account holder requests money
-	Then money <action> dispensed         
+	Then money <action> dispensed
 
 Examples: 
 | sign     | action |

TestStack.BDDfy.Tests/Reporters/Html/MetroReportBuilderTests.ShouldProduceExpectedHtml.approved.txt

@@ -4,9 +4,9 @@
 	So that I can be happy
 
 Scenario: Example Scenario
-	Given a <sign> account balance        
+	Given a <sign> account balance
 	When the account holder requests money
-	Then money <action> dispensed         
+	Then money <action> dispensed
 
 Examples: 
 | sign     | action |
@@ -20,9 +20,9 @@ Story: Account holder withdraws cash
 	So that I can get money when the bank is closed
 
 Scenario: Example Scenario
-	Given a <sign> account balance        
+	Given a <sign> account balance
 	When the account holder requests money
-	Then money <action> dispensed         
+	Then money <action> dispensed
 
 Examples: 
 | sign     | action | Result | Errors                                                                                                |

TestStack.BDDfy.Tests/Reporters/Html/MetroReportBuilderTests.ShouldProduceExpectedHtmlWithExamples.approved.txt

@@ -1,4 +1,5 @@
-using System.Runtime.CompilerServices;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Text;
 using ApprovalTests;
 using NUnit.Framework;
@@ -42,5 +43,25 @@ public void ShouldProduceExpectedTextWithExamples()
 
             Approvals.Verify(actual.ToString(), StackTraceScrubber.Scrub);
         }
+
+        [Test]
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public void LongStepName()
+        {
+            var textReporter = new TextReporter();
+            var scenario = new Scenario(typeof(TextReporterTests), new List<Step>
+            {
+                new Step(o =>{ }, new StepTitle("Given a normal length title"), false, ExecutionOrder.SetupState, true, new List<StepArgument>()),
+                new Step(o =>{ }, new StepTitle("When something of normal length happens"), false, ExecutionOrder.Transition, true, new List<StepArgument>()),
+                new Step(o =>{ }, new StepTitle("Then some long state should be: #Title\r\n\r\nSome more stuff which is quite long on the second line\r\n\r\nAnd finally another really long line"),
+                    true, ExecutionOrder.Assertion, true, new List<StepArgument>()),
+                new Step(o =>{ }, new StepTitle("And a normal length assertion"), true, ExecutionOrder.ConsecutiveAssertion, true, new List<StepArgument>())
+            }, "Scenario Text", new List<string>());
+            textReporter.Process(new Story(new StoryMetadata(typeof(TextReporterTests), new StoryNarrativeAttribute()),
+                scenario));
+            var actual = new StringBuilder();
+            actual.AppendLine(textReporter.ToString());
+            Approvals.Verify(actual.ToString(), StackTraceScrubber.Scrub);
+        }
     }
 }

TestStack.BDDfy.Tests/Reporters/TextReporter/TextReporterTests.LongStepName.approved.txt

@@ -3,7 +3,7 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace TestStack.BDDfy.Tests.Scanner.StepScanners.Examples
+namespace TestStack.BDDfy.Tests.Scanner.Examples
 {
     [TestFixture]
     public class ExampleTableTests