got existing tests passing with ReportModel

Author: mwhelan

TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.cs

@@ -12,7 +12,7 @@ public class ClassicReportBuilderTests
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ShouldProduceExpectedHtml()
         {
-            Func<FileReportModel> model = () =>
+            var model = 
                 new HtmlReportModel(new ReportTestData().CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMilliseconds()
                     .ToReportModel())
                     {
@@ -27,12 +27,11 @@ public void ShouldProduceExpectedHtml()
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ShouldProduceExpectedHtmlWithExamples()
         {
-            Func<FileReportModel> model = () => 
-                new HtmlReportModel(new ReportTestData().CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMillisecondsAndEachHasTwoExamples()
-                    .ToReportModel())
-                    {
-                        RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
-                    };
+            var reportData = new ReportTestData().CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMillisecondsAndEachHasTwoExamples().ToReportModel();
+            var model = new HtmlReportModel(reportData)
+            {
+                RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
+            };
 
             var sut = new ClassicReportBuilder();
             ReportApprover.Approve(model, sut);

TestStack.BDDfy.Tests/Reporters/Html/MetroReportBuilderTests.cs

@@ -12,7 +12,7 @@ public class MetroReportBuilderTests
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ShouldProduceExpectedHtml()
         {
-            Func<FileReportModel> model = () => 
+            var model = 
                 new HtmlReportModel(new ReportTestData().CreateMixContainingEachTypeOfOutcome().ToReportModel())
                     {
                         RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
@@ -26,7 +26,7 @@ public void ShouldProduceExpectedHtml()
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ShouldProduceExpectedHtmlWithExamples()
         {
-            Func<FileReportModel> model = () =>
+            var model = 
                 new HtmlReportModel(new ReportTestData().CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMillisecondsAndEachHasTwoExamples()
                     .ToReportModel())
                 {

TestStack.BDDfy.Tests/Reporters/MarkDown/MarkDownReportBuilderTests.cs

@@ -12,7 +12,7 @@ public class MarkDownReportBuilderTests
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ShouldProduceExpectedMarkdown()
         {
-            Func<FileReportModel> model = () => new FileReportModel(new ReportTestData().CreateMixContainingEachTypeOfOutcome().ToReportModel());
+            var model = new FileReportModel(new ReportTestData().CreateMixContainingEachTypeOfOutcome().ToReportModel());
             var sut = new MarkDownReportBuilder();
             ReportApprover.Approve(model, sut);
         }
@@ -21,7 +21,7 @@ public void ShouldProduceExpectedMarkdown()
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ShouldProduceExpectedMarkdownWithExamples()
         {
-            Func<FileReportModel> model = () =>
+            var model = 
                 new FileReportModel(new ReportTestData().CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMillisecondsAndEachHasTwoExamples()
                     .ToReportModel())
                 {

TestStack.BDDfy.Tests/Reporters/ReportApprover.cs

@@ -9,12 +9,12 @@ namespace TestStack.BDDfy.Tests.Reporters
 {
     class ReportApprover
     {
-        public static void Approve(Func<FileReportModel> model, IReportBuilder reportBuilder)
+        public static void Approve(FileReportModel model, IReportBuilder reportBuilder)
         {
             // setting the culture to make sure the date is formatted the same on all machines
             using (new TemporaryCulture("en-GB"))
             {
-                var result = reportBuilder.CreateReport(model());
+                var result = reportBuilder.CreateReport(model);
                 Approvals.Verify(result, s => Scrub(StackTraceScrubber.ScrubLineNumbers(StackTraceScrubber.ScrubPaths(s))));
             }
         }

TestStack.BDDfy.Tests/TagsTests.cs

@@ -29,13 +29,9 @@ public void TagsAreReportedInTextReport()
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void TagsAreReportedInHtmlReport()
         {
-            var story = this.Given(_ => GivenAStep())
-                .WithTags("Tag1", "Tag 2")
-                .BDDfy();
-            Func<FileReportModel> model = () => new HtmlReportModel(new[] { story }.ToReportModel())
-                {
-                    RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
-                };
+            var model = new HtmlReportModel(this.CreateReportModel())            {
+                RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
+            };
 
             var sut = new ClassicReportBuilder();
             ReportApprover.Approve(model, sut);
@@ -45,13 +41,11 @@ public void TagsAreReportedInHtmlReport()
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void TagsAreReportedInMetroHtmlReport()
         {
-            var story = this.Given(_ => GivenAStep())
-                .WithTags("Tag1", "Tag 2")
-                .BDDfy();
-            Func<FileReportModel> model = () => new HtmlReportModel(new[] { story }.ToReportModel())
-                {
-                    RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
-                };
+            var reportModel = this.CreateReportModel();
+            var model = new HtmlReportModel(reportModel)
+            {
+                RunDate = new DateTime(2014, 3, 25, 11, 30, 5)
+            };
 
             var sut = new MetroReportBuilder();
             ReportApprover.Approve(model, sut);
@@ -61,10 +55,8 @@ public void TagsAreReportedInMetroHtmlReport()
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void TagsAreReportedInMarkdownReport()
         {
-            var story = this.Given(_ => GivenAStep())
-                .WithTags("Tag1", "Tag 2")
-                .BDDfy();
-            Func<FileReportModel> model = () => new FileReportModel(new[] { story }.ToReportModel());
+            var reportModel = this.CreateReportModel();
+            var model = new FileReportModel(reportModel);
             var sut = new MarkDownReportBuilder();
             ReportApprover.Approve(model, sut);
         }
@@ -73,5 +65,14 @@ private void GivenAStep()
         {
 
         }
+
+        private ReportModel CreateReportModel()
+        {
+            var story = this.Given(_ => GivenAStep())
+                .WithTags("Tag1", "Tag 2")
+                .BDDfy();
+            var reportModel = new[] { story }.ToReportModel();
+            return reportModel;
+        }
     }
 }

TestStack.BDDfy/Reporters/Class1.cs

@@ -35,9 +35,12 @@ group story by story.Metadata.Type.Name into g
 
                 var aggregatedStories =
                     from story in groupedByStories.Union(groupedByNamespace)
-                    select new ReportModel.Story() // order scenarios by title
+                    select new ReportModel.Story() 
                         {
-                            Namespace = story.Key
+                            Metadata = story.First().Metadata,
+                            Namespace = story.Key,
+                            Result = story.First().Result,
+                            Scenarios = story.SelectMany(s => s.Scenarios).OrderBy(s => s.Title).ToList() // order scenarios by title,
                         };
 
                 return aggregatedStories;