diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b41a831a..802b17e9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/build.bat b/build.bat
index 50d4fe636..93cae65d0 100644
--- a/build.bat
+++ b/build.bat
@@ -1,5 +1,5 @@
@echo off
-set "picklesVersion=2.10.0"
+set "picklesVersion=2.11.1"
cls
diff --git a/docs/Output/Dhtml/Index.html b/docs/Output/Dhtml/Index.html
index 8a8d98d48..9eaf6cf89 100644
--- a/docs/Output/Dhtml/Index.html
+++ b/docs/Output/Dhtml/Index.html
@@ -490,8 +490,6 @@ Scenario Link
}
function jsonPWrapper(data) {
- data.Features.reverse();
-
var viewModel = new window.ViewModel(data.Features, data.Configuration, data.Summary);
viewModel.setCurrentFeature();
diff --git a/docs/Output/Dhtml/pickledFeatures.js b/docs/Output/Dhtml/pickledFeatures.js
index 38dd41e29..ecce14e82 100644
--- a/docs/Output/Dhtml/pickledFeatures.js
+++ b/docs/Output/Dhtml/pickledFeatures.js
@@ -1745,13 +1745,6 @@ jsonPWrapper ({
"StepComments": [],
"AfterLastStepComments": []
},
- {
- "Keyword": "And",
- "NativeKeyword": "And ",
- "Name": "also this step",
- "StepComments": [],
- "AfterLastStepComments": []
- },
{
"Keyword": "When",
"NativeKeyword": "Als ",
@@ -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": [],
@@ -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",
@@ -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",
@@ -2320,6 +2335,13 @@ jsonPWrapper ({
"Name": "that",
"StepComments": [],
"AfterLastStepComments": []
+ },
+ {
+ "Keyword": "And",
+ "NativeKeyword": "And ",
+ "Name": "its sub-context is set",
+ "StepComments": [],
+ "AfterLastStepComments": []
}
],
"Tags": [],
@@ -2364,6 +2386,13 @@ jsonPWrapper ({
"Name": "that: ",
"StepComments": [],
"AfterLastStepComments": []
+ },
+ {
+ "Keyword": "And",
+ "NativeKeyword": "And ",
+ "Name": "the context was created by the feature with a single context scenario",
+ "StepComments": [],
+ "AfterLastStepComments": []
}
],
"Tags": [
@@ -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 ",
@@ -2540,7 +2576,9 @@ jsonPWrapper ({
"AfterLastStepComments": []
}
],
- "Tags": [],
+ "Tags": [
+ "@nestedFolders"
+ ],
"Result": {
"WasExecuted": false,
"WasSuccessful": false
@@ -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: ",
+ "FeatureElements": [
{
"Name": "Subtract two numbers",
"Slug": "subtract-two-numbers",
@@ -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 ",
@@ -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"
}
});
\ No newline at end of file
diff --git a/docs/Output/Excel/features.xlsx b/docs/Output/Excel/features.xlsx
index a69b643b4..b375f36cf 100644
Binary files a/docs/Output/Excel/features.xlsx and b/docs/Output/Excel/features.xlsx differ
diff --git a/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html b/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html
index fba599cdc..77b715e41 100644
--- a/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html
+++ b/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html
@@ -305,9 +305,9 @@ Using And and But
diff --git a/docs/Output/Html/Features/00BasicGherkin/index.html b/docs/Output/Html/Features/00BasicGherkin/index.html
index 8dcd2b013..a7050dc8b 100644
--- a/docs/Output/Html/Features/00BasicGherkin/index.html
+++ b/docs/Output/Html/Features/00BasicGherkin/index.html
@@ -268,9 +268,9 @@