saffron-ai 0.5.0 → 0.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "saffron-ai",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Gherkin-native AI-fallback test runner: zero-token cached replay, runtime AI healing, honest reports",
   "scripts": {
     "test": "vitest run",

package/templates/saucedemo/features/{login.feature → login.saffron}

@@ -23,3 +23,15 @@ Feature: Login
       | username        | password     | message                                               |
       | locked_out_user | secret_sauce | Epic sadface: Sorry, this user has been locked out.  |
       | standard_user   | wrong        | Epic sadface: Username and password do not match     |
+
+  @login @recover
+  Scenario: Recover from a locked-out login
+    # A StepSet in the middle of a scenario: the set's guard step takes the
+    # browser back to the login page before it logs the standard user in.
+    Given I am on the login page
+    When I enter "locked_out_user" in the username field
+    And I enter "secret_sauce" in the password field
+    And I click the "Login" button
+    Then I should see the error message "Epic sadface: Sorry, this user has been locked out."
+    StepSet Log in as the standard user
+    Then I should see the products page

package/templates/saucedemo/features/shared.steps.saffron

@@ -1,7 +1,10 @@
 Feature: Shared step sets for the Saucedemo example suite
 
-# A sets-only library file: no scenarios, only StepSet definitions that any
-# .saffron file in the project can invoke with "StepSet <name>".
+# A sets-only library file: no scenarios, only StepSet definitions. Any
+# .saffron file in the project invokes them with "StepSet <name>", at the
+# start of a scenario or anywhere in the middle. Each set opens with a
+# guard step and closes with an exit assertion, so every invocation checks
+# itself.
 
 StepSet: Log in as the standard user
     Given I am on the login page
@@ -9,3 +12,14 @@ StepSet: Log in as the standard user
     And I enter "{env:SAUCE_PASSWORD}" in the password field
     And I click the "Login" button
     Then I should see the products page
+
+StepSet: Proceed to checkout with the standard details
+    Given I am on the products page
+    When I open the cart
+    And I click the "Checkout" button
+    And I enter the following checkout information
+      | firstName  | Ada      |
+      | lastName   | Lovelace |
+      | postalCode | 10117    |
+    And I click the "Continue" button
+    Then I should see the checkout overview

package/templates/saucedemo/features/shopping.saffron

@@ -1,8 +1,8 @@
 Feature: Shopping
 
-  # .saffron is Gherkin plus the StepSet keyword. The login flow is defined
-  # once in shared.steps.saffron and invoked here; its steps are inlined at
-  # parse time, so they record once and replay everywhere.
+  # .saffron is Gherkin plus the StepSet keyword. The flows below are
+  # defined once in shared.steps.saffron; their steps are inlined at parse
+  # time, so they record once and replay everywhere.
 
   @smoke @cart
   Scenario: Add a product to the cart
@@ -14,12 +14,7 @@ Feature: Shopping
   Scenario: Complete a checkout
     StepSet Log in as the standard user
     When I add "Sauce Labs Bike Light" to the cart
-    And I open the cart
-    And I click the "Checkout" button
-    And I enter the following checkout information
-      | firstName  | Ada      |
-      | lastName   | Lovelace |
-      | postalCode | 10117    |
-    And I click the "Continue" button
-    And I click the "Finish" button
+    StepSet Proceed to checkout with the standard details
+    Then the overview should list "Sauce Labs Bike Light"
+    When I click the "Finish" button
     Then I should see "Thank you for your order!"

package/textmate/saffron/syntaxes/saffron.tmLanguage.json

@@ -72,56 +72,78 @@
           "name": "keyword.control.stepset.saffron"
         },
         "2": {
-          "name": "entity.name.function.stepset.saffron"
-        }
-      }
-    },
-    "step": {
-      "match": "^\\s*(Given|When|Then|And|But|\\*)\\s(.*)$",
-      "captures": {
-        "1": {
-          "name": "keyword.other.step.saffron"
-        },
-        "2": {
-          "name": "string.unquoted.step-text.saffron",
+          "name": "entity.name.function.stepset.saffron",
           "patterns": [
             {
-              "match": "\"[^\"]*\"",
-              "name": "string.quoted.double.saffron"
+              "include": "#argument"
+            },
+            {
+              "include": "#placeholder"
             },
             {
-              "match": "<[^<>]+>",
-              "name": "variable.parameter.saffron"
+              "include": "#token"
             }
           ]
         }
       }
     },
+    "step": {
+      "begin": "^\\s*(Given|When|Then|And|But|\\*)\\b",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.step.saffron"
+        }
+      },
+      "end": "$",
+      "name": "meta.step.saffron",
+      "patterns": [
+        {
+          "include": "#argument"
+        },
+        {
+          "include": "#placeholder"
+        },
+        {
+          "include": "#token"
+        }
+      ]
+    },
     "docstring": {
       "begin": "^\\s*\"\"\"",
       "end": "^\\s*\"\"\"",
       "name": "string.quoted.docstring.saffron"
     },
     "table": {
-      "match": "^\\s*\\|.*\\|\\s*$",
+      "begin": "^\\s*(?=\\|)",
+      "end": "$",
       "name": "meta.table.saffron",
-      "captures": {
-        "0": {
-          "patterns": [
-            {
-              "match": "\\|",
-              "name": "punctuation.separator.table.saffron"
-            },
-            {
-              "match": "<[^<>]+>",
-              "name": "variable.parameter.saffron"
-            }
-          ]
+      "patterns": [
+        {
+          "match": "\\|",
+          "name": "punctuation.separator.table.saffron"
+        },
+        {
+          "include": "#placeholder"
+        },
+        {
+          "include": "#token"
         }
-      }
+      ]
+    },
+    "argument": {
+      "match": "\"[^\"]*\"",
+      "name": "string.quoted.double.argument.saffron"
+    },
+    "placeholder": {
+      "match": "<[^<>\\s]+>",
+      "name": "variable.parameter.placeholder.saffron"
+    },
+    "token": {
+      "match": "\\{(env:[A-Za-z_][A-Za-z0-9_]*|date(?:[+-]\\d+)?(?::[^}]+)?)\\}",
+      "name": "constant.other.token.saffron"
     }
   },
   "fileTypes": [
     "saffron"
   ]
-}
+}