diff options
author | Lars Wirzenius <liw@liw.fi> | 2018-11-05 10:17:46 +0200 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2018-11-05 10:17:46 +0200 |
commit | 782d42ef1ee0c7edb2a9cf68a24ea5ba60eca8cc (patch) | |
tree | 88d0efda62cba41e45c59c92ec7c54ff81b7d7cf /yarns | |
parent | fb756526af092ffb6424dc254fff928cbdd4135a (diff) | |
download | muck-poc-782d42ef1ee0c7edb2a9cf68a24ea5ba60eca8cc.tar.gz |
Change: specify which user is making ruquests in yarns
Diffstat (limited to 'yarns')
-rw-r--r-- | yarns/100-happy.yarn | 26 | ||||
-rw-r--r-- | yarns/900-implements.yarn | 18 |
2 files changed, 25 insertions, 19 deletions
diff --git a/yarns/100-happy.yarn b/yarns/100-happy.yarn index 934f243..6e099ce 100644 --- a/yarns/100-happy.yarn +++ b/yarns/100-happy.yarn @@ -11,24 +11,24 @@ access token, which will be used for all requests. Check status. - WHEN user makes request GET /status + WHEN user tomjon makes request GET /status THEN status code is 200 THEN response body is {"resources":0} Create a simple resource. Remember its id. - WHEN user makes request POST /res with body { "foo": "bar" } + WHEN user tomjon makes request POST /res with body { "foo": "bar" } THEN status code is 201 THEN remember resource id as ID THEN remember resource revision as REV1 - WHEN user makes request GET /status + WHEN user tomjon makes request GET /status THEN status code is 200 THEN response body is {"resources":1} Retrieve the resource. - WHEN user makes request GET /res with header "Muck-Id: ${ID}" + WHEN user tomjon makes request GET /res with header "Muck-Id: ${ID}" THEN status code is 200 THEN response body is { "foo": "bar" } THEN response has header "Muck-Id: ${ID}" @@ -36,12 +36,12 @@ Retrieve the resource. Update the resource. - WHEN user makes request PUT /res with header "Muck-Id: ${ID}" and + WHEN user tomjon makes request PUT /res with header "Muck-Id: ${ID}" and ... header "Muck-Revision: wrong" and ... body { "foo": "foobar" } THEN status code is 400 - WHEN user makes request PUT /res with header "Muck-Id: ${ID}" and + WHEN user tomjon makes request PUT /res with header "Muck-Id: ${ID}" and ... header "Muck-Revision: ${REV1}" and ... body { "foo": "foobar" } THEN status code is 200 @@ -49,7 +49,7 @@ Update the resource. Check the resource has been updated. - WHEN user makes request GET /res with header "Muck-Id: ${ID}" + WHEN user tomjon makes request GET /res with header "Muck-Id: ${ID}" THEN status code is 200 THEN response body is { "foo": "foobar" } THEN response has header "Muck-Id: ${ID}" @@ -58,7 +58,7 @@ Check the resource has been updated. Restart Muck. The resource should still exist. WHEN Muck is restarted - WHEN user makes request GET /res with header "Muck-Id: ${ID}" + WHEN user tomjon makes request GET /res with header "Muck-Id: ${ID}" THEN status code is 200 THEN response body is { "foo": "foobar" } THEN response has header "Muck-Id: ${ID}" @@ -67,7 +67,7 @@ Restart Muck. The resource should still exist. Search for the resource. First with a condition that is no longer true. - WHEN user makes request GET /search with body + WHEN user tomjon makes request GET /search with body ... { ... "cond": [ ... {"where": "data", "field": "foo", "pattern": "bar", "op": "=="} @@ -78,7 +78,7 @@ true. Now search for the correct value. - WHEN user makes request GET /search with body + WHEN user tomjon makes request GET /search with body ... { ... "cond": [ ... {"where": "data", "field": "foo", "pattern": "foobar", @@ -90,16 +90,16 @@ Now search for the correct value. Delete the resource. - WHEN user makes request DELETE /res with header "Muck-Id: ${ID}" + WHEN user tomjon makes request DELETE /res with header "Muck-Id: ${ID}" THEN status code is 200 - WHEN user makes request GET /res with header "Muck-Id: ${ID}" + WHEN user tomjon makes request GET /res with header "Muck-Id: ${ID}" THEN status code is 404 Restart Muck again. The resource should not exist. WHEN Muck is restarted - WHEN user makes request GET /res with header "Muck-Id: ${ID}" + WHEN user tomjon makes request GET /res with header "Muck-Id: ${ID}" THEN status code is 404 All done. diff --git a/yarns/900-implements.yarn b/yarns/900-implements.yarn index 1a12568..227be26 100644 --- a/yarns/900-implements.yarn +++ b/yarns/900-implements.yarn @@ -14,23 +14,28 @@ ## HTTP requests - IMPLEMENTS WHEN user makes request POST /res with body (.*) + IMPLEMENTS WHEN user (\S+) makes request POST /res with body (.*) + user = get_expanded_match() body = get_expanded_match() POST('/res', {}, json.loads(body)) - IMPLEMENTS WHEN user makes request GET /res with header "(\S+): (.+)" + IMPLEMENTS WHEN user (\S+) makes request GET /res with header "(\S+): (.+)" + user = get_expanded_match() header = get_expanded_match() value = get_expanded_match() GET('/res', {header:value}) - IMPLEMENTS WHEN user makes request GET /status + IMPLEMENTS WHEN user (\S+) makes request GET /status + user = get_expanded_match() GET('/status', {}) - IMPLEMENTS WHEN user makes request GET /search with body (.+) + IMPLEMENTS WHEN user (\S+) makes request GET /search with body (.+) + user = get_expanded_match() body = json.loads(get_expanded_match()) GET('/search', {}, body=body) - IMPLEMENTS WHEN user makes request PUT /res with header "(\S+): (.+)" and header "(\S+): (.+)" and body (.+) + IMPLEMENTS WHEN user (\S+) makes request PUT /res with header "(\S+): (.+)" and header "(\S+): (.+)" and body (.+) + user = get_expanded_match() header1 = get_expanded_match() value1 = get_expanded_match() header2 = get_expanded_match() @@ -42,7 +47,8 @@ } PUT('/res', headers, json.loads(body)) - IMPLEMENTS WHEN user makes request DELETE /res with header "(\S+): (.+)" + IMPLEMENTS WHEN user (\S+) makes request DELETE /res with header "(\S+): (.+)" + user = get_expanded_match() header = get_expanded_match() value = get_expanded_match() DELETE('/res', {header:value}) |