Fixed first/last flag on FeatureFileVisitor

Fixed find feature files regex pattern fdr windows in example project
jonsamwell · Sep 15, 2021 · 2c6fa8a · 2c6fa8a
1 parent 239a4ca
commit 2c6fa8a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [2.0.5+1] - 15/09/2021
+
+* Fixed first/last flag on `FeatureFileVisitor`
+* Fixed find feature files regex pattern fdr windows in example project
+
 ## [2.0.5] - 15/09/2021
 
 * Added json reporter test case for multi-scenario

diff --git a/example/report.json b/example/report.json
diff --git a/example/test.dart b/example/test.dart
@@ -14,8 +14,9 @@ import 'supporting_files/worlds/custom_world.world.dart';
 String buildFeaturesPathRegex() {
   // '\' must be escaped, '/' must not be escaped:
   var featuresPath = (Platform.isWindows)
-      ? 'features\${Platform.pathSeparator}.*\.feature'
+      ? 'features${Platform.pathSeparator}\\.*\.feature'
       : 'features${Platform.pathSeparator}.*\.feature';
+
   return featuresPath;
 }
 

diff --git a/lib/src/gherkin/ast/feature_file_visitor.dart b/lib/src/gherkin/ast/feature_file_visitor.dart
@@ -24,21 +24,25 @@ class FeatureFileVisitor {
         _tagsToList(feature.tags),
       );
 
-      for (final scenario in feature.scenarios) {
+      for (var i = 0; i < feature.scenarios.length; i += 1) {
+        final scenario = feature.scenarios.elementAt(i);
+        final isFirst = i == 0;
+        final isLast = i == (feature.scenarios.length - 1);
         final allScenarios = scenario is ScenarioOutlineRunnable
             ? scenario.expandOutlinesIntoScenarios()
             : [scenario];
+        var acknowledgedScenarioPosition = false;
 
-        for (var i = 0; i < allScenarios.length; i += 1) {
-          final childScenario = allScenarios.elementAt(i);
-
+        for (var childScenario in allScenarios) {
           await visitScenario(
             childScenario.name,
             _tagsToList(childScenario.tags),
-            i == 0,
-            i == (allScenarios.length - 1),
+            acknowledgedScenarioPosition ? false : isFirst,
+            acknowledgedScenarioPosition ? false : isLast,
           );
 
+          acknowledgedScenarioPosition = true;
+
           if (feature.background != null) {
             final bg = feature.background;
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: gherkin
-version: 2.0.5
+version: 2.0.5+1
 description: A Gherkin parsers and runner for Dart which is very similar to Cucumber, it provides the base BDD functionality ready for use in platform specific implementations i.e. flutter/web
 homepage: https://github.com/jonsamwell/dart_gherkin