refactor: changed URL for compare and merge from api to v3 [CS-36688]

Author: nadeem-cs

lib/stack/branch/compare.js

@@ -6,7 +6,7 @@ import { get } from '../../entity'
  */
 export function Compare (http, data = {}) {
   this.stackHeaders = data.stackHeaders
-  this.urlPath = `/compare`
+  this.urlPath = `/stacks/branches/compare`
 
   /**
      * @description List of content types and global fields that exist in only one branch or are different between the two branches.

lib/stack/branch/index.js

@@ -134,7 +134,7 @@ export function Branch (http, data = {}) {
      * client.stack({ api_key: 'api_key'}).branch().merge(mergeObj, params)
      */
     this.merge = async (mergeObj, params) => {
-      const url = '/merge';
+      const url = '/stacks/branches/merge';
       const header = { 
         headers: { ...cloneDeep(this.stackHeaders)},
         params: params

lib/stack/branch/mergeQueue.js

@@ -2,7 +2,7 @@ import { get } from '../../entity'
 
 export function MergeQueue (http, data = {}) {
   this.stackHeaders = data.stackHeaders
-  this.urlPath = `/merge-queue`
+  this.urlPath = `/stacks/branches/merge-queue`
 
   if (data.uid) {
     /**

test/api/branch-test.js

@@ -129,7 +129,7 @@ describe('Branch api Test', () => {
       .catch(done)
   })
 
-  it('Should list differences for a single content type between two branches', done => {
+  it('Should list differences for a content types between two branches', done => {
     makeBranch(branch.uid)
       .compare(devBranch.uid)
       .contentTypes()
@@ -141,7 +141,7 @@ describe('Branch api Test', () => {
       .catch(done)
   })
 
-  it('Should list differences for a single global field between two branches', done => {
+  it('Should list differences for a global fields between two branches', done => {
     makeBranch(branch.uid)
       .compare(devBranch.uid)
       .globalFields()
@@ -202,14 +202,15 @@ describe('Branch api Test', () => {
       .catch(done)
   })
 
-  it('Should list all recent merge jobs', done => {
+  it('Should list details of merge job when job uid is passed', done => {
     const mergeJobUid = 'db7bf199-2a9d-4c2c-99d5-72453f70fb40'
     makeBranch()
       .mergeQueue(mergeJobUid)
       .fetch()
       .then((response) => {
-        expect(response.branches.base_branch).to.be.equal(branch.uid)
-        expect(response.branches.compare_branch).to.be.equal(devBranch.uid)
+        expect(response.queue).to.not.equal(undefined)
+        expect(response.queue[0].merge_details.base_branch).to.be.equal(branch.uid)
+        expect(response.queue[0].merge_details.compare_branch).to.be.equal(devBranch.uid)
         done()
       })
       .catch(done)

test/utility/ContentstackClient.js

@@ -2,7 +2,7 @@ import * as contentstack from '../../lib/contentstack.js'
 import dotenv from 'dotenv'
 dotenv.config()
 function contentstackClient (authtoken = null) {
-  var params = { host: process.env.HOST, version: process.env.VERSION || 'v3', defaultHostName: process.env.DEFAULTHOST }
+  var params = { host: process.env.HOST, defaultHostName: process.env.DEFAULTHOST }
   if (authtoken) {
     params.authtoken = authtoken
   }