Extend Element definition to assertVisible/assertNotVisible

Mastersam07 · Feb 19, 2025 · b635df8 · b635df8
1 parent 088f6c4
commit b635df8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 101 deletions.
diff --git a/schema/schema.v0.json b/schema/schema.v0.json
@@ -664,60 +664,17 @@
                 ],
                 "properties": {
                     "assertNotVisible": {
-                        "oneOf": [
+                        "description": "Assert that an element is not visible through an element selector",
+                        "$ref": "#/$defs/Element",
+                        "examples": [
+                            "Loading Spinner",
                             {
-                                "type": "string",
-                                "description": "Assert that an element is not visible through text",
-                                "minLength": 1
+                                "text": "Error Message",
+                                "checked": false
                             },
                             {
-                                "description": "Assert that an element is not visible through an element selector",
-                                "type": "object",
-                                "additionalProperties": false,
-                                "properties": {
-                                    "text": {
-                                        "type": "string"
-                                    },
-                                    "id": {
-                                        "type": "string"
-                                    },
-                                    "enabled": {
-                                        "type": "boolean"
-                                    },
-                                    "checked": {
-                                        "type": "boolean"
-                                    },
-                                    "focused": {
-                                        "type": "boolean"
-                                    },
-                                    "selected": {
-                                        "type": "boolean"
-                                    },
-                                    "index": {
-                                        "type": "integer"
-                                    },
-                                    "label": {
-                                        "title": "assertNotVisible.label",
-                                        "type": "string",
-                                        "description": "Description of the action to be performed."
-                                    },
-                                    "optional": {
-                                        "title": "assertNotVisible.optional",
-                                        "type": "boolean",
-                                        "description": "Indicates if the action is optional."
-                                    }
-                                },
-                                "examples": [
-                                    "Loading Spinner",
-                                    {
-                                        "text": "Error Message",
-                                        "checked": false
-                                    },
-                                    {
-                                        "id": "progress_bar",
-                                        "enabled": false
-                                    }
-                                ]
+                                "id": "progress_bar",
+                                "enabled": false
                             }
                         ]
                     }
@@ -788,57 +745,14 @@
                 ],
                 "properties": {
                     "assertVisible": {
-                        "oneOf": [
-                            {
-                                "type": "string",
-                                "description": "Assert that an element is visible through text",
-                                "minLength": 1
-                            },
+                        "description": "Assert that an element is visible through an element selector",
+                        "$ref": "#/$defs/Element",
+                        "examples": [
+                            "Login Button",
                             {
-                                "description": "Assert that an element is visible through an element selector",
-                                "type": "object",
-                                "additionalProperties": false,
-                                "properties": {
-                                    "text": {
-                                        "type": "string"
-                                    },
-                                    "id": {
-                                        "type": "string"
-                                    },
-                                    "enabled": {
-                                        "type": "boolean"
-                                    },
-                                    "checked": {
-                                        "type": "boolean"
-                                    },
-                                    "focused": {
-                                        "type": "boolean"
-                                    },
-                                    "selected": {
-                                        "type": "boolean"
-                                    },
-                                    "index": {
-                                        "type": "integer"
-                                    },
-                                    "label": {
-                                        "title": "assertVisible.label",
-                                        "type": "string",
-                                        "description": "Description of the action to be performed."
-                                    },
-                                    "optional": {
-                                        "title": "assertVisible.optional",
-                                        "type": "boolean",
-                                        "description": "Indicates if the action is optional."
-                                    }
-                                },
-                                "examples": [
-                                    "Login Button",
-                                    {
-                                        "text": "Sign In",
-                                        "id": "sign_in_button",
-                                        "focused": true
-                                    }
-                                ]
+                                "text": "Sign In",
+                                "id": "sign_in_button",
+                                "focused": true
                             }
                         ]
                     }

diff --git a/tests/examples/extreme.yaml b/tests/examples/extreme.yaml
@@ -40,6 +40,9 @@ onFlowComplete:
 - assertNotVisible:
     text: 'Form Test'
     enabled: false
+    below: 'Some Text'
+    above:
+      text: 'Other Text'
 
 - assertTrue: ${"test" == "test"}
 - assertTrue:
@@ -54,6 +57,7 @@ onFlowComplete:
 - assertVisible: 'Login'
 - assertVisible: 
     text: 'Form Test'
+    below: 'Some Text'
 
 - assertWithAI: 'Login and password text fields are visible.'
 - assertWithAI: