diff --git a/packages/bruno-lang/v2/src/bruToJson.js b/packages/bruno-lang/v2/src/bruToJson.js index 25bae096d..06533b8d0 100644 --- a/packages/bruno-lang/v2/src/bruToJson.js +++ b/packages/bruno-lang/v2/src/bruToJson.js @@ -65,8 +65,8 @@ const grammar = ohm.grammar(`Bru { query = "query" dictionary varsandassert = varsreq | varsres | assert - varsreq = "vars:req" dictionary - varsres = "vars:res" dictionary + varsreq = "vars:pre-request" dictionary + varsres = "vars:post-response" dictionary assert = "assert" dictionary body = "body" st* "{" nl* textblock tagend diff --git a/packages/bruno-lang/v2/src/jsonToBru.js b/packages/bruno-lang/v2/src/jsonToBru.js index 9b7ce146f..5ec994ee8 100644 --- a/packages/bruno-lang/v2/src/jsonToBru.js +++ b/packages/bruno-lang/v2/src/jsonToBru.js @@ -149,7 +149,7 @@ ${indentString(body.xml)} const varsLocalEnabled = _.filter(reqvars, (v) => v.enabled && v.local); const varsLocalDisabled = _.filter(reqvars, (v) => !v.enabled && v.local); - bru += `vars:req {`; + bru += `vars:pre-request {`; if(varsEnabled.length) { bru += `\n${indentString(varsEnabled.map(item => `${item.name}: ${item.value}`).join('\n'))}`; @@ -175,7 +175,7 @@ ${indentString(body.xml)} const varsLocalEnabled = _.filter(resvars, (v) => v.enabled && v.local); const varsLocalDisabled = _.filter(resvars, (v) => !v.enabled && v.local); - bru += `vars:res {`; + bru += `vars:post-response {`; if(varsEnabled.length) { bru += `\n${indentString(varsEnabled.map(item => `${item.name}: ${item.value}`).join('\n'))}`; diff --git a/packages/bruno-lang/v2/tests/fixtures/request.bru b/packages/bruno-lang/v2/tests/fixtures/request.bru index f2e4fc0e1..ae7318da5 100644 --- a/packages/bruno-lang/v2/tests/fixtures/request.bru +++ b/packages/bruno-lang/v2/tests/fixtures/request.bru @@ -67,12 +67,12 @@ body:graphql:vars { } } -vars:req { +vars:pre-request { departingDate: 2020-01-01 ~returningDate: 2020-01-02 } -vars:res { +vars:post-response { token: $res.body.token @orderNumber: $res.body.orderNumber ~petId: $res.body.id