wisp-schema 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 908f03765ec903816a9fe1a86a89915ba2b54f437b14ad4fd26f82ab0f7d964a
-  data.tar.gz: 74fb5b6b46d4dbbe2e937075fb3c024f82295fa4c1e291c474580641fa4afd1c
+  metadata.gz: 440717453e56bc6b9fdb2ac23fa5acab01e76975840a3ae9005cb82b6d876cea
+  data.tar.gz: bac04b791a26cea2ba3c0775794d05988ff2749c9a000a8a0d58365137cf15e7
 SHA512:
-  metadata.gz: 016e76f2aa05757ca6baff83c8ad00423681a405675066bd164d11d545868338023a09c1aa11c59d7f923f4272f1135a7f703143ed287b58326802dae183e9b2
-  data.tar.gz: 26c3b60bdeb6344107b9f42734d33eb672e6e33f4e801ef1b39b0313f9b33c92a87e1507048efd74ed41389e6f480aa6abb14c50063f80445130a710a24db047
+  metadata.gz: eba99df0496a5e3ed596015ec19b3064e3c2c12d30db13eb455922b9bd2ada9599aca1c6dc02cf331a0555e09a7fe95773c87c2d1be9c4a3a83d0d7b41bd1fd9
+  data.tar.gz: ad23771078a30e0921927c33b490ba603e130d2f830000a2547dc36abd45be7bdd4929ddbafdc6e718033dc5aafdb51a817ebaff1f61c9492308cf2f0ff7b625

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": {
@@ -228,10 +243,11 @@
         "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": {
@@ -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,8 +336,9 @@
     },
     "tester_instruction": {
       "type": "object",
+      "action_type": "action",
       "title": "Tester Instruction",
-      "description": "Allows to fallback to english",
+      "description": "An action for a human to complete",
       "properties": {
         "action": {
           "enum": ["tester_instruction"]
@@ -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"
         },
-        "visiblity": {"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": "Allows to fallback to english",
+      "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,6 @@
 # frozen_string_literal: true
 
 module Wisp
-  VERSION = '1.0.1'
+  VERSION = '1.0.6'
   STABLE_VERSION = '0.18.1'
 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))

metadata

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