Merge pull request #117 from JakeGinnivan/GenerateFluentApi

Generate fluent api

Author: MehdiK

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

@@ -73,7 +73,7 @@ public void Dispose()
 
         public static IEnumerable<Step> GetSteps(ScenarioToBeScannedUsingFluentScanner testObject)
         {
-            var fluentScanner = testObject
+            var fluentScanner = TestContext.GetContext(testObject
                 .Given(s => s.GivenSomeState(1, 2))
                     .And(s => s.WhenSomeStepUsesIncompatibleNamingConvention())
                     .And(s => s.AndAMethodTakesArrayInputs(new[] {"1", "2"}, new[] {3, 4}, 5))
@@ -85,9 +85,9 @@ public static IEnumerable<Step> GetSteps(ScenarioToBeScannedUsingFluentScanner t
                 .Then(s => s.ThenTheFollowingAssertionsShouldBeCorrect())
                     .And(s => s.AndIncorrectAttributeWouldNotMatter())
                     .And(s => s.ThenTitleFormatingWorksToo(InputDate), InputDateStepTitleTemplate)
-                .TearDownWith(s => s.Dispose());
+                .TearDownWith(s => s.Dispose())).FluentScanner;
 
-            return ((IFluentScanner)fluentScanner).GetScanner(null, null).Scan().Scenarios.SelectMany(s => s.Steps).ToList();
+            return fluentScanner.GetScanner(null, null).Scan().Scenarios.SelectMany(s => s.Steps).ToList();
         }
     }
 }

TestStack.BDDfy/BDDfyExtensions.cs

@@ -49,30 +49,21 @@ static Engine InternalLazyBDDfy(
             string storyCategory,
             Type explicitStoryType = null)
         {
-            var storyScanner = GetFluentScanner(testObject, scenarioTitle, explicitStoryType) ?? GetReflectiveScanner(testObject, scenarioTitle, explicitStoryType);
+            var testContext = TestContext.GetContext(testObject);
+
+            var storyScanner = testContext.FluentScanner != null ?
+                testContext.FluentScanner.GetScanner(scenarioTitle, explicitStoryType) :
+                GetReflectiveScanner(testContext, scenarioTitle, explicitStoryType);
 
             return new Engine(storyCategory, storyScanner);
         }
 
-        static IScanner GetReflectiveScanner(object testObject, string scenarioTitle = null, Type explicitStoryType = null)
+        static IScanner GetReflectiveScanner(ITestContext testContext, string scenarioTitle = null, Type explicitStoryType = null)
         {
-            var testContext = TestContext.GetContext(testObject);
             var stepScanners = Configurator.Scanners.GetStepScanners(testContext).ToArray();
             var reflectiveScenarioScanner = new ReflectiveScenarioScanner(scenarioTitle, stepScanners);
 
             return new DefaultScanner(testContext, reflectiveScenarioScanner, explicitStoryType);
         }
-
-        static IScanner GetFluentScanner(object testObject, string scenarioTitle, Type explicitStoryType)
-        {
-            IScanner scanner = null;
-
-            var fluentScanner = testObject as IFluentScanner;
-
-            if (fluentScanner != null)
-                scanner = fluentScanner.GetScanner(scenarioTitle, explicitStoryType);
-
-            return scanner;
-        }
     }
 }

TestStack.BDDfy/ExecutionOrder.cs

@@ -9,6 +9,7 @@ public enum ExecutionOrder
         ConsecutiveTransition = 5,
         Assertion = 6,
         ConsecutiveAssertion = 7,
-        TearDown = 8
+        TearDown = 8,
+        ConsecutiveStep
     }
 }

TestStack.BDDfy/ITestContext.cs

@@ -4,5 +4,6 @@ public interface ITestContext
     {
         object TestObject { get; }
         ExampleTable Examples { get; set; }
+        IFluentScanner FluentScanner { get; set; }
     }
 }

TestStack.BDDfy/Processors/StoryCache.cs

@@ -15,6 +15,7 @@ public void Process(Story story)
         {
             foreach (var scenario in story.Scenarios)
             {
+                TestContext.ClearContextFor(scenario.TestObject);
                 scenario.TestObject = null;
                 foreach (var step in scenario.Steps)
                     step.Action = null;