Fix assertions after updating gherkin to 0.11.2 version (#205, cucu…

…mber-rs/gherkin#33)
cucumber-rs · Feb 23, 2022 · b25fa32 · b25fa32
1 parent f657ce0
commit b25fa32
Show file tree

Hide file tree

Showing 16 changed files with 186 additions and 186 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,7 +44,7 @@ console = "0.15"
 derive_more = { version = "0.99.17", features = ["as_ref", "deref", "deref_mut", "display", "error", "from", "into"], default_features = false }
 either = "1.6"
 futures = "0.3.17"
-gherkin = "0.11.1"
+gherkin = "0.11.2"
 globwalk = "0.8.1"
 itertools = "0.10"
 linked-hash-map = "0.5.3"

diff --git a/src/feature.rs b/src/feature.rs
@@ -170,7 +170,7 @@ fn expand_scenario(
             // This is done to differentiate `Hash`es of
             // scenario outlines with the same examples.
             expanded.position = position;
-            expanded.position.line += id + 1;
+            expanded.position.line += id + 2;
 
             expanded.tags.extend(tags.cloned());
 

diff --git a/tests/features/output/background_rule_background_outline.feature.out b/tests/features/output/background_rule_background_outline.feature.out
diff --git a/tests/features/output/background_rule_outline.feature.out b/tests/features/output/background_rule_outline.feature.out
diff --git a/tests/features/output/background_scenario_outline.feature.out b/tests/features/output/background_scenario_outline.feature.out
diff --git a/tests/features/output/rule_background_outline.feature.out b/tests/features/output/rule_background_outline.feature.out
diff --git a/tests/features/output/rule_outline.feature.out b/tests/features/output/rule_outline.feature.out
diff --git a/tests/features/output/scenario_outline.feature.out b/tests/features/output/scenario_outline.feature.out
diff --git a/tests/features/output/scenario_outline_adjacent_templates.feature.out b/tests/features/output/scenario_outline_adjacent_templates.feature.out
diff --git a/tests/features/output/scenario_outline_table.feature.out b/tests/features/output/scenario_outline_table.feature.out
diff --git a/tests/features/output/scenario_outline_with_basic_dosctring.feature.out b/tests/features/output/scenario_outline_with_basic_dosctring.feature.out
diff --git a/tests/features/output/scenario_outline_with_expanded_dosctring.feature.out b/tests/features/output/scenario_outline_with_expanded_dosctring.feature.out
diff --git a/tests/features/output/scenario_outline_with_multiple_examples.feature.out b/tests/features/output/scenario_outline_with_multiple_examples.feature.out
diff --git a/tests/features/output/scenario_outline_with_tags.feature.out b/tests/features/output/scenario_outline_with_tags.feature.out
diff --git a/tests/features/output/scenario_outline_with_tags_and_comments.feature.out b/tests/features/output/scenario_outline_with_tags_and_comments.feature.out
diff --git a/tests/json/correct.json b/tests/json/correct.json
@@ -296,22 +296,22 @@
         "keyword": "Scenario Outline",
         "type": "scenario",
         "id": "outline/wait",
-        "line": 12,
+        "line": 14,
         "name": "wait",
         "tags": [
           {
             "name": "tag",
-            "line": 12
+            "line": 14
           },
           {
             "name": "fail_after",
-            "line": 12
+            "line": 14
           }
         ],
         "steps": [
           {
             "keyword": "Given",
-            "line": 6,
+            "line": 5,
             "name": "2 secs",
             "result": {
               "status": "Passed",
@@ -320,7 +320,7 @@
           },
           {
             "keyword": "When",
-            "line": 7,
+            "line": 6,
             "name": "2 secs",
             "result": {
               "status": "Passed",
@@ -329,7 +329,7 @@
           },
           {
             "keyword": "Then",
-            "line": 8,
+            "line": 7,
             "name": "2 secs",
             "result": {
               "status": "Passed",
@@ -359,22 +359,22 @@
         "keyword": "Scenario Outline",
         "type": "scenario",
         "id": "outline/wait",
-        "line": 13,
+        "line": 15,
         "name": "wait",
         "tags": [
           {
             "name": "tag",
-            "line": 13
+            "line": 15
           },
           {
             "name": "fail_after",
-            "line": 13
+            "line": 15
           }
         ],
         "steps": [
           {
             "keyword": "Given",
-            "line": 6,
+            "line": 5,
             "name": "1 secs",
             "result": {
               "status": "Passed",
@@ -383,7 +383,7 @@
           },
           {
             "keyword": "When",
-            "line": 7,
+            "line": 6,
             "name": "1 secs",
             "result": {
               "status": "Passed",
@@ -392,7 +392,7 @@
           },
           {
             "keyword": "Then",
-            "line": 8,
+            "line": 7,
             "name": "1 secs",
             "result": {
               "status": "Passed",
@@ -422,22 +422,22 @@
         "keyword": "Scenario Outline",
         "type": "scenario",
         "id": "outline/wait",
-        "line": 14,
+        "line": 16,
         "name": "wait",
         "tags": [
           {
             "name": "tag",
-            "line": 14
+            "line": 16
           },
           {
             "name": "fail_after",
-            "line": 14
+            "line": 16
           }
         ],
         "steps": [
           {
             "keyword": "Given",
-            "line": 6,
+            "line": 5,
             "name": "1 secs",
             "result": {
               "status": "Passed",
@@ -446,7 +446,7 @@
           },
           {
             "keyword": "When",
-            "line": 7,
+            "line": 6,
             "name": "1 secs",
             "result": {
               "status": "Passed",
@@ -455,7 +455,7 @@
           },
           {
             "keyword": "Then",
-            "line": 8,
+            "line": 7,
             "name": "1 secs",
             "result": {
               "status": "Passed",
@@ -485,26 +485,26 @@
         "keyword": "Scenario Outline",
         "type": "scenario",
         "id": "outline/wait",
-        "line": 19,
+        "line": 21,
         "name": "wait",
         "tags": [
           {
             "name": "tag",
-            "line": 19
+            "line": 21
           },
           {
             "name": "fail_after",
-            "line": 19
+            "line": 21
           },
           {
             "name": "long",
-            "line": 19
+            "line": 21
           }
         ],
         "steps": [
           {
             "keyword": "Given",
-            "line": 6,
+            "line": 5,
             "name": "5 secs",
             "result": {
               "status": "Passed",
@@ -513,7 +513,7 @@
           },
           {
             "keyword": "When",
-            "line": 7,
+            "line": 6,
             "name": "5 secs",
             "result": {
               "status": "Passed",
@@ -522,7 +522,7 @@
           },
           {
             "keyword": "Then",
-            "line": 8,
+            "line": 7,
             "name": "5 secs",
             "result": {
               "status": "Passed",
@@ -559,7 +559,7 @@
         "keyword": "Scenario Outline",
         "type": "scenario",
         "id": "rule-outline/to-them-all/wait",
-        "line": 10,
+        "line": 11,
         "name": "To them all wait",
         "tags": [],
         "steps": [
@@ -612,7 +612,7 @@
         "keyword": "Scenario Outline",
         "type": "scenario",
         "id": "rule-outline/to-them-all/wait",
-        "line": 11,
+        "line": 12,
         "name": "To them all wait",
         "tags": [],
         "steps": [
@@ -665,7 +665,7 @@
         "keyword": "Scenario Outline",
         "type": "scenario",
         "id": "rule-outline/to-them-all/wait",
-        "line": 12,
+        "line": 13,
         "name": "To them all wait",
         "tags": [],
         "steps": [
@@ -718,7 +718,7 @@
         "keyword": "Scenario Outline",
         "type": "scenario",
         "id": "rule-outline/to-them-all/wait",
-        "line": 13,
+        "line": 14,
         "name": "To them all wait",
         "tags": [],
         "steps": [