test: adjust tests

nodejs · Jul 19, 2024 · 50230f2 · 50230f2
1 parent 9750724
commit 50230f2
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 58 deletions.
diff --git a/test/node-test/client-dispatch.js b/test/node-test/client-dispatch.js
@@ -126,13 +126,13 @@ test('basic dispatch get', async (t) => {
       },
       onHeaders (statusCode, headers) {
         p.strictEqual(statusCode, 200)
-        p.strictEqual(Array.isArray(headers), true)
+        p.ok(Object.keys(headers).length > 0)
       },
       onData (buf) {
         bufs.push(buf)
       },
       onComplete (trailers) {
-        p.deepStrictEqual(trailers, [])
+        p.deepStrictEqual(trailers, {})
         p.strictEqual('hello', Buffer.concat(bufs).toString('utf8'))
       },
       onError () {
@@ -145,7 +145,7 @@ test('basic dispatch get', async (t) => {
 })
 
 test('trailers dispatch get', async (t) => {
-  const p = tspl(t, { plan: 12 })
+  const p = tspl(t, { plan: 11 })
 
   const server = http.createServer((req, res) => {
     p.strictEqual('/', req.url)
@@ -180,21 +180,14 @@ test('trailers dispatch get', async (t) => {
       },
       onHeaders (statusCode, headers) {
         p.strictEqual(statusCode, 200)
-        p.strictEqual(Array.isArray(headers), true)
-        {
-          const contentTypeIdx = headers.findIndex(x => x.toString() === 'Content-Type')
-          p.strictEqual(headers[contentTypeIdx + 1].toString(), 'text/plain')
-        }
+        p.ok(Object.keys(headers).length > 0)
+        p.strictEqual(headers['content-type'], 'text/plain')
       },
       onData (buf) {
         bufs.push(buf)
       },
       onComplete (trailers) {
-        p.strictEqual(Array.isArray(trailers), true)
-        {
-          const contentMD5Idx = trailers.findIndex(x => x.toString() === 'Content-MD5')
-          p.strictEqual(trailers[contentMD5Idx + 1].toString(), 'test')
-        }
+        p.strictEqual(trailers['content-md5'], 'test')
         p.strictEqual('hello', Buffer.concat(bufs).toString('utf8'))
       },
       onError () {

diff --git a/test/node-test/diagnostics-channel/get.js b/test/node-test/diagnostics-channel/get.js
@@ -87,20 +87,14 @@ test('Diagnostics channel - get', (t) => {
   diagnosticsChannel.channel('undici:request:headers').subscribe(({ request, response }) => {
     assert.equal(_req, request)
     assert.equal(response.statusCode, 200)
-    const expectedHeaders = [
-      Buffer.from('Content-Type'),
-      Buffer.from('text/plain'),
-      Buffer.from('trailer'),
-      Buffer.from('foo'),
-      Buffer.from('Date'),
-      response.headers[5], // This is a date
-      Buffer.from('Connection'),
-      Buffer.from('keep-alive'),
-      Buffer.from('Keep-Alive'),
-      Buffer.from('timeout=5'),
-      Buffer.from('Transfer-Encoding'),
-      Buffer.from('chunked')
-    ]
+    const expectedHeaders = {
+      'content-type': 'text/plain',
+      trailer: 'foo',
+      date: response.headers.date, // This is a date
+      connection: 'keep-alive',
+      'keep-alive': 'timeout=5',
+      'transfer-encoding': 'chunked'
+    }
     assert.deepStrictEqual(response.headers, expectedHeaders)
     assert.equal(response.statusText, 'OK')
   })
@@ -114,7 +108,7 @@ test('Diagnostics channel - get', (t) => {
       // This event is emitted after the last chunk has been added to the body stream,
       // not when it was consumed by the application
       assert.equal(endEmitted, false)
-      assert.deepStrictEqual(trailers, [Buffer.from('foo'), Buffer.from('oof')])
+      assert.deepStrictEqual(trailers, { foo: 'oof' })
       resolve()
     })
 

diff --git a/test/node-test/diagnostics-channel/post-stream.js b/test/node-test/diagnostics-channel/post-stream.js
@@ -89,20 +89,14 @@ test('Diagnostics channel - post stream', (t) => {
   diagnosticsChannel.channel('undici:request:headers').subscribe(({ request, response }) => {
     assert.equal(_req, request)
     assert.equal(response.statusCode, 200)
-    const expectedHeaders = [
-      Buffer.from('Content-Type'),
-      Buffer.from('text/plain'),
-      Buffer.from('trailer'),
-      Buffer.from('foo'),
-      Buffer.from('Date'),
-      response.headers[5], // This is a date
-      Buffer.from('Connection'),
-      Buffer.from('keep-alive'),
-      Buffer.from('Keep-Alive'),
-      Buffer.from('timeout=5'),
-      Buffer.from('Transfer-Encoding'),
-      Buffer.from('chunked')
-    ]
+    const expectedHeaders = {
+      'content-type': 'text/plain',
+      trailer: 'foo',
+      date: response.headers.date, // This is a date
+      connection: 'keep-alive',
+      'keep-alive': 'timeout=5',
+      'transfer-encoding': 'chunked'
+    }
     assert.deepStrictEqual(response.headers, expectedHeaders)
     assert.equal(response.statusText, 'OK')
   })
@@ -120,7 +114,7 @@ test('Diagnostics channel - post stream', (t) => {
       // This event is emitted after the last chunk has been added to the body stream,
       // not when it was consumed by the application
       assert.equal(endEmitted, false)
-      assert.deepStrictEqual(trailers, [Buffer.from('foo'), Buffer.from('oof')])
+      assert.deepStrictEqual(trailers, { foo: 'oof' })
       resolve()
     })
 

diff --git a/test/node-test/diagnostics-channel/post.js b/test/node-test/diagnostics-channel/post.js
@@ -87,20 +87,14 @@ test('Diagnostics channel - post', (t) => {
   diagnosticsChannel.channel('undici:request:headers').subscribe(({ request, response }) => {
     assert.equal(_req, request)
     assert.equal(response.statusCode, 200)
-    const expectedHeaders = [
-      Buffer.from('Content-Type'),
-      Buffer.from('text/plain'),
-      Buffer.from('trailer'),
-      Buffer.from('foo'),
-      Buffer.from('Date'),
-      response.headers[5], // This is a date
-      Buffer.from('Connection'),
-      Buffer.from('keep-alive'),
-      Buffer.from('Keep-Alive'),
-      Buffer.from('timeout=5'),
-      Buffer.from('Transfer-Encoding'),
-      Buffer.from('chunked')
-    ]
+    const expectedHeaders = {
+      'content-type': 'text/plain',
+      trailer: 'foo',
+      date: response.headers.date, // This is a date
+      connection: 'keep-alive',
+      'keep-alive': 'timeout=5',
+      'transfer-encoding': 'chunked'
+    }
     assert.deepStrictEqual(response.headers, expectedHeaders)
     assert.equal(response.statusText, 'OK')
   })
@@ -118,7 +112,7 @@ test('Diagnostics channel - post', (t) => {
       // This event is emitted after the last chunk has been added to the body stream,
       // not when it was consumed by the application
       assert.equal(endEmitted, false)
-      assert.deepStrictEqual(trailers, [Buffer.from('foo'), Buffer.from('oof')])
+      assert.deepStrictEqual(trailers, { foo: 'oof' })
       resolve()
     })