fix: improve bulk operations and branch test reliability

- Improve authentication handling for bulk job status API
- Add better error handling for branch creation
- Skip dependent tests gracefully if resource creation fails
- Increase wait time after branch creation for API propagation

Author: AniketDev7

.talismanrc

@@ -94,7 +94,7 @@ fileignoreconfig:
   - filename: test/sanity-check/api/contentType-test.js
     checksum: 4d5178998f9f3c27550c5bd21540e254e08f79616e8615e7256ba2175cb4c8e1
   - filename: test/sanity-check/api/bulkOperation-test.js
-    checksum: de04ca2633fdfe080bd0d7e810bb2a7f47b8d59d321ced88d2ac67dcdfe60003
+    checksum: 29321d383af277bfac4b2db4a52bc9f5e3db67d1333f9ca65fbc4d1bc1ba6f0a
   - filename: test/sanity-check/api/entry-test.js
     checksum: 9dc16b404a98ff9fa2c164fad0182b291b9c338dd58558dc5ef8dd75cf18bc1f
   - filename: test/sanity-check/api/entryVariants-test.js

test/sanity-check/api/branch-test.js

@@ -36,9 +36,10 @@ describe('Branch API Tests', () => {
   // ==========================================================================
 
   describe('Branch CRUD Operations', () => {
-    // Branch UID must be max 15 chars
-    const devBranchUid = `dev${shortId()}`
+    // Branch UID must be max 15 chars, only lowercase and numbers
+    let devBranchUid = `dev${shortId()}`
     let createdBranch
+    let branchCreated = false
 
     after(async () => {
       // NOTE: Deletion removed - branches persist for other tests
@@ -72,32 +73,60 @@ describe('Branch API Tests', () => {
         }
       }
 
-      // SDK returns the branch object directly
-      const branch = await stack.branch().create(branchData)
-
-      expect(branch).to.be.an('object')
-      expect(branch.uid).to.be.a('string')
-      validateBranchResponse(branch)
-
-      expect(branch.uid).to.equal(devBranchUid)
-      expect(branch.source).to.equal('main')
-
-      createdBranch = branch
-      testData.branches.development = branch
-      
-      // Wait for branch to be fully ready
-      await wait(2000)
+      try {
+        // SDK returns the branch object directly
+        const branch = await stack.branch().create(branchData)
+
+        expect(branch).to.be.an('object')
+        expect(branch.uid).to.be.a('string')
+        validateBranchResponse(branch)
+
+        expect(branch.uid).to.equal(devBranchUid)
+        expect(branch.source).to.equal('main')
+
+        createdBranch = branch
+        branchCreated = true
+        testData.branches.development = branch
+        
+        // Wait for branch to be fully ready
+        await wait(3000)
+      } catch (error) {
+        // If branch already exists (409), try to fetch it
+        if (error.status === 409 || (error.errorMessage && error.errorMessage.includes('already exists'))) {
+          console.log(`  Branch ${devBranchUid} already exists, fetching it`)
+          const existing = await stack.branch(devBranchUid).fetch()
+          createdBranch = existing
+          branchCreated = true
+          testData.branches.development = existing
+        } else {
+          console.log('  Branch creation failed:', error.errorMessage || error.message)
+          throw error
+        }
+      }
     })
 
     it('should fetch the created branch', async function () {
       this.timeout(15000)
+      
+      if (!branchCreated) {
+        console.log('  Skipping - branch was not created')
+        this.skip()
+        return
+      }
+      
       const response = await stack.branch(devBranchUid).fetch()
 
       expect(response).to.be.an('object')
       expect(response.uid).to.equal(devBranchUid)
     })
 
-    it('should validate branch response structure', async () => {
+    it('should validate branch response structure', async function () {
+      if (!branchCreated) {
+        console.log('  Skipping - branch was not created')
+        this.skip()
+        return
+      }
+      
       const branch = await stack.branch(devBranchUid).fetch()
 
       expect(branch.uid).to.be.a('string')

test/sanity-check/api/bulkOperation-test.js

@@ -363,39 +363,53 @@ describe('Bulk Operations API Tests', () => {
       console.log(`  Waiting for bulk jobs to be processed. Job IDs collected: ${jobIds.length}`)
       await wait(15000)
 
-      // Create a management token for job status (required by API)
-      try {
-        const tokenResponse = await stack.managementToken().create({
-          token: {
-            name: `Bulk Job Status Token ${Date.now()}`,
-            description: 'Token for bulk job status checks',
-            scope: [{
-              module: 'bulk_task',
-              acl: { read: true }
-            }],
-            expires_on: new Date(Date.now() + 24 * 60 * 60 * 1000).toISOString() // 24 hours
-          }
-        })
-        managementTokenValue = tokenResponse.token
-        managementTokenUid = tokenResponse.uid
-        console.log('  Created management token for job status')
+      // Use existing management token from env if provided, otherwise try to create one
+      if (process.env.MANAGEMENT_TOKEN) {
+        console.log('  Using existing management token from MANAGEMENT_TOKEN env variable')
+        managementTokenValue = process.env.MANAGEMENT_TOKEN
+        managementTokenUid = null // Not created, so no need to delete
 
         // Create stack client with management token
         const clientForMgmt = contentstackClient()
         stackWithMgmtToken = clientForMgmt.stack({ 
           api_key: process.env.API_KEY, 
           management_token: managementTokenValue 
         })
-      } catch (e) {
-        console.log('  Could not create management token:', e.errorMessage || e.message)
-        // Fall back to regular stack
-        stackWithMgmtToken = stack
+      } else {
+        // Create a management token for job status (required by API)
+        try {
+          const tokenResponse = await stack.managementToken().create({
+            token: {
+              name: `Bulk Job Status Token ${Date.now()}`,
+              description: 'Token for bulk job status checks',
+              scope: [{
+                module: 'bulk_task',
+                acl: { read: true }
+              }],
+              expires_on: new Date(Date.now() + 24 * 60 * 60 * 1000).toISOString() // 24 hours
+            }
+          })
+          managementTokenValue = tokenResponse.token
+          managementTokenUid = tokenResponse.uid
+          console.log('  Created management token for job status')
+          
+          // Create stack client with management token
+          const clientForMgmt = contentstackClient()
+          stackWithMgmtToken = clientForMgmt.stack({ 
+            api_key: process.env.API_KEY, 
+            management_token: managementTokenValue 
+          })
+        } catch (e) {
+          console.log('  Could not create management token:', e.errorMessage || e.message)
+          // Fall back to regular stack
+          stackWithMgmtToken = stack
+        }
       }
     })
 
     after(async function () {
       this.timeout(15000)
-      // Delete the management token
+      // Only delete management token if we created it (not from env)
       if (managementTokenUid) {
         try {
           await stack.managementToken(managementTokenUid).delete()