commit 55915359bec0c8b9989b5e4e59b27a431dc54461
author Dmitry Volyntsev <xeioex@nginx.com> Wed Nov 18 11:14:56 2020 +0000
committer Dmitry Volyntsev <xeioex@nginx.com> Wed Nov 18 11:14:56 2020 +0000
tree e64aa30046e02ccd87661710f2a1d2ec0dca9427
parent 72f8902682bcc3e4ef75d032efba8e78a2e585b8

Tests: added njs version check for js ngx tests.

js_ngx.t

diff --git a/js_ngx.t b/js_ngx.t
index 38fda3b..b97098d 100644
--- a/js_ngx.t
+++ b/js_ngx.t
@@ -41,6 +41,10 @@
         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 @@
 EOF
 
 $t->write_file('test.js', <<EOF);
+    function test_njs(r) {
+        r.return(200, njs.version);
+    }
+
     function level(r) {
         switch (r.args.level) {
         case 'INFO': return ngx.INFO;
@@ -65,7 +73,7 @@
         r.return(200);
     }
 
-    export default {log};
+    export default {njs: test_njs, log};
 
 EOF
 
@@ -73,6 +81,10 @@
 
 ###############################################################################
 
+TODO: {
+local $TODO = 'not yet'
+	unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0';
+
 http_get('/log?level=INFO&text=FOO');
 http_get('/log?level=WARN&text=BAR');
 http_get('/log?level=ERR&text=BAZ');
@@ -83,4 +95,6 @@
 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');
 
+}
+
 ###############################################################################

stream_js_ngx.t

diff --git a/stream_js_ngx.t b/stream_js_ngx.t
index 3092d8d..b99cd2e 100644
--- a/stream_js_ngx.t
+++ b/stream_js_ngx.t
@@ -33,6 +33,21 @@
 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 @@
 EOF
 
 $t->write_file('test.js', <<EOF);
+    function test_njs(r) {
+        r.return(200, njs.version);
+    }
+
     function log(s) {
         ngx.log(ngx.INFO, `ngx.log:FOO`);
         ngx.log(ngx.WARN, `ngx.log:BAR`);
@@ -54,7 +73,7 @@
         return 'OK';
     }
 
-    export default {log};
+    export default {njs: test_njs, log};
 
 EOF
 
@@ -62,6 +81,10 @@
 
 ###############################################################################
 
+TODO: {
+local $TODO = 'not yet'
+	unless http_get('/njs') =~ /^([.0-9]+)$/m && $1 ge '0.5.0';
+
 is(stream('127.0.0.1:' . port(8081))->read(), 'OK', 'log var');
 
 $t->stop();
@@ -70,4 +93,6 @@
 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');
 
+}
+
 ###############################################################################