Skip to content

Commit

Permalink
Merge current state (2.11.1) into master.
Browse files Browse the repository at this point in the history
  • Loading branch information
Dirk Rombauts committed Dec 21, 2016
2 parents 8881f20 + a8adfab commit 182341f
Show file tree
Hide file tree
Showing 112 changed files with 752 additions and 386 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,26 @@ 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.11.1] - 2016-12-16

### Fixed

- Enable Pickles to deal with ignored scenario examples in VsTest Result Provider ([340](https://github.com/picklesdoc/pickles/pull/340)) (by [@dirkrombauts](https://github.com/dirkrombauts))
- Enable xUnit Test Result Provider to Deal with more than 255 Scenarios in a File ([405](https://github.com/picklesdoc/pickles/pull/405)) (by [@dirkrombauts](https://github.com/dirkrombauts))

## [2.11.0] - 2016-12-05

### Changed

- Enable xUnit Test Result Provider to Deal with more than 255 Scenarios in a File ([397](https://github.com/picklesdoc/pickles/pull/397)) (by [@eugene-sea](https://github.com/eugene-sea))
- Several external libraries were update to their newest versions ([394](https://github.com/picklesdoc/pickles/pull/394)) (by [@dirkrombauts](https://github.com/dirkrombauts))

### Fixed

- Null reference error when running with MsTest trx results file ([356](https://github.com/picklesdoc/pickles/issues/356)) (by [@dirkrombauts](https://github.com/dirkrombauts))
- Test result file is read as null in CucumberJson when elements is missing ([390](https://github.com/picklesdoc/pickles/issues/390)) (by [@dirkrombauts](https://github.com/dirkrombauts))
- DHTML version sorts features and folders in descending order ([383](https://github.com/picklesdoc/pickles/issues/383)) (by [@aquilanl](https://github.com/aquilanl))

## [2.10.0] - 2016-10-22

### Changed
Expand Down
2 changes: 1 addition & 1 deletion build.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@echo off
set "picklesVersion=2.10.0"
set "picklesVersion=2.11.1"

cls

Expand Down
2 changes: 0 additions & 2 deletions docs/Output/Dhtml/Index.html
Original file line number Diff line number Diff line change
Expand Up @@ -490,8 +490,6 @@ <h4 class="modal-title">Scenario Link</h4>
}

function jsonPWrapper(data) {
data.Features.reverse();

var viewModel = new window.ViewModel(data.Features, data.Configuration, data.Summary);
viewModel.setCurrentFeature();

Expand Down
121 changes: 93 additions & 28 deletions docs/Output/Dhtml/pickledFeatures.js
Original file line number Diff line number Diff line change
Expand Up @@ -1745,13 +1745,6 @@ jsonPWrapper ({
"StepComments": [],
"AfterLastStepComments": []
},
{
"Keyword": "And",
"NativeKeyword": "And ",
"Name": "also this step",
"StepComments": [],
"AfterLastStepComments": []
},
{
"Keyword": "When",
"NativeKeyword": "Als ",
Expand All @@ -1765,20 +1758,6 @@ jsonPWrapper ({
"Name": "moet het resultaat 120 zijn",
"StepComments": [],
"AfterLastStepComments": []
},
{
"Keyword": "And",
"NativeKeyword": "And ",
"Name": "that the number 4 is even",
"StepComments": [],
"AfterLastStepComments": []
},
{
"Keyword": "But",
"NativeKeyword": "But ",
"Name": "the number 3 is odd",
"StepComments": [],
"AfterLastStepComments": []
}
],
"Tags": [],
Expand Down Expand Up @@ -2077,7 +2056,25 @@ jsonPWrapper ({
"WasExecuted": false,
"WasSuccessful": false
}
},
}
],
"Result": {
"WasExecuted": false,
"WasSuccessful": false
},
"Tags": []
},
"Result": {
"WasExecuted": false,
"WasSuccessful": false
}
},
{
"RelativeFolder": "Features\\09CallingStepsFromSteps\\CallingStepsFromSteps.feature",
"Feature": {
"Name": "Calling Steps from StepDefinitions",
"Description": "In order to create steps of a higher abstraction \r\nAs a SpecFlow evangelist \r\nI want reuse other steps in my step definitions",
"FeatureElements": [
{
"Name": "Feature with multiple contexts",
"Slug": "feature-with-multiple-contexts",
Expand Down Expand Up @@ -2136,7 +2133,25 @@ jsonPWrapper ({
"WasExecuted": false,
"WasSuccessful": false
}
},
}
],
"Result": {
"WasExecuted": false,
"WasSuccessful": false
},
"Tags": []
},
"Result": {
"WasExecuted": false,
"WasSuccessful": false
}
},
{
"RelativeFolder": "Features\\10StepTransformation\\StepTransformation.feature",
"Feature": {
"Name": "Step Argument Transformations",
"Description": "In order to reduce the amount of code and repetitive tasks in my steps \r\nAs a SpecFlow evanglist \r\nI want to define reusable transformations for my step arguments",
"FeatureElements": [
{
"Name": "Feature with a dependent context",
"Slug": "feature-with-a-dependent-context",
Expand Down Expand Up @@ -2320,6 +2335,13 @@ jsonPWrapper ({
"Name": "that",
"StepComments": [],
"AfterLastStepComments": []
},
{
"Keyword": "And",
"NativeKeyword": "And ",
"Name": "its sub-context is set",
"StepComments": [],
"AfterLastStepComments": []
}
],
"Tags": [],
Expand Down Expand Up @@ -2364,6 +2386,13 @@ jsonPWrapper ({
"Name": "that: <test2>",
"StepComments": [],
"AfterLastStepComments": []
},
{
"Keyword": "And",
"NativeKeyword": "And ",
"Name": "the context was created by the feature with a single context scenario",
"StepComments": [],
"AfterLastStepComments": []
}
],
"Tags": [
Expand Down Expand Up @@ -2525,6 +2554,13 @@ jsonPWrapper ({
"StepComments": [],
"AfterLastStepComments": []
},
{
"Keyword": "And",
"NativeKeyword": "And ",
"Name": "I have entered 70 into the calculator",
"StepComments": [],
"AfterLastStepComments": []
},
{
"Keyword": "When",
"NativeKeyword": "When ",
Expand All @@ -2540,7 +2576,9 @@ jsonPWrapper ({
"AfterLastStepComments": []
}
],
"Tags": [],
"Tags": [
"@nestedFolders"
],
"Result": {
"WasExecuted": false,
"WasSuccessful": false
Expand Down Expand Up @@ -2610,7 +2648,25 @@ jsonPWrapper ({
"WasExecuted": false,
"WasSuccessful": false
}
},
}
],
"Result": {
"WasExecuted": false,
"WasSuccessful": false
},
"Tags": []
},
"Result": {
"WasExecuted": false,
"WasSuccessful": false
}
},
{
"RelativeFolder": "Features\\14MarkdownExample\\MarkdownExamples.feature",
"Feature": {
"Name": "Sample Markdown Feature",
"Description": "# Header 1\r\n\r\n## Header 2\r\n\r\n### Header 3\r\n\r\n#### Header 4\r\n\r\n##### Header 5\r\n\r\n###### Header 6\r\n\r\nThis is a *significant* word\r\n\r\n1. Ordered #1\r\n2. Ordered #2\r\n3. Ordered #3\r\n\r\n- Unordered #1\r\n- Unordered #2\r\n- Unordered #3\r\n\r\nHorizontal Rule:\r\n- - -\r\n\r\nTable example:\r\n\r\n| First Header | Second Header |\r\n| ------------- | ------------- |\r\n| Content Cell | Content Cell |\r\n| Content Cell | Content Cell |\r\n\r\n- - -\r\n\r\nIncluding a picture: ![](./image.png)",
"FeatureElements": [
{
"Name": "Subtract two numbers",
"Slug": "subtract-two-numbers",
Expand All @@ -2629,7 +2685,16 @@ jsonPWrapper ({
"Name": "I have entered 70 into the calculator",
"StepComments": [],
"AfterLastStepComments": []
},
}
],
"Tags": [],
"Result": {
"WasExecuted": false,
"WasSuccessful": false
}
},
{
"Examples": [
{
"Keyword": "When",
"NativeKeyword": "When ",
Expand Down Expand Up @@ -3095,7 +3160,7 @@ jsonPWrapper ({
},
"Configuration": {
"SutName": "Pickles",
"SutVersion": "2.10.0",
"GeneratedOn": "22 Oktober 2016 13:32:31"
"SutVersion": "2.11.1",
"GeneratedOn": "16 Dezember 2016 14:57:42"
}
});
Binary file modified docs/Output/Excel/features.xlsx
Binary file not shown.
6 changes: 3 additions & 3 deletions docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ <h2>Using And and But</h2>
</ul>
</div>
<div id="footer">
<p>Test results generated for: Pickles, version 2.10.0</p>
<p>Generated on: 22 Oktober 2016 13:32:26</p>
<p>Produced by Pickles, version 2.10.0.0</p>
<p>Test results generated for: Pickles, version 2.11.1</p>
<p>Generated on: 16 Dezember 2016 14:57:40</p>
<p>Produced by Pickles, version 2.11.1.0</p>
</div>
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/Output/Html/Features/00BasicGherkin/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,9 @@ <h1>00 Basic Gherkin</h1>
</ul>
</div>
<div id="footer">
<p>Test results generated for: Pickles, version 2.10.0</p>
<p>Generated on: 22 Oktober 2016 13:32:26</p>
<p>Produced by Pickles, version 2.10.0.0</p>
<p>Test results generated for: Pickles, version 2.11.1</p>
<p>Generated on: 16 Dezember 2016 14:57:40</p>
<p>Produced by Pickles, version 2.11.1.0</p>
</div>
</div>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,9 @@ <h2>A couple of simple steps</h2>
</ul>
</div>
<div id="footer">
<p>Test results generated for: Pickles, version 2.10.0</p>
<p>Generated on: 22 Oktober 2016 13:32:26</p>
<p>Produced by Pickles, version 2.10.0.0</p>
<p>Test results generated for: Pickles, version 2.11.1</p>
<p>Generated on: 16 Dezember 2016 14:57:40</p>
<p>Produced by Pickles, version 2.11.1.0</p>
</div>
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/Output/Html/Features/01TestRunner/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ <h1>01 Test Runner</h1>
</ul>
</div>
<div id="footer">
<p>Test results generated for: Pickles, version 2.10.0</p>
<p>Generated on: 22 Oktober 2016 13:32:26</p>
<p>Produced by Pickles, version 2.10.0.0</p>
<p>Test results generated for: Pickles, version 2.11.1</p>
<p>Generated on: 16 Dezember 2016 14:57:40</p>
<p>Produced by Pickles, version 2.11.1.0</p>
</div>
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/Output/Html/Features/02TagsAndHooks/Hooks.html
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,9 @@ <h2>Hooking into pre conditions for Steps in SpecFlow</h2>
</ul>
</div>
<div id="footer">
<p>Test results generated for: Pickles, version 2.10.0</p>
<p>Generated on: 22 Oktober 2016 13:32:26</p>
<p>Produced by Pickles, version 2.10.0.0</p>
<p>Test results generated for: Pickles, version 2.11.1</p>
<p>Generated on: 16 Dezember 2016 14:57:40</p>
<p>Produced by Pickles, version 2.11.1.0</p>
</div>
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/Output/Html/Features/02TagsAndHooks/TagDemo.html
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,9 @@ <h2>A scenario with 2 tags</h2>
</ul>
</div>
<div id="footer">
<p>Test results generated for: Pickles, version 2.10.0</p>
<p>Generated on: 22 Oktober 2016 13:32:26</p>
<p>Produced by Pickles, version 2.10.0.0</p>
<p>Test results generated for: Pickles, version 2.11.1</p>
<p>Generated on: 16 Dezember 2016 14:57:40</p>
<p>Produced by Pickles, version 2.11.1.0</p>
</div>
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/Output/Html/Features/02TagsAndHooks/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,9 @@ <h1>02 Tags And Hooks</h1>
</ul>
</div>
<div id="footer">
<p>Test results generated for: Pickles, version 2.10.0</p>
<p>Generated on: 22 Oktober 2016 13:32:26</p>
<p>Produced by Pickles, version 2.10.0.0</p>
<p>Test results generated for: Pickles, version 2.11.1</p>
<p>Generated on: 16 Dezember 2016 14:57:40</p>
<p>Produced by Pickles, version 2.11.1.0</p>
</div>
</div>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,9 @@ <h2>Pending step</h2>
</ul>
</div>
<div id="footer">
<p>Test results generated for: Pickles, version 2.10.0</p>
<p>Generated on: 22 Oktober 2016 13:32:26</p>
<p>Produced by Pickles, version 2.10.0.0</p>
<p>Test results generated for: Pickles, version 2.11.1</p>
<p>Generated on: 16 Dezember 2016 14:57:41</p>
<p>Produced by Pickles, version 2.11.1.0</p>
</div>
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/Output/Html/Features/031ScenarioContext/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ <h1>031 Scenario Context</h1>
</ul>
</div>
<div id="footer">
<p>Test results generated for: Pickles, version 2.10.0</p>
<p>Generated on: 22 Oktober 2016 13:32:26</p>
<p>Produced by Pickles, version 2.10.0.0</p>
<p>Test results generated for: Pickles, version 2.11.1</p>
<p>Generated on: 16 Dezember 2016 14:57:41</p>
<p>Produced by Pickles, version 2.11.1.0</p>
</div>
</div>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,9 @@ <h2>Showing information of the feature</h2>
</ul>
</div>
<div id="footer">
<p>Test results generated for: Pickles, version 2.10.0</p>
<p>Generated on: 22 Oktober 2016 13:32:26</p>
<p>Produced by Pickles, version 2.10.0.0</p>
<p>Test results generated for: Pickles, version 2.11.1</p>
<p>Generated on: 16 Dezember 2016 14:57:41</p>
<p>Produced by Pickles, version 2.11.1.0</p>
</div>
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/Output/Html/Features/032FeatureContext/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ <h1>032 Feature Context</h1>
</ul>
</div>
<div id="footer">
<p>Test results generated for: Pickles, version 2.10.0</p>
<p>Generated on: 22 Oktober 2016 13:32:26</p>
<p>Produced by Pickles, version 2.10.0.0</p>
<p>Test results generated for: Pickles, version 2.11.1</p>
<p>Generated on: 16 Dezember 2016 14:57:41</p>
<p>Produced by Pickles, version 2.11.1.0</p>
</div>
</div>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -432,9 +432,9 @@ <h3>Examples: more than 100</h3>
</ul>
</div>
<div id="footer">
<p>Test results generated for: Pickles, version 2.10.0</p>
<p>Generated on: 22 Oktober 2016 13:32:26</p>
<p>Produced by Pickles, version 2.10.0.0</p>
<p>Test results generated for: Pickles, version 2.11.1</p>
<p>Generated on: 16 Dezember 2016 14:57:41</p>
<p>Produced by Pickles, version 2.11.1.0</p>
</div>
</div>
</body>
Expand Down
Loading

0 comments on commit 182341f

Please sign in to comment.