Step type is now prepended onto step title.

Author: Jake Ginnivan

TestStack.BDDfy.Tests/Scanner/FluentScanner/FluentWithExamples.FluentCanBeUsedWithExamples.approved.txt

@@ -1,12 +1,12 @@
 
 Scenario: Fluent can be used with examples
-	Given method taking <example int>           
-	  Given method taking <example int>         
-	  Given a different method with random arg 2
-	  Given a different method with <Prop2>     
-	When method using <example string>          
-	And I use a <Multi word heading>            
-	Then all is good                            
+	Given method taking <example int>         
+	  And method taking <example int>         
+	  And a different method with random arg 2
+	  And a different method with <Prop2>     
+	When method using <example string>        
+	  And I use a <Multi word heading>        
+	Then all is good                          
 
 Examples: 
 | Prop 1 | Prop2 | Prop 3               | Multi word heading |

TestStack.BDDfy.Tests/Scanner/FluentScanner/FluentWithExamples.cs

@@ -13,12 +13,12 @@ public class FluentWithExamples
         public void FluentCanBeUsedWithExamples()
         {
             var story = this
-                .Given(_ => GivenMethodTaking__ExampleInt__(Prop1), false)
-                .And(_ => GivenMethodTaking__ExampleInt__(_.Prop1), false)
-                .And(_ => GivenADifferentMethodWithRandomArg(2))
-                .And(_ => GivenADifferentMethodWith(_prop2))
+                .Given(_ => MethodTaking__ExampleInt__(Prop1), false)
+                .And(_ => MethodTaking__ExampleInt__(_.Prop1), false)
+                .And(_ => ADifferentMethodWithRandomArg(2))
+                .And(_ => ADifferentMethodWith(_prop2))
                 .When(_ => WhenMethodUsing__ExampleString__())
-                .When(_ => AndIUseA(multiWordHeading))
+                .And(_ => AndIUseA(multiWordHeading))
                 .Then(_ => ThenAllIsGood())
                 .WithExamples(new ExampleTable("Prop 1", "Prop2", "Prop 3", "Multi word heading")
                 {
@@ -75,12 +75,12 @@ private void AndIUseA(string multiWordHeading)
             this.multiWordHeading.ShouldBeOneOf("", "val2");
         }
 
-        private void GivenADifferentMethodWith(string prop2)
+        private void ADifferentMethodWith(string prop2)
         {
             _prop2.ShouldBeOneOf("foo", "bar");
         }
 
-        private void GivenADifferentMethodWithRandomArg(int foo)
+        private void ADifferentMethodWithRandomArg(int foo)
         {
 
         }
@@ -96,7 +96,7 @@ private void WhenMethodUsing__ExampleString__()
             Prop_3.ShouldBeOneOf(ExecutionOrder.ConsecutiveAssertion, ExecutionOrder.Initialize);
         }
 
-        private void GivenMethodTaking__ExampleInt__(int exampleInt)
+        private void MethodTaking__ExampleInt__(int exampleInt)
         {
             exampleInt.ShouldBeInRange(1, 2);
         }

TestStack.BDDfy.Tests/Scanner/FluentScanner/WhenStepsAreScannedUsingFluentScanner.cs

@@ -45,14 +45,14 @@ public void GivenSomeState_IsNotAsserting()
         [Test]
         public void GivenSomeState_StepReports()
         {
-            Assert.IsTrue(GivenSomeStateStep.ShouldReport);        
+            Assert.IsTrue(GivenSomeStateStep.ShouldReport);
         }
 
         Step WhenSomeStepUsesIncompatibleNamingConventionStep
         {
             get
             {
-                return _steps.Single(s => s.Title.Trim() == "When some step uses incompatible naming convention");
+                return _steps.Single(s => s.Title.Trim() == "And when some step uses incompatible naming convention");
             }
         }
 
@@ -71,7 +71,7 @@ public void WhenSomeStepUsesIncompatibleNamingConvention_DoesNotAssert()
         [Test]
         public void WhenSomeStepUsesIncompatibleNamingConvention_Reports()
         {
-            Assert.IsTrue(WhenSomeStepUsesIncompatibleNamingConventionStep.ShouldReport);        
+            Assert.IsTrue(WhenSomeStepUsesIncompatibleNamingConventionStep.ShouldReport);
         }
 
         Step AndAMethodTakesArrayInputsStep
@@ -123,14 +123,14 @@ public void WhenSomethingHappensTransitionStep_DoesNotAssert()
         [Test]
         public void WhenSomethingHappensTransitionStep_Reports()
         {
-            Assert.IsTrue(WhenSomethingHappensTransitionStep.ShouldReport);        
+            Assert.IsTrue(WhenSomethingHappensTransitionStep.ShouldReport);
         }
 
         Step WhenSomethingHappensTransitionStepIgnoringInputInStepTitle
         {
             get
             {
-                return _steps.Single(s => s.Title == "When something happens");
+                return _steps.Single(s => s.Title == "And when something happens");
             }
         }
 
@@ -149,7 +149,7 @@ public void WhenSomethingHappensTransitionStepIgnoringInputInStepTitle_DoesNotAs
         [Test]
         public void WhenSomethingHappensTransitionStepIgnoringInputInStepTitle_Reports()
         {
-            Assert.IsTrue(WhenSomethingHappensTransitionStepIgnoringInputInStepTitle.ShouldReport);        
+            Assert.IsTrue(WhenSomethingHappensTransitionStepIgnoringInputInStepTitle.ShouldReport);
         }
 
         Step WhenSomethingHappensConsecutiveTransitionStep
@@ -175,7 +175,7 @@ public void WhenSomethingHappensConsecutiveTransitionStep_DoesNotAssert()
         [Test]
         public void WhenSomethingHappensConsecutiveTransitionStep_Reports()
         {
-            Assert.IsTrue(WhenSomethingHappensConsecutiveTransitionStep.ShouldReport);        
+            Assert.IsTrue(WhenSomethingHappensConsecutiveTransitionStep.ShouldReport);
         }
 
         Step AndThenSomethingElseHappensStep
@@ -201,7 +201,7 @@ public void AndThenSomethingElseHappensStep_DoesNotAssert()
         [Test]
         public void AndThenSomethingElseHappensStep_Reports()
         {
-            Assert.IsTrue(AndThenSomethingElseHappensStep.ShouldReport);        
+            Assert.IsTrue(AndThenSomethingElseHappensStep.ShouldReport);
         }
 
         Step ThenTheFollowingAssertionsShouldBeCorrectStep
@@ -253,7 +253,7 @@ public void AndIncorrectAttributeWouldNotMatterStep_DoesAssert()
         [Test]
         public void AndIncorrectAttributeWouldNotMatterStep_Reports()
         {
-            Assert.IsTrue(AndIncorrectAttributeWouldNotMatterStep.ShouldReport);        
+            Assert.IsTrue(AndIncorrectAttributeWouldNotMatterStep.ShouldReport);
         }
 
         Step AndInputsAreFormattedPropertlyInTheTitle
@@ -297,7 +297,7 @@ public void TearDownStep_DoesAssert()
         [Test]
         public void TearDownStep_DoesNotReports()
         {
-            Assert.IsFalse(TearDownStep.ShouldReport);        
+            Assert.IsFalse(TearDownStep.ShouldReport);
         }
     }
 }

TestStack.BDDfy/Reporters/Html/Scripts/classic.css

@@ -33,6 +33,7 @@ li {
     background: -o-linear-gradient(top, #679bdb 1%,#3b77a5 100%);
     background: -webkit-gradient(linear, left top, left bottom, color-stop(1%,#679bdb), color-stop(100%,#3b77a5));
     background: -webkit-linear-gradient(top, #679bdb 1%,#3b77a5 100%);
+    /* ReSharper disable once InvalidValue */
     background: linear-gradient(top, #679bdb 1%,#3b77a5 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#679bdb', endColorstr='#3b77a5',GradientType=0 );
     /* Chrome,Safari4+ */