Tests: adapted js buffer tests to renaming body properties.
diff --git a/js.t b/js.t
index 9d283ce..7ebd838 100644
--- a/js.t
+++ b/js.t
@@ -212,7 +212,7 @@
function request_body_cache(r) {
function t(v) {return Buffer.isBuffer(v) ? 'buffer' : (typeof v);}
r.return(200,
- `requestBody:\${t(r.requestBody)} reqBody:\${t(r.reqBody)}`);
+ `requestText:\${t(r.requestText)} requestBuffer:\${t(r.requestBuffer)}`);
}
function send(r) {
@@ -262,7 +262,7 @@
EOF
-$t->try_run('no njs available')->plan(32);
+$t->try_run('no njs available')->plan(33);
###############################################################################
@@ -312,10 +312,12 @@
like(http_post('/type?path=requestBody'), qr/200 OK.*type: string$/s,
'requestBody type');
-like(http_post('/type?path=reqBody'), qr/200 OK.*type: buffer$/s,
- 'reqBody type');
-like(http_post('/request_body_cache'), qr/requestBody:string reqBody:buffer$/s,
- 'reqBody type');
+like(http_post('/type?path=requestText'), qr/200 OK.*type: string$/s,
+ 'requestText type');
+like(http_post('/type?path=requestBuffer'), qr/200 OK.*type: buffer$/s,
+ 'requestBuffer type');
+like(http_post('/request_body_cache'),
+ qr/requestText:string requestBuffer:buffer$/s, 'request body cache');
}
diff --git a/js_buffer.t b/js_buffer.t
index 26fad77..741ca10 100644
--- a/js_buffer.t
+++ b/js_buffer.t
@@ -62,6 +62,10 @@
js_content test.res_body;
}
+ location /res_text {
+ js_content test.res_text;
+ }
+
location /binary_var {
js_content test.binary_var;
}
@@ -95,19 +99,32 @@
}
function req_body(r) {
- var body = r.reqBody;
+ var body = r.requestBuffer;
var view = new DataView(body.buffer);
view.setInt8(2, 'c'.charCodeAt(0));
r.return(200, JSON.parse(body).c.b);
}
+ function type(v) {return Buffer.isBuffer(v) ? 'buffer' : (typeof v);}
+
function res_body(r) {
r.subrequest('/p/sub1')
.then(reply => {
- var body = reply.resBody;
+ var body = reply.responseBuffer;
var view = new DataView(body.buffer);
view.setInt8(2, 'c'.charCodeAt(0));
- r.return(200, JSON.stringify(JSON.parse(body)));
+ body = JSON.parse(body);
+ body.type = type(reply.responseBuffer);
+ r.return(200, JSON.stringify(body));
+ })
+ }
+
+ function res_text(r) {
+ r.subrequest('/p/sub1')
+ .then(reply => {
+ var body = JSON.parse(reply.responseText);
+ body.type = type(reply.responseText);
+ r.return(200, JSON.stringify(body));
})
}
@@ -118,11 +135,11 @@
}
export default {njs: test_njs, return: test_return, req_body, res_body,
- binary_var};
+ res_text, binary_var};
EOF
-$t->try_run('no njs buffer')->plan(4);
+$t->try_run('no njs buffer')->plan(5);
###############################################################################
@@ -132,8 +149,9 @@
like(http_get('/return?text=FOO'), qr/200 OK.*body: FOO$/s,
'return buffer');
-like(http_post('/req_body'), qr/200 OK.*BAR$/s, 'req body');
-is(get_json('/res_body'), '{"c":{"b":1}}', 'res body');
+like(http_post('/req_body'), qr/200 OK.*BAR$/s, 'request buffer');
+is(get_json('/res_body'), '{"c":{"b":1},"type":"buffer"}', 'response buffer');
+is(get_json('/res_text'), '{"a":{"b":1},"type":"string"}', 'response text');
like(http_get('/binary_var'), qr/200 OK.*true$/s,
'binary var');
