Tests: making fetch test portable by removing njs.dump().

diff --git a/nginx/t/js_fetch.t b/nginx/t/js_fetch.t
index 320e06f56ea91f33be9ee335b167c80fe91be22b..0e107c8936f2cd0df4ed9117250df3cd9bc46518 100644 (file)
--- a/nginx/t/js_fetch.t
+++ b/nginx/t/js_fetch.t
@@ -303,7 +303,7 @@ $t->write_file('test.js', <<EOF);
 
         p.then(reply => {
             var h = reply.headers[method](r.args.h);
-            r.return(200, njs.dump(h));
+            r.return(200, JSON.stringify(h));
         })
         .catch(e => r.return(501, e.message))
     }
@@ -342,7 +342,7 @@ $t->write_file('test.js', <<EOF);
             }
         }
 
-        r.return(200, njs.dump(out));
+        r.return(200, JSON.stringify(out));
     }
 
     function multi(r) {
@@ -446,23 +446,23 @@ like(http_get('/property?pr=statusText&code=403'), qr/200 OK.*Forbidden$/s,
        'fetch statusText Forbidden');
 like(http_get('/property?pr=type'), qr/200 OK.*basic$/s,
        'fetch type');
-like(http_get('/header?loc=duplicate_header&h=BAR'), qr/200 OK.*c$/s,
+like(http_get('/header?loc=duplicate_header&h=BAR'), qr/200 OK.*"c"$/s,
        'fetch header');
 like(http_get('/header?loc=duplicate_header&h=BARR'), qr/200 OK.*null$/s,
        'fetch no header');
-like(http_get('/header?loc=duplicate_header&h=foo'), qr/200 OK.*a, ?b$/s,
+like(http_get('/header?loc=duplicate_header&h=foo'), qr/200 OK.*"a, ?b"$/s,
        'fetch header duplicate');
 like(http_get('/header?loc=duplicate_header&h=BAR&method=getAll'),
-       qr/200 OK.*\['c']$/s, 'fetch getAll header');
+       qr/200 OK.*\["c"]$/s, 'fetch getAll header');
 like(http_get('/header?loc=duplicate_header&h=BARR&method=getAll'),
        qr/200 OK.*\[]$/s, 'fetch getAll no header');
 like(http_get('/header?loc=duplicate_header&h=FOO&method=getAll'),
-       qr/200 OK.*\['a','b']$/s, 'fetch getAll duplicate');
+       qr/200 OK.*\["a","b"]$/s, 'fetch getAll duplicate');
 like(http_get('/header?loc=duplicate_header&h=bar&method=has'),
        qr/200 OK.*true$/s, 'fetch header has');
 like(http_get('/header?loc=duplicate_header&h=buz&method=has'),
        qr/200 OK.*false$/s, 'fetch header does not have');
-like(http_get('/header?loc=chunked/big&h=BAR&readBody=1'), qr/200 OK.*xxx$/s,
+like(http_get('/header?loc=chunked/big&h=BAR&readBody=1'), qr/200 OK.*"xxx"$/s,
        'fetch chunked header');
 is(get_json('/multi'),
        '[{"b":"GET::","c":201,"u":"http://127.0.0.1:'.$p0.'/loc"},' .
@@ -477,7 +477,7 @@ like(http_get('/chunked_fail'), qr/200/s, 'fetch chunked fail');
 like(http_get('/chain'), qr/200 OK.*SUCCESS$/s, 'fetch chain');
 
 like(http_get('/header_iter?loc=duplicate_header_large'),
-       qr/\['A:a','B:a','C:a','D:a','E:a','F:a','G:a','H:a','Moo:a, ?b']$/s,
+       qr/\["A:a","B:a","C:a","D:a","E:a","F:a","G:a","H:a","Moo:a, ?b"]$/s,
        'fetch header duplicate large');
 
 TODO: {

diff --git a/nginx/t/js_fetch_objects.t b/nginx/t/js_fetch_objects.t
index 1bc88a3d888d07124943feea42b6119c6c5f0dcd..67cabdfcb1fddcaa0fb0c63f056a5198032d10ee 100644 (file)
--- a/nginx/t/js_fetch_objects.t
+++ b/nginx/t/js_fetch_objects.t
@@ -186,8 +186,8 @@ $t->write_file('test.js', <<EOF);
              }, 'A, B, C, D, E, F'],
             ['getAll', () => {
                 var h = new Headers({a: 'X', A: 'Z'});
-                return njs.dump(h.getAll('a'));
-             }, "['X','Z']"],
+                return JSON.stringify(h.getAll('a'));
+             }, '["X","Z"]'],
             ['inherit', () => {
                 var h = new Headers({a: 'X', b: 'Y'});
                 var h2 = new Headers(h);

diff --git a/nginx/t/js_fetch_timeout.t b/nginx/t/js_fetch_timeout.t
index 1ac1c7aaaac43b209b62dc9cba5f286dd1eea9a1..5b207b90ba79bf7bc603b0cad576bd48b0cd3690 100644 (file)
--- a/nginx/t/js_fetch_timeout.t
+++ b/nginx/t/js_fetch_timeout.t
@@ -95,9 +95,9 @@ $t->write_file('test.js', <<EOF);
         ].map(v => ngx.fetch(v)));
 
         let bs = rs.map(v => ({s: v.status, v: v.value ? v.value.headers.X
-                                                       : v.reason}));
+                                                       : v.reason.message}));
 
-        r.return(200, njs.dump(bs));
+        r.return(200, JSON.stringify(bs));
     }
 
     function normal_reply(r) {
@@ -123,10 +123,10 @@ $t->plan(2);
 ###############################################################################
 
 like(http_get('/normal_timeout'),
-       qr/\[\{s:'fulfilled',v:'N'},\{s:'fulfilled',v:'D'}]$/s,
+       qr/\[\{"s":"fulfilled","v":"N"},\{"s":"fulfilled","v":"D"}]$/s,
        'normal timeout');
 like(http_get('/short_timeout'),
-       qr/\[\{s:'fulfilled',v:'N'},\{s:'rejected',v:Error: read timed out}]$/s,
+       qr/\[\{"s":"fulfilled","v":"N"},\{"s":"rejected","v":"read timed out"}]$/s,
        'short timeout');
 
 ###############################################################################