Merge branch 'develop'

picklesdoc · Feb 10, 2017 · ff4d5dc · ff4d5dc
2 parents b8d52bf + f69771d
commit ff4d5dc
Show file tree

Hide file tree

Showing 160 changed files with 3,434 additions and 2,565 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,16 @@ Features in Experimental are subject to change and removal without being conside
 
 This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).
 
+## [2.13.0] - 2017-02-10
+
+### Added
+
+- Improved Tag Support: Tags in Excel and Tags for Examples Blocks in Json, Dhtml, Html, and Word formats ([424](https://github.com/picklesdoc/pickles/pull/424)) (by [@pleveill](https://github.com/pleveill))
+
+### Fixed
+
+- Fix problem of NUnit 3.6 and truncation ([425](https://github.com/picklesdoc/pickles/pull/425)) (by [@dirkrombauts](https://github.com/dirkrombauts))
+
 ## [2.12.0] - 2017-01-26
 
 ### Added

diff --git a/CreateTestresults.cmd b/CreateTestresults.cmd
@@ -4,9 +4,9 @@
 ECHO Remember to build the solution first!
 
 "%~dp0\test-harness\packages\NUnit.Runners.2.6.4\tools\nunit-console.exe" "%~dp0\test-harness\nunit\bin\Debug\nunitHarness.dll" /result="%~dp0\results-example-nunit.xml"
-"%~dp0\test-harness\packages\NUnit.Console.3.0.0\tools\nunit3-console.exe" "%~dp0\test-harness\nunit\bin\Debug\nunitHarness.dll" /result="%~dp0\results-example-nunit2-with-nunit3-runner.xml"
+"%~dp0\test-harness\packages\NUnit.ConsoleRunner.3.6.0\tools\nunit3-console.exe" "%~dp0\test-harness\nunit\bin\Debug\nunitHarness.dll" /result="%~dp0\results-example-nunit2-with-nunit3-runner.xml"
 
-"%~dp0\test-harness\packages\NUnit.Console.3.0.0\tools\nunit3-console.exe" "%~dp0\test-harness\nunit3\bin\Debug\nunit3Harness.dll" /result="%~dp0\results-example-nunit3.xml"
+"%~dp0\test-harness\packages\NUnit.ConsoleRunner.3.6.0\tools\nunit3-console.exe" "%~dp0\test-harness\nunit3\bin\Debug\nunit3Harness.dll" /result="%~dp0\results-example-nunit3.xml"
 
 "%~dp0\test-harness\packages\SpecRun.Runner.1.2.0\tools\specrun.exe" run default.srprofile "/baseFolder:%~dp0\test-harness\SpecRun\bin\Debug" /log:specrun.log /report:"%~dp0\results-example-specrun.html"
 
@@ -29,15 +29,25 @@ rmdir /s /q "%~dp0\TestResults\"
 "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe" "%~dp0\test-harness\mstest\bin\Debug\mstestHarness.dll" /logger:trx
 FOR /R "%~dp0\TestResults\" %%G IN (*.trx) DO move "%%G" "%~dp0\results-example-vstest.trx"
 
+ECHO Moving NUnit 2 results
 move "%~dp0\results-example-nunit.xml" "%~dp0\src\Pickles\Pickles.TestFrameworks.UnitTests\NUnit\NUnit2\"
+ECHO Moving NUnit 2 with NUnit3 runner results
 move "%~dp0\results-example-nunit2-with-nunit3-runner.xml" "%~dp0\src\Pickles\Pickles.TestFrameworks.UnitTests\NUnit\NUnit3\"
+ECHO Moving NUnit 3 results
 move "%~dp0\results-example-nunit3.xml" "%~dp0\src\Pickles\Pickles.TestFrameworks.UnitTests\NUnit\NUnit3\"
+ECHO Moving XUnit 1 results
 move "%~dp0\results-example-xunit.xml" "%~dp0\src\Pickles\Pickles.TestFrameworks.UnitTests\XUnit\XUnit1\"
+ECHO Moving XUnit 2 results
 move "%~dp0\results-example-xunit2.xml" "%~dp0\src\Pickles\Pickles.TestFrameworks.UnitTests\XUnit\XUnit2\"
+ECHO Moving SpecRun results
 move "%~dp0\results-example-specrun.html" "%~dp0\src\Pickles\Pickles.TestFrameworks.UnitTests\SpecRun\"
+ECHO Moving Cucumber JSON results
 move "%~dp0\results-example-json.json" "%~dp0\src\Pickles\Pickles.TestFrameworks.UnitTests\CucumberJSON\"
+ECHO Moving MSTest results
 move "%~dp0\results-example-mstest.trx" "%~dp0\src\Pickles\Pickles.TestFrameworks.UnitTests\MsTest\"
+ECHO Moving CucumberJS JSON results
 move "%~dp0\results-example-cucumberjs-json.json" "%~dp0\src\Pickles\Pickles.TestFrameworks.UnitTests\CucumberJSON\"
+ECHO Moving VSTest results
 move "%~dp0\results-example-vstest.trx" "%~dp0\src\Pickles\Pickles.TestFrameworks.UnitTests\VsTest\"
 
 @popd
diff --git a/build.bat b/build.bat
@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.12.0"
+set "picklesVersion=2.13.0"
 
 cls
 

diff --git a/docs/Output/Cucumber/cucumberResult.json b/docs/Output/Cucumber/cucumberResult.json
@@ -576,14 +576,14 @@
       {
         "keyword": "Scenario Outline",
         "name": "Add two negative numbers with many examples",
-        "line": 26,
+        "line": 28,
         "type": "scenario_outline",
         "tags": [],
         "steps": [
           {
             "keyword": "Given",
             "name": "I enter <number 1> into the calculator",
-            "line": 27,
+            "line": 29,
             "result": {
               "status": "inconclusive",
               "duration": 1
@@ -592,7 +592,7 @@
           {
             "keyword": "And",
             "name": "I enter <number 2> into the calculator",
-            "line": 28,
+            "line": 30,
             "result": {
               "status": "inconclusive",
               "duration": 1
@@ -601,7 +601,7 @@
           {
             "keyword": "When",
             "name": "I perform add",
-            "line": 29,
+            "line": 31,
             "result": {
               "status": "inconclusive",
               "duration": 1
@@ -610,7 +610,7 @@
           {
             "keyword": "Then",
             "name": "the result should be <result>",
-            "line": 30,
+            "line": 32,
             "result": {
               "status": "inconclusive",
               "duration": 1