Update Schema to reject invalid steps

cucumber · Apr 2, 2021 · e56e003 · e56e003
1 parent f431168
commit e56e003
Show file tree

Hide file tree

Showing 4 changed files with 107 additions and 20 deletions.
diff --git a/schema.json b/schema.json
@@ -11,6 +11,30 @@
         }
       },
       "optional": true
+    },
+    "step": {
+      "type": "object",
+      "properties": {
+        "keyword": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "result": {
+          "type": "object",
+          "properties": {
+            "status": {
+              "type": "string"
+            },
+            "duration": {
+              "type": "number"
+            }
+          },
+          "required": ["status"]
+        }
+      },
+      "required": ["keyword"]
     }
   },
   "type": "array",
@@ -46,26 +70,7 @@
             "steps": {
               "type": "array",
               "items": {
-                "type": "object",
-                "properties": {
-                  "keyword": {
-                    "type": "string"
-                  },
-                  "name": {
-                    "type": "string"
-                  },
-                  "result": {
-                    "type": "object",
-                    "properties": {
-                      "status": {
-                        "type": "string"
-                      },
-                      "duration": {
-                        "type": "number"
-                      }
-                    }
-                  }
-                }
+                "$ref": "#/definitions/step"
               }
             }
           }

diff --git a/spec/schema_validation_spec.rb b/spec/schema_validation_spec.rb
@@ -46,4 +46,18 @@
       end
     end
   end
+
+  describe 'step' do
+    it 'rejects when there is no status' do
+      step_without_status_result = JSON.parse(File.read('testdata/invalid/step_without_status.json'))
+
+      expect(schemer.valid?(step_without_status_result)).to be_falsy
+    end
+
+    it 'rejects when there is no keyword' do
+      step_without_keyword_result = JSON.parse(File.read('testdata/invalid/step_without_keyword.json'))
+
+      expect(schemer.valid?(step_without_keyword_result)).to be_falsy
+    end
+  end
 end
diff --git a/testdata/invalid/step_without_keyword.json b/testdata/invalid/step_without_keyword.json
@@ -0,0 +1,34 @@
+[
+  {
+    "description": "  Here is a description",
+    "elements": [
+      {
+        "description": "",
+        "id": ";",
+        "keyword": "Scenario",
+        "line": 7,
+        "name": "",
+        "steps": [
+          {
+            "line": 8,
+            "match": {
+              "location": "Steps.java:17"
+            },
+            "name": "this step passes",
+            "result": {
+              "duration": 110881,
+              "status": "passed"
+            }
+          }
+        ],
+        "type": "scenario"
+      }
+    ],
+    "id": "",
+    "keyword": "Feature",
+    "line": 1,
+    "name": "",
+    "tags": [],
+    "uri": "features/step_without_keyword.feature"
+  }
+]
diff --git a/testdata/invalid/step_without_status.json b/testdata/invalid/step_without_status.json
@@ -0,0 +1,34 @@
+[
+  {
+    "description": "  Here is a description",
+    "elements": [
+      {
+        "description": "",
+        "id": ";",
+        "keyword": "Scenario",
+        "line": 7,
+        "name": "",
+        "steps": [
+          {
+            "keyword": "Given ",
+            "line": 8,
+            "match": {
+              "location": "Steps.java:17"
+            },
+            "name": "this step passes",
+            "result": {
+              "duration": 110881
+            }
+          }
+        ],
+        "type": "scenario"
+      }
+    ],
+    "id": "",
+    "keyword": "Feature",
+    "line": 1,
+    "name": "",
+    "tags": [],
+    "uri": "features/step_without_status.feature"
+  }
+]