Most of the tests are passing for net46 again. Some approval tests failing for reports.

Also removed the resx as I was having issues loading it. Possibly related to aspnet/Tooling#532

Author: JakeGinnivan

src/TestStack.BDDfy.Tests/NetToStringTests.cs

@@ -77,7 +77,7 @@ public void ReportsIllegalExampleStepNames(string stepName, string expectedStepT
                 NetToString.Convert(stepName).ShouldBe(expectedStepTitle, Case.Sensitive);
             });
 
-            exception.ShouldBeNull();
+            exception.ShouldNotBeNull();
             exception.ShouldBeOfType<ArgumentException>();
         }
     }

src/TestStack.BDDfy.Tests/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Xunit;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
@@ -17,3 +17,6 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("1ceb33e8-3aac-4d02-a15b-5b75b5f662ad")]
+
+// BDDfy tests overwrite static configuration for test, cannot use parallel testing
+[assembly: CollectionBehavior(DisableTestParallelization = true)]

src/TestStack.BDDfy.Tests/Reporters/ReportApprover.cs

@@ -16,7 +16,9 @@ public static void Approve(FileReportModel model, IReportBuilder reportBuilder)
             using (new TemporaryCulture("en-GB"))
             {
                 var result = reportBuilder.CreateReport(model);
-                result.ShouldMatchApproved(c => c.WithScrubber(s => StackTraceScrubber.ScrubLineNumbers(StackTraceScrubber.ScrubPaths(s))));
+                result.ShouldMatchApproved(c => c
+                    .WithScrubber(s => StackTraceScrubber.ScrubLineNumbers(StackTraceScrubber.ScrubPaths(s)))
+                    .UseCallerLocation());
             }
         }
 

src/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.xproj

@@ -4,7 +4,6 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>1ceb33e8-3aac-4d02-a15b-5b75b5f662ad</ProjectGuid>
@@ -13,9 +12,11 @@
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>

src/TestStack.BDDfy.Tests/project.json

@@ -4,16 +4,29 @@
 
     "dependencies": {
         "Shouldly": "2.8.0",
-        "dotnet-test-xunit": "1.0.0-rc2-build10025",
+        "dotnet-test-xunit": "1.0.0-rc3-build10019",
         "xunit.core": "2.1.0",
         "TestStack.BDDfy": {
             "target": "project"
         }
     },
 
     "frameworks": {
-        "net451": {
+        //"netcoreapp1.0": {
+        //    "dependencies": {
+        //        "Microsoft.NETCore.App": {
+        //            "type": "platform",
+        //            "version": "1.0.0-rc2-3002702"
+        //        }
+        //    },
+        //    "imports": [
+        //        "dnxcore50",
+        //        "portable-net45+win8"
+        //    ]
+        //},
+        "net46": {
             "dependencies": {
+                "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
                 "NSubstitute": "1.10.0"
             },
             "buildOptions": {
@@ -23,18 +36,6 @@
                     "NSubstitute"
                 ]
             }
-        },
-        "netcoreapp1.0": {
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "type": "platform",
-                    "version": "1.0.0-rc2-3002702"
-                }
-            },
-            "imports": [
-                "dnxcore50",
-                "portable-net45+win8"
-            ]
         }
     }
 }

src/TestStack.BDDfy/Reporters/Html/ClassicReportBuilder.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Text;

src/TestStack.BDDfy/Reporters/Html/HtmlReportResources.Designer.cs

@@ -0,0 +1,34 @@
+using System.IO;
+
+namespace TestStack.BDDfy.Reporters.Html
+{
+    internal class HtmlReportResources
+    {
+        public static string metro_js_min => Read("TestStack.BDDfy.Reporters.Html.Scripts.metro.min.js");
+        public static string metro_css_min => Read("TestStack.BDDfy.Reporters.Html.Scripts.metro.min.css");
+        public static string classic_js_min => Read("TestStack.BDDfy.Reporters.Html.Scripts.classic.min.js");
+        public static string jquery_2_1_0_min => Read("TestStack.BDDfy.Reporters.Html.Scripts.jquery-2.1.0.min.js");
+        public static string classic_css_min => Read("TestStack.BDDfy.Reporters.Html.Scripts.classic.min.css");
+
+        public static string CustomStylesheetComment =>
+            "If you drop a custom stylesheet named BDDfyCustom.css in your output folder" +
+            " it gets embedded here. This way you can apply some custom styles over your" +
+            " html report.";
+
+        public static string CustomJavascriptComment =>
+            "If you drop a custom Javascript named BDDfyCustom.js in your output folder" +
+            " it gets embedded here. This way you can apply some custom Javascript logic" +
+            " to your html report.";
+
+        static string Read(string resourceName)
+        {
+            var assembly = typeof(HtmlReportResources).Assembly();
+
+            using (var stream = assembly.GetManifestResourceStream(resourceName))
+            using (var reader = new StreamReader(stream))
+            {
+                return reader.ReadToEnd();
+            }
+        }
+    }
+}