Merge branch 'master' into release

picklesdoc · May 14, 2014 · cae8dc3 · cae8dc3
2 parents 867d872 + 49f49ca
commit cae8dc3
Show file tree

Hide file tree

Showing 135 changed files with 1,865 additions and 1,332 deletions.
diff --git a/project.build b/project.build
@@ -4,7 +4,7 @@
 
   <!-- set the major and minor version number here -->
   <property name="version.major" value="0" />
-  <property name="version.minor" value="15" />
+  <property name="version.minor" value="16" />
   <property name="version.revision" value="0" />
 
   <!-- set build number from continuous integration tool -->
@@ -30,7 +30,7 @@
   </ifnot>
 
   <property name="version" value="${version.major}.${version.minor}.${version.revision}.${build.number}" />
-  <property name="msbuild.dir" value="C:\Windows\Microsoft.NET\Framework\v4.0.30319" />
+  <property name="msbuild.dir" value="${environment::get-variable('ProgramFiles(x86)')}\MSBuild\12.0\Bin" />
   <property name="ilmerge.dir" value="${environment::get-variable('ProgramFiles')}\Microsoft\ILMerge" />
   <property name="nuget.dir" value="src\Pickles\packages\NuGet.CommandLine.2.8.0\tools" />
   <property name="framework.dir" value="${msbuild.dir}" />

diff --git a/src/Pickles/.nuget/packages.config b/src/Pickles/.nuget/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NuGet.CommandLine" version="2.8.0" />
+  <package id="NuGet.CommandLine" version="2.8.1" />
   <package id="NUnit.Runners" version="2.6.3" />
 </packages>
diff --git a/src/Pickles/Pickles.BaseDhtmlFiles/js/Markdown.Converter.js b/src/Pickles/Pickles.BaseDhtmlFiles/js/Markdown.Converter.js
@@ -974,7 +974,7 @@ else
             // attacklab: sentinel workarounds for lack of \A and \Z, safari\khtml bug
             text += "~0";
 
-            text = text.replace(/(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g,
+            text = text.replace(/(?:\n\n|^)((?:(?:[ ]{0}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g,
                 function (wholeMatch, m1, m2) {
                     var codeblock = m1;
                     var nextChar = m2;

diff --git a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.csproj
@@ -51,9 +51,9 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=1.4.0.83, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
+    <Reference Include="System.IO.Abstractions, Version=1.4.0.86, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\System.IO.Abstractions.1.4.0.83\lib\net35\System.IO.Abstractions.dll</HintPath>
+      <HintPath>..\packages\System.IO.Abstractions.1.4.0.86\lib\net35\System.IO.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

diff --git a/src/Pickles/Pickles.CommandLine/packages.config b/src/Pickles/Pickles.CommandLine/packages.config
@@ -5,5 +5,5 @@
   <package id="NLog" version="2.1.0" targetFramework="net35" />
   <package id="NLog.Config" version="2.1.0" targetFramework="net35" />
   <package id="NLog.Schema" version="2.1.0" targetFramework="net35" />
-  <package id="System.IO.Abstractions" version="1.4.0.83" targetFramework="net35" />
+  <package id="System.IO.Abstractions" version="1.4.0.86" targetFramework="net35" />
 </packages>
diff --git a/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.csproj b/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.csproj
@@ -43,9 +43,9 @@
     <Reference Include="Microsoft.Build.Utilities.v3.5" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=1.4.0.83, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
+    <Reference Include="System.IO.Abstractions, Version=1.4.0.86, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\System.IO.Abstractions.1.4.0.83\lib\net35\System.IO.Abstractions.dll</HintPath>
+      <HintPath>..\packages\System.IO.Abstractions.1.4.0.86\lib\net35\System.IO.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

diff --git a/src/Pickles/Pickles.MSBuild/packages.config b/src/Pickles/Pickles.MSBuild/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="2.6.3.862" targetFramework="net35" />
-  <package id="System.IO.Abstractions" version="1.4.0.83" targetFramework="net35" />
+  <package id="System.IO.Abstractions" version="1.4.0.86" targetFramework="net35" />
 </packages>
diff --git a/src/Pickles/Pickles.NAnt/Pickles.NAnt.csproj b/src/Pickles/Pickles.NAnt/Pickles.NAnt.csproj
@@ -43,9 +43,9 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=1.4.0.83, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
+    <Reference Include="System.IO.Abstractions, Version=1.4.0.86, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\System.IO.Abstractions.1.4.0.83\lib\net35\System.IO.Abstractions.dll</HintPath>
+      <HintPath>..\packages\System.IO.Abstractions.1.4.0.86\lib\net35\System.IO.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

diff --git a/src/Pickles/Pickles.NAnt/packages.config b/src/Pickles/Pickles.NAnt/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="2.6.3.862" targetFramework="net35" />
-  <package id="System.IO.Abstractions" version="1.4.0.83" targetFramework="net35" />
+  <package id="System.IO.Abstractions" version="1.4.0.86" targetFramework="net35" />
 </packages>
diff --git a/src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj b/src/Pickles/Pickles.PowerShell/Pickles.PowerShell.csproj
@@ -40,9 +40,9 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Abstractions, Version=1.4.0.83, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
+    <Reference Include="System.IO.Abstractions, Version=1.4.0.86, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\System.IO.Abstractions.1.4.0.83\lib\net35\System.IO.Abstractions.dll</HintPath>
+      <HintPath>..\packages\System.IO.Abstractions.1.4.0.86\lib\net35\System.IO.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Management.Automation" />

diff --git a/src/Pickles/Pickles.PowerShell/packages.config b/src/Pickles/Pickles.PowerShell/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="2.6.3.862" targetFramework="net35" />
-  <package id="System.IO.Abstractions" version="1.4.0.83" targetFramework="net35" />
+  <package id="System.IO.Abstractions" version="1.4.0.86" targetFramework="net35" />
 </packages>
diff --git a/src/Pickles/Pickles.Test/App.config b/src/Pickles/Pickles.Test/App.config
@@ -15,7 +15,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.Abstractions" publicKeyToken="d480b5b72fb413da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.0.83" newVersion="1.4.0.83" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.0.86" newVersion="1.4.0.86" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="IKVM.OpenJDK.Text" publicKeyToken="13235d27fcbfff58" culture="neutral" />

diff --git a/...Pickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingADocumentStringToAWorksheet.cs b/...Pickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingADocumentStringToAWorksheet.cs
@@ -1,7 +1,6 @@
 using System;
 using ClosedXML.Excel;
 using NUnit.Framework;
-using Autofac;
 using PicklesDoc.Pickles.DocumentationBuilders.Excel;
 using Should;
 
@@ -13,7 +12,7 @@ public class WhenAddingADocumentStringToAWorksheet : BaseFixture
         [Test]
         public void ThenDocumentStringAddedSuccessfully()
         {
-            var excelDocumentStringFormatter = Container.Resolve<ExcelDocumentStringFormatter>();
+            var excelDocumentStringFormatter = new ExcelDocumentStringFormatter();
             string documentString = @"This is an example
 document string for use
 in testing";

diff --git a/src/Pickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingAFeatureToAWorksheet.cs b/src/Pickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingAFeatureToAWorksheet.cs
@@ -3,6 +3,7 @@
 using NUnit.Framework;
 using Autofac;
 using PicklesDoc.Pickles.DocumentationBuilders.Excel;
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 using Should;
 

diff --git a/...ickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingAScenarioOutlineToAWorksheet.cs b/...ickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingAScenarioOutlineToAWorksheet.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using Autofac;
 using PicklesDoc.Pickles.DocumentationBuilders.Excel;
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 using Should;
 

diff --git a/src/Pickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingAScenarioToAWorksheet.cs b/src/Pickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingAScenarioToAWorksheet.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using Autofac;
 using PicklesDoc.Pickles.DocumentationBuilders.Excel;
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 using Should;
 

diff --git a/src/Pickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingAStepToAWorksheet.cs b/src/Pickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingAStepToAWorksheet.cs
@@ -3,6 +3,7 @@
 using NUnit.Framework;
 using Autofac;
 using PicklesDoc.Pickles.DocumentationBuilders.Excel;
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 using Should;
 

diff --git a/...ickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingATableOfContentsToAWorksheet.cs b/...ickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingATableOfContentsToAWorksheet.cs
@@ -1,7 +1,6 @@
 using System;
 using ClosedXML.Excel;
 using NUnit.Framework;
-using Autofac;
 using PicklesDoc.Pickles.DocumentationBuilders.Excel;
 
 namespace PicklesDoc.Pickles.Test.DocumentationBuilders.Excel
@@ -15,7 +14,7 @@ public class WhenAddingATableOfContentsToAWorksheet : BaseFixture
             )]
         public void ThenCanAddTableOfContentsWorksheetSuccessfully()
         {
-            var excelTableOfContentsFormatter = Container.Resolve<ExcelTableOfContentsFormatter>();
+            var excelTableOfContentsFormatter = new ExcelTableOfContentsFormatter();
             using (var workbook = new XLWorkbook())
             {
                 IXLWorksheet worksheet = workbook.AddWorksheet("SHEET1");

diff --git a/src/Pickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingATableToAWorksheet.cs b/src/Pickles/Pickles.Test/DocumentationBuilders/Excel/WhenAddingATableToAWorksheet.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using Autofac;
 using PicklesDoc.Pickles.DocumentationBuilders.Excel;
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 using Should;
 

diff --git a/src/Pickles/Pickles.Test/DocumentationBuilders/Excel/WhenCreatingSheetNamesFromFeatures.cs b/src/Pickles/Pickles.Test/DocumentationBuilders/Excel/WhenCreatingSheetNamesFromFeatures.cs
@@ -3,6 +3,7 @@
 using NUnit.Framework;
 using Autofac;
 using PicklesDoc.Pickles.DocumentationBuilders.Excel;
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 using Should;
 

diff --git a/...Pickles/Pickles.Test/DocumentationBuilders/HTML/AutomationLayer/CurrentScenarioContext.cs b/...Pickles/Pickles.Test/DocumentationBuilders/HTML/AutomationLayer/CurrentScenarioContext.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Xml.Linq;
 using Autofac;
+
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 using TechTalk.SpecFlow;
 

diff --git a/src/Pickles/Pickles.Test/DocumentationBuilders/HTML/AutomationLayer/StepDefinitions.cs b/src/Pickles/Pickles.Test/DocumentationBuilders/HTML/AutomationLayer/StepDefinitions.cs
@@ -2,6 +2,7 @@
 using System.Xml;
 using Autofac;
 using PicklesDoc.Pickles.DocumentationBuilders.HTML;
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 using Should;
 using TechTalk.SpecFlow;

diff --git a/src/Pickles/Pickles.Test/DocumentationBuilders/HTML/WhenFormattingFeatures.cs b/src/Pickles/Pickles.Test/DocumentationBuilders/HTML/WhenFormattingFeatures.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using Autofac;
 using PicklesDoc.Pickles.DocumentationBuilders.HTML;
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 
 namespace PicklesDoc.Pickles.Test.DocumentationBuilders.HTML
@@ -14,9 +15,6 @@ public class WhenFormattingFeatures : BaseFixture
     [Test]
     public void ThenCanFormatDescriptionAsMarkdown()
     {
-      var configuration = Container.Resolve<Configuration>();
-      configuration.TestResultsFiles = null;
-
       var feature = new Feature
       {
         Name = "A feature",
@@ -71,9 +69,6 @@ 2. This is the second reason"
     [Test]
     public void ThenCanFormatMarkdownTableExtensions()
     {
-      var configuration = Container.Resolve<Configuration>();
-      configuration.TestResultsFiles = null;
-
       var feature = new Feature
       {
         Name = "A feature",
@@ -108,9 +103,6 @@ I want to see the descriptions written in markdown rendered with tables
     [Test]
     public void ThenCanFormatMarkdownTableExtensionsEvenIfTheyAreSomewhatMalstructured()
     {
-      var configuration = Container.Resolve<Configuration>();
-      configuration.TestResultsFiles = null;
-
       var feature = new Feature
       {
         Name = "A feature",

diff --git a/src/Pickles/Pickles.Test/DocumentationBuilders/HTML/WhenFormattingScenario.cs b/src/Pickles/Pickles.Test/DocumentationBuilders/HTML/WhenFormattingScenario.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using Autofac;
 using PicklesDoc.Pickles.DocumentationBuilders.HTML;
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 
 namespace PicklesDoc.Pickles.Test.DocumentationBuilders.HTML

diff --git a/src/Pickles/Pickles.Test/DocumentationBuilders/HTML/WhenFormattingScenarioOutlines.cs b/src/Pickles/Pickles.Test/DocumentationBuilders/HTML/WhenFormattingScenarioOutlines.cs
@@ -3,6 +3,7 @@
 using Autofac;
 using NUnit.Framework;
 using PicklesDoc.Pickles.DocumentationBuilders.HTML;
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 using PicklesDoc.Pickles.Test.Extensions;
 

diff --git a/src/Pickles/Pickles.Test/DocumentationBuilders/HTML/WhenFormattingStep.cs b/src/Pickles/Pickles.Test/DocumentationBuilders/HTML/WhenFormattingStep.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using Autofac;
 using PicklesDoc.Pickles.DocumentationBuilders.HTML;
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 
 namespace PicklesDoc.Pickles.Test.DocumentationBuilders.HTML

diff --git a/src/Pickles/Pickles.Test/DocumentationBuilders/HTML/WhenFormattingTables.cs b/src/Pickles/Pickles.Test/DocumentationBuilders/HTML/WhenFormattingTables.cs
@@ -4,6 +4,7 @@
 using Autofac;
 using NUnit.Framework;
 using PicklesDoc.Pickles.DocumentationBuilders.HTML;
+using PicklesDoc.Pickles.ObjectModel;
 using PicklesDoc.Pickles.Parser;
 using Should;
 

diff --git a/src/Pickles/Pickles.Test/FeatureTree/FeatureFileTests.cs b/src/Pickles/Pickles.Test/FeatureTree/FeatureFileTests.cs