# HG changeset patch # User Dmitry Volyntsev # Date 1659497705 25200 # Node ID 386748f328b199cfc724ab39f9e1729770c4f571 # Parent bd21a4a7c9f5adbad5e7c37ca2c74a4dbe04b3c4 Tests: updated js properties deprecated since 0.5.0. diff --git a/h2_request_body_js.t b/h2_request_body_js.t --- a/h2_request_body_js.t +++ b/h2_request_body_js.t @@ -57,7 +57,7 @@ EOF $t->write_file('test.js', <try_run('no njs available')->plan(27); +$t->try_run('no njs available')->plan(26); ############################################################################### @@ -273,8 +273,6 @@ like(http_get('/type?path=variables.host like(http_get('/type?path=rawVariables.host'), qr/200 OK.*type: buffer$/s, 'rawVariables type'); -like(http_post('/type?path=requestBody'), qr/200 OK.*type: string$/s, - 'requestBody 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, diff --git a/js_headers.t b/js_headers.t --- a/js_headers.t +++ b/js_headers.t @@ -379,7 +379,7 @@ EOF r.headersOut[h] = resp.headersOut[h]; } - r.return(200, resp.responseBody); + r.return(200, resp.responseText); } function subrequest(r) { diff --git a/js_promise.t b/js_promise.t --- a/js_promise.t +++ b/js_promise.t @@ -78,7 +78,7 @@ EOF function promise(r) { promisified_subrequest(r, '/sub_token', 'code=200&token=a') .then(reply => { - var data = JSON.parse(reply.responseBody); + var data = JSON.parse(reply.responseText); if (data['token'] !== "a") { throw new Error('token is not "a"'); @@ -89,7 +89,7 @@ EOF .then(token => { promisified_subrequest(r, '/sub_token', 'code=200&token=b') .then(reply => { - var data = JSON.parse(reply.responseBody); + var data = JSON.parse(reply.responseText); r.return(200, '{"token": "' + data['token'] + '"}'); }) @@ -105,7 +105,7 @@ EOF function promise_throw(r) { promisified_subrequest(r, '/sub_token', 'code=200&token=x') .then(reply => { - var data = JSON.parse(reply.responseBody); + var data = JSON.parse(reply.responseText); if (data['token'] !== "a") { throw data['token']; @@ -135,7 +135,7 @@ EOF function timeout(r) { promisified_subrequest(r, '/sub_token', 'code=200&token=R') - .then(reply => JSON.parse(reply.responseBody)) + .then(reply => JSON.parse(reply.responseText)) .then(data => { setTimeout(timeout_cb, 50, r, '/sub_token', 'code=200&token=T'); return data; @@ -153,7 +153,7 @@ EOF promisified_subrequest(r, url, args) .then(reply => { if (global_token == '') { - var data = JSON.parse(reply.responseBody); + var data = JSON.parse(reply.responseText); global_token = data['token']; diff --git a/js_request_body.t b/js_request_body.t --- a/js_request_body.t +++ b/js_request_body.t @@ -3,7 +3,7 @@ # (C) Dmitry Volyntsev # (C) Nginx, Inc. -# Tests for http njs module, r.requestBody method. +# Tests for http njs module, r.requestText method. ############################################################################### @@ -59,7 +59,7 @@ EOF $t->write_file('test.js', <