fix(sanity): asset/bulk AM 2.0, branch merge, testHelpers

- asset-test: allow am/blt UID format; stop deleting HTML/bufferUpload
  per test so bulk has valid assets
- branch-test: use stack.branch().mergeQueue()/merge() correctly; 10s
  wait; store branches in testData; handle 409 on create
- bulkOperation-test: require assets via assetsWithValidUids(), fail
  when none (no skip)
- testHelpers: validateAssetResponse accepts (blt|am) UID prefix
- .talismanrc: update bulkOperation-test.js checksum

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: 1721c0e0f5b79a46fba21bfbedc3a87db4715bc97cd064f2361d35ab453b890c
+    checksum: 8dd642da1152d84eeb949022c6b25bbd8b0e43b4399a37f06af786aa3139cd88
   - filename: test/sanity-check/api/entry-test.js
     checksum: 9dc16b404a98ff9fa2c164fad0182b291b9c338dd58558dc5ef8dd75cf18bc1f
   - filename: test/sanity-check/api/entryVariants-test.js

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

@@ -84,11 +84,7 @@ describe('Asset API Tests', () => {
       expect(asset.content_type).to.include('html')
 
       testData.assets.html = asset
-
-      // Cleanup
-      try {
-        await stack.asset(asset.uid).delete()
-      } catch (e) { }
+      // Do not delete: bulk operation tests depend on this asset (Phase 21)
     })
 
     it('should upload asset from buffer', async function () {
@@ -114,11 +110,7 @@ describe('Asset API Tests', () => {
       expect(asset.content_type).to.be.a('string')
 
       testData.assets.bufferUpload = asset
-
-      // Cleanup
-      try {
-        await stack.asset(asset.uid).delete()
-      } catch (e) { }
+      // Do not delete: bulk operation tests depend on this asset (Phase 21)
     })
 
     it('should fail to upload without file', async () => {
@@ -187,7 +179,7 @@ describe('Asset API Tests', () => {
       const asset = await stack.asset(assetUid).fetch()
 
       // Required fields
-      expect(asset.uid).to.be.a('string').and.match(/^blt[a-f0-9]+$/)
+      expect(asset.uid).to.be.a('string').and.match(/^(blt|am)[a-f0-9]+$/)
       expect(asset.filename).to.be.a('string')
       expect(asset.url).to.be.a('string')
       expect(asset.content_type).to.be.a('string')

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

@@ -12,7 +12,7 @@
 import { expect } from 'chai'
 import { describe, it, before, after } from 'mocha'
 import { contentstackClient } from '../utility/ContentstackClient.js'
-import { validateBranchResponse, testData, wait, shortId, trackedExpect } from '../utility/testHelpers.js'
+import { validateBranchResponse, testData, wait, shortId, trackedExpect, LONG_DELAY } from '../utility/testHelpers.js'
 
 describe('Branch API Tests', () => {
   let client
@@ -76,8 +76,8 @@ describe('Branch API Tests', () => {
         branchCreated = true
         testData.branches.development = branch
 
-        // Wait for branch to be fully ready
-        await wait(3000)
+        // Wait for branch to be fully ready (can take 10+ seconds to reflect)
+        await wait(LONG_DELAY)
       } catch (error) {
         // If branch already exists (409), try to fetch it
         if (error.status === 409 || (error.errorMessage && error.errorMessage.includes('already exists'))) {
@@ -135,20 +135,26 @@ describe('Branch API Tests', () => {
 
     before(async function () {
       this.timeout(60000)
-      // Create a branch for comparison
+      // Create a branch for comparison (uid stored for dependent tests)
       compareBranchUid = `cmp${shortId()}`
 
       try {
-        await stack.branch().create({
+        const branch = await stack.branch().create({
           branch: {
             uid: compareBranchUid,
             source: 'main'
           }
         })
-        // Wait for branch to be fully ready before compare operations
-        await wait(2000)
+        testData.branches.compare = branch
+        // Wait for branch to be fully ready (can take 10+ seconds to reflect)
+        await wait(LONG_DELAY)
       } catch (error) {
-        console.log('Branch creation failed:', error.errorMessage)
+        if (error.status === 409 || (error.errorMessage && error.errorMessage.includes('already exists'))) {
+          const existing = await stack.branch(compareBranchUid).fetch()
+          testData.branches.compare = existing
+        } else {
+          console.log('Branch creation failed:', error.message || error.errorMessage)
+        }
       }
     })
 
@@ -206,20 +212,26 @@ describe('Branch API Tests', () => {
 
     before(async function () {
       this.timeout(60000)
-      // Create a branch for merging
+      // Create a branch for merging (uid stored in testData.branches.merge for dependent tests)
       mergeBranchUid = `mrg${shortId()}`
 
       try {
-        await stack.branch().create({
+        const branch = await stack.branch().create({
           branch: {
             uid: mergeBranchUid,
             source: 'main'
           }
         })
-        // Wait for branch to be fully ready before merge operations
-        await wait(2000)
+        testData.branches.merge = branch
+        // Wait for branch to be fully ready (can take 10+ seconds to reflect)
+        await wait(LONG_DELAY)
       } catch (error) {
-        console.log('Branch creation failed:', error.errorMessage)
+        if (error.status === 409 || (error.errorMessage && error.errorMessage.includes('already exists'))) {
+          const existing = await stack.branch(mergeBranchUid).fetch()
+          testData.branches.merge = existing
+        } else {
+          console.log('Branch creation failed:', error.message || error.errorMessage)
+        }
       }
     })
 
@@ -228,30 +240,31 @@ describe('Branch API Tests', () => {
     })
 
     it('should get merge queue', async () => {
-      try {
-        const response = await stack.branch(mergeBranchUid).mergeQueue()
-
-        expect(response).to.be.an('object')
-      } catch (error) {
-        console.log('Merge queue failed:', error.errorMessage)
+      // mergeQueue() is on the branch collection, not on a branch instance
+      const response = await stack.branch().mergeQueue().find()
+      expect(response).to.be.an('object')
+      if (response.queue) {
+        expect(response.queue).to.be.an('array')
       }
     })
 
-    it('should merge branch into main (dry run conceptual)', async () => {
-      // Note: Actual merge requires changes in the branch
-      // This tests the merge API availability
-      try {
-        const response = await stack.branch(mergeBranchUid).merge({
-          base_branch: 'main',
-          compare_branch: mergeBranchUid,
-          default_merge_strategy: 'merge_prefer_base',
-          merge_comment: 'Test merge'
-        })
-
-        expect(response).to.be.an('object')
-      } catch (error) {
-        // Merge might fail if no changes or conflicts
-        console.log('Merge result:', error.errorMessage)
+    it('should merge branch into main', async () => {
+      // merge() is on the branch collection: merge(mergeObj, params)
+      // mergeObj = request body (e.g. item_merge_strategies), params = query (base_branch, compare_branch, etc.)
+      const params = {
+        base_branch: 'main',
+        compare_branch: mergeBranchUid,
+        default_merge_strategy: 'merge_prefer_base',
+        merge_comment: 'Test merge'
+      }
+      const response = await stack.branch().merge({}, params)
+      expect(response).to.be.an('object')
+      // API may return merge_details, errors, or notice depending on whether there were changes to merge
+      if (response.merge_details !== undefined) {
+        expect(response.merge_details).to.be.an('object')
+      }
+      if (response.notice) {
+        expect(response.notice).to.be.a('string')
       }
     })
   })

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

@@ -34,6 +34,12 @@ function delay (ms) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
 
+// Build assets array with only non-empty UIDs (never send "uid": "" — API returns 412).
+// Asset-test must not delete image/html/bufferUpload so bulk tests have valid assets (Phase 6 before Phase 21).
+function assetsWithValidUids () {
+  return [assetUid1, assetUid2].filter(uid => uid && String(uid).trim()).map(uid => ({ uid }))
+}
+
 async function waitForJobReady (jobId, maxAttempts = 10) {
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
     try {
@@ -110,16 +116,12 @@ describe('BulkOperation api test', () => {
       .catch(done)
   })
 
-  it('should publish one asset when publishDetails of an asset is passed', done => {
+  it('should publish one asset when publishDetails of an asset is passed', function (done) {
+    const assets = assetsWithValidUids()
+    expect(assets.length, 'At least one asset required from asset-test (Phase 6)').to.be.at.least(1)
     const publishDetails = {
-      assets: [
-        {
-          uid: assetUid1
-        }
-      ],
-      locales: [
-        'en-us'
-      ],
+      assets,
+      locales: ['en-us'],
       environments: [envName]
     }
     doBulkOperation()
@@ -136,28 +138,11 @@ describe('BulkOperation api test', () => {
   it('should publish multiple entries assets when publishDetails of entries and assets are passed', done => {
     const publishDetails = {
       entries: [
-        {
-          uid: entryUid1,
-          content_type: bulkCtUid1,
-          locale: 'en-us'
-        },
-        {
-          uid: entryUid2,
-          content_type: bulkCtUid2,
-          locale: 'en-us'
-        }
-      ],
-      assets: [
-        {
-          uid: assetUid1
-        },
-        {
-          uid: assetUid2
-        }
-      ],
-      locales: [
-        'en-us'
+        { uid: entryUid1, content_type: bulkCtUid1, locale: 'en-us' },
+        { uid: entryUid2, content_type: bulkCtUid2, locale: 'en-us' }
       ],
+      assets: assetsWithValidUids(),
+      locales: ['en-us'],
       environments: [envName]
     }
     doBulkOperation()
@@ -231,16 +216,12 @@ describe('BulkOperation api test', () => {
       .catch(done)
   })
 
-  it('should publish assets with publishAllLocalized parameter', done => {
+  it('should publish assets with publishAllLocalized parameter', function (done) {
+    const assets = assetsWithValidUids()
+    expect(assets.length, 'At least one asset required from asset-test (Phase 6)').to.be.at.least(1)
     const publishDetails = {
-      assets: [
-        {
-          uid: assetUid1
-        }
-      ],
-      locales: [
-        'en-us'
-      ],
+      assets,
+      locales: ['en-us'],
       environments: [envName]
     }
     doBulkOperation()
@@ -319,16 +300,12 @@ describe('BulkOperation api test', () => {
       .catch(done)
   })
 
-  it('should unpublish assets with unpublishAllLocalized parameter', done => {
+  it('should unpublish assets with unpublishAllLocalized parameter', function (done) {
+    const assets = assetsWithValidUids()
+    expect(assets.length, 'At least one asset required from asset-test (Phase 6)').to.be.at.least(1)
     const unpublishDetails = {
-      assets: [
-        {
-          uid: assetUid1
-        }
-      ],
-      locales: [
-        'en-us'
-      ],
+      assets,
+      locales: ['en-us'],
       environments: [envName]
     }
     doBulkOperation()

test/sanity-check/utility/testHelpers.js

@@ -131,8 +131,8 @@ export function validateAssetResponse (response) {
   expect(response.content_type).to.be.a('string')
   expect(response.file_size).to.be.a('string')
 
-  // Validate UID format
-  expect(response.uid).to.match(/^blt[a-f0-9]+$/, 'Asset UID should have blt prefix')
+  // Validate UID format (CMA: blt prefix; AM 2.0: am prefix)
+  expect(response.uid).to.match(/^(blt|am)[a-f0-9]+$/, 'Asset UID should have blt or am prefix')
 
   // Validate timestamps
   expect(response.created_at).to.be.a('string')