Merge branch 'master' into release

CHANGELOG.md

@@ -12,6 +12,17 @@ This project adheres to [Semantic Versioning](http://semver.org). We consider th
 
 This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).
 
+## [Unreleased]
+
+## [2.2.1] - 2016-01-25
+
+### Changed
+
+- The .nuspec files now contain a releaseNotes elements that points to this file on GitHub.
+
+### Fixed
+
+- xUnit1 and xUnit2: Failure when tests are included that don't have traits ([#268](https://github.com/picklesdoc/pickles/issues/268)) (by [@dirkrombauts](https://github.com/dirkrombauts)).
 
 ## [2.2.0] - 2016-01-15
 

DeployOutput.cmd

@@ -3,7 +3,8 @@
 cd ..\picklesdoc.github.com
 rmdir Output /s /q
 echo D | xcopy ..\pickles\Output Output /e
-powershell -Command "(gc index_template.md) -replace 'VERSION_PLACEHOLDER', '%1' | Out-File -encoding ASCII index.md"
+powershell -Command "(gc index_template.html) -replace 'VERSION_PLACEHOLDER', '%1' | Out-File -encoding ASCII index.html"
+
 git add -A
 git commit -m "Version %1"
 git push origin master

README.md

@@ -51,5 +51,3 @@ License
 -------
 
 Pickles is licensed with the Apache License, version 2.0.  You can find more information on the license here: http://www.apache.org/licenses/LICENSE-2.0.html
-
-  [1]: https://groups.google.com/forum/?hl=en-GB#!forum/pickles-dev "Pickles Google Group"

build.bat

@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.2.0"
+set "picklesVersion=2.2.1"
 
 cls
 

chocolatey/pickles.nuspec

@@ -33,6 +33,7 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders
         <licenseUrl>http://apache.org/licenses/LICENSE-2.0.html</licenseUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <iconUrl>https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg</iconUrl>
+        <releaseNotes>https://github.com/picklesdoc/pickles/blob/master/CHANGELOG.md</releaseNotes>
     </metadata>
     <files>
         <file src="Autofac.dll" target="tools" />

chocolatey/picklesui.nuspec

@@ -33,6 +33,7 @@ Optionally, *Pickles* can **integrate test results**, so that your stakeholders
         <licenseUrl>http://apache.org/licenses/LICENSE-2.0.html</licenseUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <iconUrl>https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg</iconUrl>
+        <releaseNotes>https://github.com/picklesdoc/pickles/blob/master/CHANGELOG.md</releaseNotes>
     </metadata>
     <files>
         <file src="Autofac.dll" target="tools" />

src/Pickles/Pickles.CommandLine/Pickles.CommandLine.nuspec

@@ -34,6 +34,7 @@
     <copyright>Copyright © 2010-2012 Jeffrey Cameron, Copyright © 2013-present PicklesDoc and contributors</copyright>
     <tags>SpecificationByExample BDD SpecFlow Gherkin Cucumber SpecByEx LivingDocumentation Documentation</tags>
     <iconUrl>https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg</iconUrl>
+    <releaseNotes>https://github.com/picklesdoc/pickles/blob/master/CHANGELOG.md</releaseNotes>
   </metadata>
   <files>
     <file src="Autofac.dll" target="tools" />

src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec

@@ -34,6 +34,7 @@
     <copyright>Copyright © 2010-2012 Jeffrey Cameron, Copyright © 2013-present PicklesDoc and contributors</copyright>
     <tags>SpecificationByExample BDD SpecFlow Gherkin Cucumber SpecByEx LivingDocumentation Documentation</tags>
     <iconUrl>https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg</iconUrl>
+    <releaseNotes>https://github.com/picklesdoc/pickles/blob/master/CHANGELOG.md</releaseNotes>
   </metadata>
   <files>
     <file src="Autofac.dll" target="tools" />

src/Pickles/Pickles.PowerShell/Pickles.nuspec

@@ -34,6 +34,7 @@
     <copyright>Copyright © 2010-2012 Jeffrey Cameron, Copyright © 2013-present PicklesDoc and contributors</copyright>
     <tags>SpecificationByExample BDD SpecFlow Gherkin Cucumber SpecByEx LivingDocumentation Documentation</tags>
     <iconUrl>https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg</iconUrl>
+    <releaseNotes>https://github.com/picklesdoc/pickles/blob/master/CHANGELOG.md</releaseNotes>
   </metadata>
   <files>
     <file src="Autofac.dll" target="tools" />

src/Pickles/Pickles.Test/Pickles.Test.csproj

@@ -163,7 +163,6 @@
     <Compile Include="WhenCrawlingFoldersForFeatures.cs" />
     <Compile Include="Formatters\TableOfContentsShouldBeCreatedFromAFolderStructure.cs" />
     <Compile Include="ParserFileFactory.cs" />
-    <Compile Include="ParserTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WhenDeterminingRelevantFilesToConsider.cs" />
     <Compile Include="DocumentationBuilders\HTML\WhenFormattingFeatures.cs" />

src/Pickles/Pickles.TestFrameworks.UnitTests/MsTest/WhenParsingMsTestResultsFileWithMissingTraits.cs

@@ -0,0 +1,51 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="WhenParsingMsTestResultsFileWithMissingTraits.cs" company="PicklesDoc">
+//  Copyright 2011 Jeffrey Cameron
+//  Copyright 2012-present PicklesDoc team and community contributors
+//
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+using System;
+
+using NFluent;
+
+using NUnit.Framework;
+
+using PicklesDoc.Pickles.ObjectModel;
+using PicklesDoc.Pickles.TestFrameworks.MsTest;
+
+namespace PicklesDoc.Pickles.TestFrameworks.UnitTests.MsTest
+{
+    [TestFixture]
+    public class WhenParsingMsTestResultsFileWithMissingTraits : WhenParsingTestResultFiles<MsTestResults>
+    {
+        public WhenParsingMsTestResultsFileWithMissingTraits()
+            : base("MsTest." + "results-example-mstest-missingTraits.trx")
+        {
+        }
+
+        [Test]
+        public void ThenCanReadFeatureResultWithoutThrowingException()
+        {
+            // Write out the embedded test results file
+            var results = ParseResultsFile();
+
+            var feature = new Feature { Name = "Addition" };
+
+            Check.ThatCode(() => results.GetFeatureResult(feature)).DoesNotThrow();
+        }
+    }
+}

src/Pickles/Pickles.TestFrameworks.UnitTests/MsTest/results-example-mstest-missingTraits.trx

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestRun id="bd2199af-fffc-498a-a77a-df16b4fc9f5a" name="Dirk@SHUTTLEPC 2016-01-21 12:56:08" runUser="SHUTTLEPC\Dirk" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <TestSettings name="TestSettings" id="3d90c4f8-ccdc-4663-bad3-9f4c55f42318">
+    <Description>These are default test settings for a local test run.</Description>
+    <Deployment userDeploymentRoot="C:\Dev\Code\GitHub\DirkRombauts\pickles-testresults" useDefaultDeploymentRoot="false" enabled="false" runDeploymentRoot="Dirk_SHUTTLEPC 2016-01-21 12_56_08" />
+    <Execution>
+      <TestTypeSpecific />
+      <AgentRule name="Execution Agents">
+      </AgentRule>
+    </Execution>
+    <Properties />
+  </TestSettings>
+  <Times creation="2016-01-21T12:56:08.4275455+01:00" queuing="2016-01-21T12:56:08.8135477+01:00" start="2016-01-21T12:56:08.9305884+01:00" finish="2016-01-21T12:56:09.6403444+01:00" />
+  <ResultSummary outcome="Failed">
+    <Counters total="32" executed="32" passed="18" error="0" failed="5" timeout="0" aborted="0" inconclusive="9" passedButRunAborted="0" notRunnable="0" notExecuted="0" disconnected="0" warning="0" completed="0" inProgress="0" pending="0" />
+  </ResultSummary>
+  <TestDefinitions>
+    <UnitTest name="ThisTestPasses" storage="c:\dev\code\github\dirkrombauts\pickles-testresults\\testharness\mstest\bin\debug\mstestharness.dll" id="4564a8b6-0c8b-7bc1-9ad6-ad8ca619bfd2">
+      <Execution id="f39b7193-2e4b-4de2-add4-f2bd673c9687" />
+      <TestMethod codeBase="C:/Dev/Code/GitHub/DirkRombauts/pickles-testresults/TestHarness/mstest/bin/Debug/MsTestHarness.DLL" adapterTypeName="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestAdapter, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Adapter, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" className="Pickles.TestHarness.MsTest.RegularUnitTest, MsTestHarness, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="ThisTestPasses" />
+    </UnitTest>
+  </TestDefinitions>
+  <TestLists>
+    <TestList name="Results Not in a List" id="8c84fa94-04c1-424b-9868-57a2d4851a1d" />
+    <TestList name="All Loaded Results" id="19431567-8539-422a-85d7-44ee4e166bda" />
+  </TestLists>
+  <TestEntries>
+    <TestEntry testId="4564a8b6-0c8b-7bc1-9ad6-ad8ca619bfd2" executionId="f39b7193-2e4b-4de2-add4-f2bd673c9687" testListId="8c84fa94-04c1-424b-9868-57a2d4851a1d" />
+  </TestEntries>
+  <Results>
+    <UnitTestResult executionId="f39b7193-2e4b-4de2-add4-f2bd673c9687" testId="4564a8b6-0c8b-7bc1-9ad6-ad8ca619bfd2" testName="ThisTestPasses" computerName="SHUTTLEPC" duration="00:00:00.0001821" startTime="2016-01-21T12:56:09.4739277+01:00" endTime="2016-01-21T12:56:09.4769212+01:00" testType="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b" outcome="Passed" testListId="8c84fa94-04c1-424b-9868-57a2d4851a1d" relativeResultsDirectory="f39b7193-2e4b-4de2-add4-f2bd673c9687">
+    </UnitTestResult>
+  </Results>
+</TestRun>