wisp-schema 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d0b3c8aafbec709cee5e5224702f63d4b87f5b075817b657bc5967c3ccc892f
-  data.tar.gz: 4bf671093aea5f59d080fd277a57d660d53568e90f918e2d107e58b59819b86c
+  metadata.gz: f0c8732f37998ef5c639aa803b1f5e186a67331c3ddaceb36a4796ef64b0664f
+  data.tar.gz: 4aa969b7b910bf7c3d21dd9732e7f2b13a3b1f3184bc8e120d2aa5780f080476
 SHA512:
-  metadata.gz: 4e3b58dfe8c0932f9e3c56339e0d3db5f06329d2c3a78741f0dd54f176c7834b4b6dd3de973d14aa150e1f3e1a48a003a07723d38937aeabc3fa1f44b8326eb1
-  data.tar.gz: 1c5e0d725380d01332147b30e1bc28dc97eed7023d08a33628becd4098e5c47679911482c91d46e237fd947839db94e1be0df0f5192b63ad97a00242b7e25050
+  metadata.gz: e980638064848368e57a7a213c86c4eb3b2406af683e328e1a84fd2ecb03a26878cb169f91619a52534694d4e63ef0aa6c8e0861900359f07d873c21178def42
+  data.tar.gz: 37ec22aaaf9c2babe247ed02ae5696e080ed641b9e4000a44fd0fe0baa949d19d8ef568a898e76bb2e80842ca795ef76978ffed8cc6c5500d3896c18b0852102

data/canary-wisp.json

@@ -77,11 +77,13 @@
         {"$ref": "#/definitions/tester_instruction"},
         {"$ref": "#/definitions/embedded_test"},
         {"$ref": "#/definitions/observe"},
+        {"$ref": "#/definitions/loaded"},
         {"$ref": "#/definitions/tester_confirmation"}
       ]
     },
     "click": {
       "type": "object",
+      "action_type": "action",
       "title": "Click",
       "description": "Clicks on the UI element",
       "properties": {
@@ -91,7 +93,8 @@
         "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         },
         "button": {"title": "Mouse Button", "type": "string", "enum": ["left", "middle", "right"]},
         "hold": {"title": "And Hold", "type": "boolean"},
@@ -102,6 +105,7 @@
     },
     "double_click": {
       "type": "object",
+      "action_type": "action",
       "title": "Double Click",
       "description": "Double-clicks on the UI element",
       "properties": {
@@ -111,7 +115,8 @@
         "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         }
       },
       "additionalProperties": false,
@@ -119,6 +124,7 @@
     },
     "fill": {
       "type": "object",
+      "action_type": "action",
       "title": "Fill",
       "description": "Fills the text field with specified content",
       "properties": {
@@ -128,7 +134,8 @@
         "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         },
         "text": {"title": "Text", "type": "string"}
       },
@@ -137,6 +144,7 @@
     },
     "type": {
       "type": "object",
+      "action_type": "action",
       "title": "Type",
       "description": "Types in specified text",
       "properties": {
@@ -151,6 +159,7 @@
     },
     "send_key": {
       "type": "object",
+      "action_type": "action",
       "title": "Press Key",
       "description": "Press specified key or key combination.",
       "properties": {
@@ -166,6 +175,7 @@
     },
     "hover": {
       "type": "object",
+      "action_type": "action",
       "title": "Hover",
       "description": "Hovers over specified element",
       "properties": {
@@ -175,7 +185,8 @@
         "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         }
       },
       "additionalProperties": false,
@@ -183,6 +194,7 @@
     },
     "select": {
       "type": "object",
+      "action_type": "action",
       "title": "Select",
       "description": "Selects specified item from the dropdown",
       "properties": {
@@ -192,7 +204,8 @@
         "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         },
         "option": {
           "title": "Option",
@@ -204,6 +217,7 @@
     },
     "refresh": {
       "type": "object",
+      "action_type": "action",
       "title": "Refresh",
       "description": "Refreshes the webpage",
       "properties": {
@@ -217,6 +231,7 @@
     },
     "navigate": {
       "type": "object",
+      "action_type": "action",
       "title": "Navigate",
       "description": "Navigates to specified URL",
       "properties": {
@@ -232,6 +247,7 @@
     },
     "close_tab": {
       "type": "object",
+      "action_type": "action",
       "title": "Close Tab",
       "description": "Closes current browser tab",
       "properties": {
@@ -245,6 +261,7 @@
     },
     "scroll": {
       "type": "object",
+      "action_type": "action",
       "title": "Scroll",
       "description": "Scrolls the page into specified direction until target is reached",
       "properties": {
@@ -255,7 +272,8 @@
         "direction": {"title": "Direction", "type": "string", "enum": ["up", "down", "left", "right"]},
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         }
       },
       "additionalProperties": false,
@@ -263,6 +281,7 @@
     },
     "wait": {
       "type": "object",
+      "action_type": "action",
       "title": "Wait",
       "description": "Waits for a number of seconds",
       "properties": {
@@ -277,6 +296,7 @@
     },
     "drag_and_drop": {
       "type": "object",
+      "action_type": "action",
       "title": "Drag and drop",
       "description": "Drag and drop",
       "properties": {
@@ -290,7 +310,8 @@
         },
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         }
       },
       "additionalProperties": false,
@@ -298,6 +319,7 @@
     },
     "embedded_test": {
       "type": "object",
+      "action_type": "embedded_test",
       "title": "Embedded Test",
       "description": "Embeds a Test",
       "properties": {
@@ -314,6 +336,7 @@
     },
     "tester_instruction": {
       "type": "object",
+      "action_type": "action",
       "title": "Tester Instruction",
       "description": "An action for a human to complete",
       "properties": {
@@ -328,10 +351,11 @@
     },
     "observe": {
       "type": "object",
+      "action_type": "assertion",
       "title": "Observe",
       "description": "Checks if element of the UI is visible or not",
       "properties": {
-        "assertion": {
+        "action": {
           "enum": ["observe"]
         },
         "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
@@ -339,24 +363,44 @@
           "title": "Object",
           "$ref": "#/definitions/noun"
         },
-        "visibility": {"title": "Is the element visible?", "type": "boolean"}
+        "visibility": {
+          "title": "Is the element visible?",
+          "type": "boolean",
+          "enum": [true, false]
+        }
+      },
+      "additionalProperties": false,
+      "required": ["action", "object", "visibility"]
+    },
+    "loaded": {
+      "type": "object",
+      "action_type": "assertion",
+      "title": "Loaded",
+      "description": "Checks if specified page has loaded",
+      "properties": {
+        "action": {
+          "enum": ["loaded"]
+        },
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
+        "page": {"title": "Page", "type": "string"}
       },
       "additionalProperties": false,
-      "required": ["assertion", "object"]
+      "required": ["action", "page"]
     },
     "tester_confirmation": {
       "type": "object",
+      "action_type": "assertion",
       "title": "Tester Confirmation",
       "description": "Ask a question to confirm a behavior",
       "properties": {
-        "assertion": {
+        "action": {
           "enum": ["tester_confirmation"]
         },
         "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "confirmation": {"title": "confirmation", "type": "string"}
       },
       "additionalProperties": false,
-      "required": ["assertion", "confirmation"]
+      "required": ["action", "confirmation"]
     }
   },
   "type": "object",

data/lib/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Wisp
-  VERSION = '1.0.2'
-  STABLE_VERSION = '0.18.1'
+  VERSION = '1.1.0'
+  STABLE_VERSION = '1.1.0'
+  CANARY_VERSION = '2.0.0'
 end

data/lib/wisp-schema.rb

@@ -12,10 +12,13 @@ module Wisp
 
   SEMANTIC_STABLE_VERSION = Semantic::Version.new(STABLE_VERSION)
 
-  def wisp_schemer(raw_version)
-    version = Semantic::Version.new(raw_version)
+  def is_canary?(raw_version)
+    Semantic::Version.new(raw_version) > SEMANTIC_STABLE_VERSION
+  end
+  module_function :is_canary?
 
-    if version > SEMANTIC_STABLE_VERSION
+  def wisp_schemer(raw_version)
+    if is_canary?(raw_version)
       JSONSchemer.schema(Pathname.new(Wisp::CANARY_SCHEMA_PATH))
     else
       JSONSchemer.schema(Pathname.new(Wisp::SCHEMA_PATH))
@@ -24,9 +27,7 @@ module Wisp
   module_function :wisp_schemer
 
   def nouns_schemer(raw_version)
-    version = Semantic::Version.new(raw_version)
-
-    if version > SEMANTIC_STABLE_VERSION
+    if is_canary?(raw_version)
       JSONSchemer.schema(Pathname.new(Wisp::CANARY_NOUNS_PATH))
     else
       JSONSchemer.schema(Pathname.new(Wisp::NOUNS_PATH))

data/wisp.json

@@ -67,56 +67,56 @@
         {"$ref": "#/definitions/type"},
         {"$ref": "#/definitions/send_key"},
         {"$ref": "#/definitions/hover"},
-        {"$ref": "#/definitions/dropdown_select"},
-        {"$ref": "#/definitions/checkbox_check"},
-        {"$ref": "#/definitions/checkbox_uncheck"},
+        {"$ref": "#/definitions/select"},
         {"$ref": "#/definitions/refresh"},
         {"$ref": "#/definitions/navigate"},
-        {"$ref": "#/definitions/navigate_new_tab"},
-        {"$ref": "#/definitions/navigate_incognito_tab"},
         {"$ref": "#/definitions/close_tab"},
         {"$ref": "#/definitions/scroll"},
-        {"$ref": "#/definitions/sleep"},
+        {"$ref": "#/definitions/wait"},
         {"$ref": "#/definitions/drag_and_drop"},
-        {"$ref": "#/definitions/click_and_hold"},
-        {"$ref": "#/definitions/plain_language"},
-        {"$ref": "#/definitions/custom_action"},
-        {"$ref": "#/definitions/see"},
-        {"$ref": "#/definitions/disappear"},
+        {"$ref": "#/definitions/tester_instruction"},
+        {"$ref": "#/definitions/embedded_test"},
+        {"$ref": "#/definitions/observe"},
         {"$ref": "#/definitions/loaded"},
-        {"$ref": "#/definitions/plain_language_assertion"}
+        {"$ref": "#/definitions/tester_confirmation"}
       ]
     },
     "click": {
       "type": "object",
+      "action_type": "action",
       "title": "Click",
       "description": "Clicks on the UI element",
       "properties": {
         "action": {
           "enum": ["click"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         },
-        "button": {"title": "Mouse Button", "type": "string", "enum": ["left", "middle", "right"]}
+        "button": {"title": "Mouse Button", "type": "string", "enum": ["left", "middle", "right"]},
+        "hold": {"title": "And Hold", "type": "boolean"},
+        "hold_seconds": {"title": "Hold seconds", "type": "integer"}
       },
       "additionalProperties": false,
-      "required": ["action", "target"]
+      "required": ["action", "target", "button", "hold"]
     },
     "double_click": {
       "type": "object",
+      "action_type": "action",
       "title": "Double Click",
       "description": "Double-clicks on the UI element",
       "properties": {
         "action": {
           "enum": ["double_click"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         }
       },
       "additionalProperties": false,
@@ -124,47 +124,49 @@
     },
     "fill": {
       "type": "object",
+      "action_type": "action",
       "title": "Fill",
       "description": "Fills the text field with specified content",
       "properties": {
         "action": {
           "enum": ["fill"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         },
-        "text": {"title": "Text", "type": "string"},
-        "method": { "title": "Text entry method", "type": "string", "enum": ["pasting", "typing"] }
+        "text": {"title": "Text", "type": "string"}
       },
       "additionalProperties": false,
       "required": ["action", "target", "text"]
     },
     "type": {
       "type": "object",
+      "action_type": "action",
       "title": "Type",
       "description": "Types in specified text",
       "properties": {
         "action": {
           "enum": ["type"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
-        "text": {"title": "Text", "type": "string"},
-        "method": { "title": "Text entry method", "type": "string", "enum": ["pasting", "typing"] }
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
+        "text": {"title": "Text", "type": "string"}
       },
       "additionalProperties": false,
       "required": ["action", "text"]
     },
     "send_key": {
       "type": "object",
+      "action_type": "action",
       "title": "Press Key",
       "description": "Press specified key or key combination.",
       "properties": {
         "action": {
           "enum": ["send_key"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "key": {"title": "Key", "type": "string"},
         "modifier": {"title": "Modifier", "type": "string"}
       },
@@ -173,33 +175,37 @@
     },
     "hover": {
       "type": "object",
+      "action_type": "action",
       "title": "Hover",
       "description": "Hovers over specified element",
       "properties": {
         "action": {
           "enum": ["hover"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         }
       },
       "additionalProperties": false,
       "required": ["action", "target"]
     },
-    "dropdown_select": {
+    "select": {
       "type": "object",
-      "title": "Dropdown Select",
+      "action_type": "action",
+      "title": "Select",
       "description": "Selects specified item from the dropdown",
       "properties": {
         "action": {
-          "enum": ["dropdown_select"]
+          "enum": ["select"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         },
         "option": {
           "title": "Option",
@@ -209,135 +215,80 @@
       "additionalProperties": false,
       "required": ["action", "target", "option"]
     },
-    "checkbox_check": {
-      "type": "object",
-      "title": "Checkbox Check",
-      "description": "Checks specified checkbox",
-      "properties": {
-        "action": {
-          "enum": ["checkbox_check"]
-        },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
-        "target": {
-          "title": "Target",
-          "$ref": "#/definitions/noun"
-        }
-      },
-      "additionalProperties": false,
-      "required": ["action", "target"]
-    },
-    "checkbox_uncheck": {
-      "type": "object",
-      "title": "Checkbox Uncheck",
-      "description": "Unchecks specified checkbox",
-      "properties": {
-        "action": {
-          "enum": ["checkbox_uncheck"]
-        },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
-        "target": {
-          "title": "Target",
-          "$ref": "#/definitions/noun"
-        }
-      },
-      "additionalProperties": false,
-      "required": ["action", "target"]
-    },
     "refresh": {
       "type": "object",
+      "action_type": "action",
       "title": "Refresh",
       "description": "Refreshes the webpage",
       "properties": {
         "action": {
           "enum": ["refresh"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"}
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"}
       },
       "additionalProperties": false,
       "required": ["action"]
     },
     "navigate": {
       "type": "object",
+      "action_type": "action",
       "title": "Navigate",
       "description": "Navigates to specified URL",
       "properties": {
         "action": {
           "enum": ["navigate"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
-        "url": {"title": "URL", "type": "string"}
-      },
-      "additionalProperties": false,
-      "required": ["action", "url"]
-    },
-    "navigate_new_tab": {
-      "type": "object",
-      "title": "Navigate - New Tab",
-      "description": "Navigates to specified URL in a new tab",
-      "properties": {
-        "action": {
-          "enum": ["navigate_new_tab"]
-        },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
-        "url": {"title": "URL", "type": "string"}
-      },
-      "additionalProperties": false,
-      "required": ["action", "url"]
-    },
-    "navigate_incognito_tab": {
-      "type": "object",
-      "title": "Navigate - Incognito Tab",
-      "description": "Navigates to specified URL in a new incognito tab",
-      "properties": {
-        "action": {
-          "enum": ["navigate_incognito_tab"]
-        },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
-        "url": {"title": "URL", "type": "string"}
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
+        "url": {"title": "URL", "type": "string"},
+        "tab": {"title": "Tab", "type": "string", "enum": ["current", "new", "incognito"]}
       },
       "additionalProperties": false,
-      "required": ["action", "url"]
+      "required": ["action", "url", "tab"]
     },
     "close_tab": {
       "type": "object",
+      "action_type": "action",
       "title": "Close Tab",
       "description": "Closes current browser tab",
       "properties": {
         "action": {
           "enum": ["close_tab"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"}
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"}
       },
       "additionalProperties": false,
       "required": ["action"]
     },
     "scroll": {
       "type": "object",
+      "action_type": "action",
       "title": "Scroll",
       "description": "Scrolls the page into specified direction until target is reached",
       "properties": {
         "action": {
           "enum": ["scroll"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "direction": {"title": "Direction", "type": "string", "enum": ["up", "down", "left", "right"]},
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         }
       },
       "additionalProperties": false,
       "required": ["action", "direction", "target"]
     },
-    "sleep": {
+    "wait": {
       "type": "object",
-      "title": "Sleep",
+      "action_type": "action",
+      "title": "Wait",
       "description": "Waits for a number of seconds",
       "properties": {
         "action": {
-          "enum": ["sleep"]
+          "enum": ["wait"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "seconds": {"title": "seconds", "type": "integer"}
       },
       "additionalProperties": false,
@@ -345,50 +296,35 @@
     },
     "drag_and_drop": {
       "type": "object",
+      "action_type": "action",
       "title": "Drag and drop",
       "description": "Drag and drop",
       "properties": {
         "action": {
           "enum": ["drag_and_drop"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "object": {
           "title": "Object",
           "$ref": "#/definitions/noun"
         },
         "target": {
           "title": "Target",
-          "$ref": "#/definitions/noun"
+          "$ref": "#/definitions/noun",
+          "type": "ui_element_reference"
         }
       },
       "additionalProperties": false,
       "required": ["action", "target", "object"]
     },
-    "click_and_hold": {
+    "embedded_test": {
       "type": "object",
-      "title": "Click and Hold",
-      "description": "Clicks and holds the left mouse button over object for a number of seconds",
+      "action_type": "embedded_test",
+      "title": "Embedded Test",
+      "description": "Embeds a Test",
       "properties": {
         "action": {
-          "enum": ["click_and_hold"]
-        },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
-        "target": {
-          "title": "Target",
-          "$ref": "#/definitions/noun"
-        },
-        "seconds": {"title": "Seconds", "type": "integer"}
-      },
-      "additionalProperties": false,
-      "required": ["action", "target", "seconds"]
-    },
-    "custom_action": {
-      "type": "object",
-      "title": "Custom Action",
-      "description": "Reusable custom action",
-      "properties": {
-        "action": {
-          "enum": ["custom_action"]
+          "enum": ["embedded_test"]
         },
         "test_id": {
           "title": "Test ID",
@@ -398,81 +334,73 @@
       "additionalProperties": false,
       "required": ["action", "test_id"]
     },
-    "plain_language": {
+    "tester_instruction": {
       "type": "object",
-      "title": "Plain Language",
-      "description": "Allows to fallback to english",
+      "action_type": "action",
+      "title": "Tester Instruction",
+      "description": "An action for a human to complete",
       "properties": {
         "action": {
-          "enum": ["plain_language"]
+          "enum": ["tester_instruction"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "instruction": {"title": "Instruction", "type": "string"}
       },
       "additionalProperties": false,
       "required": ["action", "instruction"]
     },
-    "see": {
+    "observe": {
       "type": "object",
-      "title": "See",
-      "description": "Checks if element of the UI is visible",
+      "action_type": "assertion",
+      "title": "Observe",
+      "description": "Checks if element of the UI is visible or not",
       "properties": {
-        "assertion": {
-          "enum": ["see"]
+        "action": {
+          "enum": ["observe"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "object": {
           "title": "Object",
           "$ref": "#/definitions/noun"
-        }
-      },
-      "additionalProperties": false,
-      "required": ["assertion", "object"]
-    },
-    "disappear": {
-      "type": "object",
-      "title": "Disappear",
-      "description": "Checks if element of the UI is no longer visible",
-      "properties": {
-        "assertion": {
-          "enum": ["disappear"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
-        "object": {
-          "title": "Object",
-          "$ref": "#/definitions/noun"
+        "visibility": {
+          "title": "Is the element visible?",
+          "type": "boolean",
+          "enum": [true, false]
         }
       },
       "additionalProperties": false,
-      "required": ["assertion", "object"]
+      "required": ["action", "object", "visibility"]
     },
     "loaded": {
       "type": "object",
+      "action_type": "assertion",
       "title": "Loaded",
       "description": "Checks if specified page has loaded",
       "properties": {
-        "assertion": {
+        "action": {
           "enum": ["loaded"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
         "page": {"title": "Page", "type": "string"}
       },
       "additionalProperties": false,
-      "required": ["assertion", "page"]
+      "required": ["action", "page"]
     },
-    "plain_language_assertion": {
+    "tester_confirmation": {
       "type": "object",
-      "title": "Plain Language Assertion",
-      "description": "Allows to fallback to english",
+      "action_type": "assertion",
+      "title": "Tester Confirmation",
+      "description": "Ask a question to confirm a behavior",
       "properties": {
-        "assertion": {
-          "enum": ["plain_language_assertion"]
+        "action": {
+          "enum": ["tester_confirmation"]
         },
-        "custom_action_id": {"title": "Custom Action ID", "type": "integer"},
-        "instruction": {"title": "Instruction", "type": "string"}
+        "embedded_test_id": {"title": "Embedded Test ID", "type": "integer"},
+        "confirmation": {"title": "confirmation", "type": "string"}
       },
       "additionalProperties": false,
-      "required": ["assertion", "instruction"]
+      "required": ["action", "confirmation"]
     }
   },
   "type": "object",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wisp-schema
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Jan Grodowski