Fixed test cases

Author: sunil-lakshman

.talismanrc

@@ -8,4 +8,6 @@ fileignoreconfig:
   checksum: 5baabd7d2c391648163f9371f0e5e9484f8fb90fa2284cfc378732ec3192c193
 - filename: test/sanity-check/api/stack-test.js
   checksum: 198d5cf7ead33b079249dc3ecdee61a9c57453e93f1073ed0341400983e5aa53
+- filename: lib/stack/index.js
+  checksum: 6aab5edf85efb17951418b4dc4402889cd24c8d786c671185074aeb4d50f0242
 version: ""

lib/stack/globalField/index.js

@@ -10,13 +10,14 @@ import { createReadStream } from 'fs'
  */
 
 export function GlobalField (http, data = {}) {
-  this.stackHeaders = data.stackHeaders
-  if (data.apiVersion) {
-    this.stackHeaders.api_version = data.apiVersion
-  }
-  if (data.branch) {
-    this.stackHeaders.branch = data.branch
+  const rawHeaders = data.stackHeaders || {}
+
+  this.stackHeaders = {
+    ...cloneDeep(rawHeaders),
+    ...(data.apiVersion ? { api_version: data.apiVersion } : {}),
+    ...(data.branch ? { branch: data.branch } : {})
   }
+
   this.urlPath = `/global_fields`
 
   if (data.global_field && data.global_field.uid) {

test/unit/globalField-test.js

@@ -10,7 +10,7 @@ describe('Contentstack GlobalField test', () => {
   it('GlobalField test without uid', (done) => {
     const globalField = makeGlobalField()
     expect(globalField.urlPath).to.be.equal('/global_fields')
-    expect(globalField.stackHeaders).to.be.equal(undefined)
+    expect(globalField.stackHeaders).to.deep.equal({})
     expect(globalField.update).to.be.equal(undefined)
     expect(globalField.delete).to.be.equal(undefined)
     expect(globalField.fetch).to.be.equal(undefined)
@@ -25,10 +25,9 @@ describe('Contentstack GlobalField test', () => {
         ...systemUidMock
       }
     })
-    expect(globalField.urlPath).to.be.equal(
-      `/global_fields/${systemUidMock.uid}`
-    )
-    expect(globalField.stackHeaders).to.be.equal(undefined)
+
+    expect(globalField.urlPath).to.be.equal(`/global_fields/${systemUidMock.uid}`)
+    expect(globalField.stackHeaders).to.deep.equal({})
     expect(globalField.update).to.not.equal(undefined)
     expect(globalField.delete).to.not.equal(undefined)
     expect(globalField.fetch).to.not.equal(undefined)
@@ -218,10 +217,11 @@ describe('Contentstack GlobalField test', () => {
 describe('Contentstack GlobalField test (API Version 3.2)', () => {
   it('GlobalField test without uid', (done) => {
     const globalField = makeGlobalField({
-      stackHeaders: stackHeadersMock,
-      api_version: '3.2' })
-    expect(globalField.urlPath).to.be.equal('/global_fields')
-    expect(globalField.stackHeaders.api_version).to.be.equal('3.2')
+      stackHeaders: { api_key: 'api_key', api_version: '3.2' }
+    })
+
+    expect(globalField.urlPath).to.equal('/global_fields')
+    expect(globalField.stackHeaders.api_version).to.equal('3.2')
     expect(globalField.stackHeaders).to.deep.equal({ api_key: 'api_key', api_version: '3.2' })
     done()
   })
@@ -231,8 +231,7 @@ describe('Contentstack GlobalField test (API Version 3.2)', () => {
       global_field: {
         ...systemUidMock
       },
-      stackHeaders: stackHeadersMock,
-      api_version: '3.2'
+      stackHeaders: { api_key: 'api_key', api_version: '3.2' }
     })
     expect(globalField.urlPath).to.be.equal(
       `/global_fields/${systemUidMock.uid}`
@@ -251,8 +250,7 @@ describe('Contentstack GlobalField test (API Version 3.2)', () => {
       global_field: {
         ...systemUidMock
       },
-      stackHeaders: stackHeadersMock,
-      api_version: '3.2'
+      stackHeaders: { api_key: 'api_key', api_version: '3.2' }
     })
     expect(globalField.urlPath).to.be.equal(
       `/global_fields/${systemUidMock.uid}`