api-tuner 0.5.5 → 0.6.0

package/README.md

@@ -226,18 +226,15 @@ Assert the presence and value of an HTTP header. Header names are case-insensiti
   ```
   ⚠️ Be careful when using `?res!log:includes` resource path shorthand which will not work inside `tuner:formula`. Please refer to [this discussion](https://github.com/eyereasoner/eye/issues/148#issuecomment-2810940959).
 
-<<<<<<< json-assertions
 - **JSON Path**: If the response is JSON, you can use `tuner:jsonPath` to assert values within the body.
   ```turtle
-  ?res tuner:body ?body .
   # Exact match
-  ?body tuner:jsonPath ( "$.foo" "bar" ) .
+  ?res tuner:jsonPath ( "$.foo" "bar" ) .
   # Custom assertion (e.g. regex, contains, math)
-  ?body tuner:jsonPath ( "$.baz" "42" string:contains ) .
+  ?res tuner:jsonPath ( "$.baz" "42" string:contains ) .
   ```
+  ⚠️ Note that unlike RDF assersion, JSON Path assertions are used on the response itself, without using `tuner:body`.
 
-=======
->>>>>>> master
 #### Generic Assertions
 
 Use `tuner:assertThat` to fail a test with a custom message if a condition is not met.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-tuner",
-  "version": "0.5.5",
+  "version": "0.6.0",
   "main": "index.js",
   "type": "module",
   "license": "MIT",

package/rules/assertions.n3

@@ -3,6 +3,7 @@ PREFIX list: <http://www.w3.org/2000/10/swap/list#>
 PREFIX tuner: <https://api-tuner.described.at/>
 prefix string: <http://www.w3.org/2000/10/swap/string#>
 prefix log: <http://www.w3.org/2000/10/swap/log#>
+prefix file: <http://www.w3.org/2000/10/swap/file#>
 
 {
   ?expr tuner:assertThat ?msg .
@@ -74,16 +75,18 @@ prefix log: <http://www.w3.org/2000/10/swap/log#>
 } .
 
 {
-  ?body tuner:jsonPath ( ?path ?expected ) .
+  ?res tuner:jsonPath ( ?path ?expected ) .
 } <= {
-  ?body tuner:jsonPath ( ?path ?expected log:equalTo ) .
+  ?res tuner:jsonPath ( ?path ?expected log:equalTo ) .
 } .
 
 {
-  ?body tuner:jsonPath ( ?path ?expected ?builtIn ) .
+  ?res tuner:jsonPath ( ?path ?expected ?builtIn ) .
 } <= {
-  ?body log:rawType log:Literal .
-  ( "echo " ?body " | bin/jsonpath.sh '" ?path "' " )!string:concatenation log:shell ?actualRaw .
+  ?res log:includes {
+    [] a tuner:Response ; tuner:body ?bodyPath .
+  } .
+  ( "cat " ?bodyPath " | " "bin/jsonpath.sh"!file:libPath " '" ?path "' " )!string:concatenation log:shell ?actualRaw .
 
   # remove surrounding quotes added by the shell
   ( ( ?actualRaw '^\"' "")!string:replace '\"$' "") string:replace ?actual .