Merge branch 'develop'

picklesdoc · Mar 9, 2017 · 28c862b · 28c862b
2 parents c73df97 + 9afbffa
commit 28c862b
Show file tree

Hide file tree

Showing 119 changed files with 1,061 additions and 316 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,17 @@ 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.15.0] - 2017-03-09
+
+## Added
+
+- Continue loading feature files after parsing errors ([445](https://github.com/picklesdoc/pickles/pull/445)) (by [@dirkrombauts](https://github.com/dirkrombauts), based on an idea by [@pleveill](https://github.com/pleveill))
+
+### Fixed
+
+- Fix localisation of "Examples" in Scenario Outlines ([440](https://github.com/picklesdoc/pickles/pull/440)) (by [@dirkrombauts](https://github.com/dirkrombauts))
+- Make ExcludeTags available to MSBuild ([444](https://github.com/picklesdoc/pickles/pull/444)) (by [@dirkrombauts](https://github.com/dirkrombauts), based on an idea by [@pleveill](https://github.com/pleveill))
+
 ## [2.14.0] - 2017-02-24
 
 ### Added

diff --git a/build.bat b/build.bat
@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.14.0"
+set "picklesVersion=2.15.0"
 
 cls
 

diff --git a/docs/Output/Dhtml/Index.html b/docs/Output/Dhtml/Index.html
@@ -202,7 +202,7 @@ <h4 data-bind="text: Name, click: $root.toggleDetail" class="canHighlight, click
                                           </span>
                                           </div>
                                           <div>
-                                              <strong>Examples:</strong> <span data-bind="text: Name"></span>
+                                              <strong><span data-bind="text: $data.NativeKeyword"></span>:</strong> <span data-bind="text: Name"></span>
                                           </div>
                                           <div class="description" data-bind="html: renderMarkdownBlock(Description)"></div>
                                           <div data-bind="template: { name: 'table-template', data: $data.TableArgument }"></div>

diff --git a/docs/Output/Dhtml/js/featuresModel.js b/docs/Output/Dhtml/js/featuresModel.js
@@ -48,6 +48,7 @@ function Examples(data) {
     this.Description = data.Description || '';
     this.TableArgument = data.TableArgument == null ? null : new TableArgument(data.TableArgument.HeaderRow, data.TableArgument.DataRows);
     this.Tags = data.Tags || null;
+    this.NativeKeyword = data.NativeKeyword || "Examples";
   }
 
 function Background(data) {

diff --git a/docs/Output/Dhtml/pickledFeatures.js b/docs/Output/Dhtml/pickledFeatures.js
@@ -545,7 +545,8 @@ jsonPWrapper ({
                 "Tags": [
                   "@small",
                   "@short_test"
-                ]
+                ],
+                "NativeKeyword": "Examples"
               },
               {
                 "Name": "more than 100",
@@ -570,7 +571,8 @@ jsonPWrapper ({
                 },
                 "Tags": [
                   "@big"
-                ]
+                ],
+                "NativeKeyword": "Examples"
               }
             ],
             "Name": "Add two positive numbers with many examples",
@@ -644,7 +646,8 @@ jsonPWrapper ({
                     ]
                   ]
                 },
-                "Tags": []
+                "Tags": [],
+                "NativeKeyword": "Examples"
               },
               {
                 "Name": "more than 100",
@@ -667,7 +670,8 @@ jsonPWrapper ({
                     ]
                   ]
                 },
-                "Tags": []
+                "Tags": [],
+                "NativeKeyword": "Examples"
               }
             ],
             "Name": "Add two negative numbers with many examples",
@@ -2333,7 +2337,8 @@ jsonPWrapper ({
                     ]
                   ]
                 },
-                "Tags": []
+                "Tags": [],
+                "NativeKeyword": "Examples"
               }
             ],
             "Name": "Sample Markdown Scenario Outline Example",
@@ -3084,7 +3089,7 @@ jsonPWrapper ({
   },
   "Configuration": {
     "SutName": "Pickles",
-    "SutVersion": "2.14.0",
-    "GeneratedOn": "24 Februar 2017 18:09:34"
+    "SutVersion": "2.15.0",
+    "GeneratedOn": "9 März 2017 16:27:59"
   }
 });
diff --git a/docs/Output/Excel/features.xlsx b/docs/Output/Excel/features.xlsx
diff --git a/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html b/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html
@@ -305,9 +305,9 @@ <h2>Using And and But</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/00BasicGherkin/index.html b/docs/Output/Html/Features/00BasicGherkin/index.html
@@ -268,9 +268,9 @@ <h1>00 Basic Gherkin</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/01TestRunner/TestRunnerIsNotImportant.html b/docs/Output/Html/Features/01TestRunner/TestRunnerIsNotImportant.html
@@ -278,9 +278,9 @@ <h2>A couple of simple steps</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/01TestRunner/index.html b/docs/Output/Html/Features/01TestRunner/index.html
@@ -266,9 +266,9 @@ <h1>01 Test Runner</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/02TagsAndHooks/Hooks.html b/docs/Output/Html/Features/02TagsAndHooks/Hooks.html
@@ -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.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/02TagsAndHooks/TagDemo.html b/docs/Output/Html/Features/02TagsAndHooks/TagDemo.html
@@ -358,9 +358,9 @@ <h2>A scenario with 2 tags</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/02TagsAndHooks/index.html b/docs/Output/Html/Features/02TagsAndHooks/index.html
@@ -275,9 +275,9 @@ <h1>02 Tags And Hooks</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/031ScenarioContext/ScenarioContext.html b/docs/Output/Html/Features/031ScenarioContext/ScenarioContext.html
@@ -344,9 +344,9 @@ <h2>Pending step</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/031ScenarioContext/index.html b/docs/Output/Html/Features/031ScenarioContext/index.html
@@ -266,9 +266,9 @@ <h1>031 Scenario Context</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/032FeatureContext/FeatureContextFeatures.html b/docs/Output/Html/Features/032FeatureContext/FeatureContextFeatures.html
@@ -295,9 +295,9 @@ <h2>Showing information of the feature</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/032FeatureContext/index.html b/docs/Output/Html/Features/032FeatureContext/index.html
@@ -266,9 +266,9 @@ <h1>032 Feature Context</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/03ScenarioOutline/ScenarioOutline.html b/docs/Output/Html/Features/03ScenarioOutline/ScenarioOutline.html
@@ -434,9 +434,9 @@ <h3>Examples: more than 100</h3>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/03ScenarioOutline/index.html b/docs/Output/Html/Features/03ScenarioOutline/index.html
@@ -266,9 +266,9 @@ <h1>03 Scenario Outline</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:57</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/04Background/BackgroundFeature.html b/docs/Output/Html/Features/04Background/BackgroundFeature.html
@@ -305,9 +305,9 @@ <h2>Add 2 to the sum</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/04Background/index.html b/docs/Output/Html/Features/04Background/index.html
@@ -266,9 +266,9 @@ <h1>04 Background</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/05TablesAndAssist/TableScenario.html b/docs/Output/Html/Features/05TablesAndAssist/TableScenario.html
@@ -326,9 +326,9 @@ <h2>Example of a wide table</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/05TablesAndAssist/index.html b/docs/Output/Html/Features/05TablesAndAssist/index.html
@@ -266,9 +266,9 @@ <h1>05 Tables And Assist</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/06CompareToAssist/CompareTo.html b/docs/Output/Html/Features/06CompareToAssist/CompareTo.html
@@ -298,9 +298,9 @@ <h2>CompareToSet</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/06CompareToAssist/index.html b/docs/Output/Html/Features/06CompareToAssist/index.html
@@ -266,9 +266,9 @@ <h1>06 Compare To Assist</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:32</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/07Localization/Svenska.html b/docs/Output/Html/Features/07Localization/Svenska.html
@@ -280,9 +280,9 @@ <h2>Summera 5 och 7 ska vara 12</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/07Localization/Vlaams.html b/docs/Output/Html/Features/07Localization/Vlaams.html
@@ -277,9 +277,9 @@ <h2>Het Scenario</h2>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>

diff --git a/docs/Output/Html/Features/07Localization/index.html b/docs/Output/Html/Features/07Localization/index.html
@@ -273,9 +273,9 @@ <h1>07 Localization</h1>
         </ul>
       </div>
       <div id="footer">
-        <p>Test results generated for: Pickles, version 2.14.0</p>
-        <p>Generated on: 24 Februar 2017 18:09:33</p>
-        <p>Produced by Pickles, version 2.14.0.0</p>
+        <p>Test results generated for: Pickles, version 2.15.0</p>
+        <p>Generated on: 9 März 2017 16:27:58</p>
+        <p>Produced by Pickles, version 2.15.0.0</p>
       </div>
     </div>
   </body>