test: test headers merging (#987)

Author: Cafe137

test/integration/stamp.ux.spec.ts

@@ -21,14 +21,14 @@ test('Utils.getAmountForDuration', () => {
 })
 
 test('bee.getStorageCost', async () => {
-  await mocked(async (bee: Bee) => {
+  await mocked(async bee => {
     const bzz = await bee.getStorageCost(Size.fromGigabytes(4), Duration.fromDays(1))
     expect(bzz.toSignificantDigits(3)).toBe('0.192')
   })
 })
 
 test('bee.getDurationExtensionCost', async () => {
-  await mocked(async (bee: Bee) => {
+  await mocked(async bee => {
     const cost = await bee.getDurationExtensionCost(
       'f8b2ad296d64824a8fe51a33ff15fe8668df13a20ad3d4eea4bb97ca600029aa',
       Duration.fromDays(31),
@@ -38,7 +38,7 @@ test('bee.getDurationExtensionCost', async () => {
 })
 
 test('bee.getSizeExtensionCost', async () => {
-  await mocked(async (bee: Bee) => {
+  await mocked(async bee => {
     const cost = await bee.getSizeExtensionCost(
       'f8b2ad296d64824a8fe51a33ff15fe8668df13a20ad3d4eea4bb97ca600029aa',
       Size.fromGigabytes(18),
@@ -76,7 +76,7 @@ test('bee.buyStorage with extensions', async () => {
       'New depth has to be greater than the original depth',
     )
   })
-  expect(calls).toEqual([
+  expect(calls.map(x => `${x.method} ${x.url}`)).toEqual([
     // create stamp
     'GET /chainstate',
     'GET /chainstate',

test/mocks.ts

@@ -77,12 +77,25 @@ responses.set(
   }),
 )
 
-export async function mocked(runnable: (bee: Bee) => Promise<void>): Promise<string[]> {
-  const calls: string[] = []
-  return new Promise((resolve, reject) => {
+responses.set(
+  'POST /bzz?name=filename.txt',
+  JSON.stringify({
+    reference: 'f8b2ad296d64824a8fe51a33ff15fe8668df13a20ad3d4eea4bb97ca600029aa',
+  }),
+)
+
+interface MockedCall {
+  method: string
+  url: string
+  headers: Record<string, string | string[] | undefined>
+}
+
+export async function mocked(runnable: (bee: Bee) => Promise<void>): Promise<MockedCall[]> {
+  const calls: MockedCall[] = []
+  return new Promise(resolve => {
     const server = createServer((req, res) => {
       const identifier = (req.method || 'GET') + ' ' + (req.url || '/')
-      calls.push(identifier)
+      calls.push({ method: req.method || 'GET', url: req.url || '/', headers: req.headers })
       const response = responses.get(identifier)
       if (!response) {
         res.end('Not found - ' + identifier)

test/regression/bee-js-986.spec.ts

@@ -0,0 +1,59 @@
+import { mocked } from '../mocks'
+import { batch } from '../utils'
+
+test('bee-js/986 - Headers not merging properly', async () => {
+  const calls = await mocked(async bee => {
+    await bee.uploadFile(
+      batch(),
+      'Does not matter',
+      'filename.txt',
+      { act: true, tag: 1337, encrypt: true },
+      { headers: {} },
+    )
+    await bee.uploadFile(
+      batch(),
+      'Does not matter',
+      'filename.txt',
+      { act: true, tag: 1338, encrypt: true },
+      {
+        headers: {
+          arbitrary: 'value',
+        },
+      },
+    )
+  })
+  expect(calls).toHaveLength(2)
+  expect(calls[0]).toEqual({
+    headers: {
+      accept: 'application/json, text/plain, */*',
+      connection: 'keep-alive',
+      'content-length': '15',
+      'content-type': 'application/x-www-form-urlencoded',
+      host: 'localhost:11633',
+      'swarm-act': 'true',
+      'swarm-encrypt': 'true',
+      'swarm-postage-batch-id': 'f8b2ad296d64824a8fe51a33ff15fe8668df13a20ad3d4eea4bb97ca600029aa',
+      'swarm-tag': '1337',
+      'user-agent': 'axios/0.28.1',
+    },
+    method: 'POST',
+    url: '/bzz?name=filename.txt',
+  })
+  expect(calls[1]).toEqual({
+    headers: {
+      accept: 'application/json, text/plain, */*',
+      arbitrary: 'value',
+      connection: 'keep-alive',
+      'content-length': '15',
+      'content-type': 'application/x-www-form-urlencoded',
+      host: 'localhost:11633',
+      'swarm-act': 'true',
+      'swarm-encrypt': 'true',
+      'swarm-postage-batch-id': 'f8b2ad296d64824a8fe51a33ff15fe8668df13a20ad3d4eea4bb97ca600029aa',
+      'swarm-tag': '1338',
+      'user-agent': 'axios/0.28.1',
+    },
+    method: 'POST',
+    url: '/bzz?name=filename.txt',
+  })
+})