# HG changeset patch # User Dmitry Volyntsev # Date 1605698096 0 # Node ID 4eb2a82dd9b5b92ef0d406254f609daafeae2c84 # Parent bc0990ea2e5b74f86cdad796974d767b9d8a897e Tests: added njs version check for js ngx tests. diff --git a/js_ngx.t b/js_ngx.t --- a/js_ngx.t +++ b/js_ngx.t @@ -41,6 +41,10 @@ http { listen 127.0.0.1:8080; server_name localhost; + location /njs { + js_content test.njs; + } + location /log { js_content test.log; } @@ -50,6 +54,10 @@ http { EOF $t->write_file('test.js', <read_file('error.log'), qr/\[in like($t->read_file('error.log'), qr/\[warn\].*ngx.log:BAR/, 'ngx.log warn'); like($t->read_file('error.log'), qr/\[error\].*ngx.log:BAZ/, 'ngx.log err'); +} + ############################################################################### diff --git a/stream_js_ngx.t b/stream_js_ngx.t --- a/stream_js_ngx.t +++ b/stream_js_ngx.t @@ -33,6 +33,21 @@ daemon off; events { } +http { + %%TEST_GLOBALS_HTTP%% + + js_import test.js; + + server { + listen 127.0.0.1:8080; + server_name localhost; + + location /njs { + js_content test.njs; + } + } +} + stream { js_import test.js; @@ -47,6 +62,10 @@ stream { EOF $t->write_file('test.js', <read(), 'OK', 'log var'); $t->stop(); @@ -70,4 +93,6 @@ like($t->read_file('error.log'), qr/\[in like($t->read_file('error.log'), qr/\[warn\].*ngx.log:BAR/, 'ngx.log warn'); like($t->read_file('error.log'), qr/\[error\].*ngx.log:BAZ/, 'ngx.log err'); +} + ###############################################################################