Merge pull request #1063 from CruGlobal/fix-aem-nodes

Replace give2 with give
CruGlobal · Oct 24, 2023 · a2a4fe4 · a2a4fe4
2 parents 94cf7d0 + 79891fe
commit a2a4fe4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/app/designationEditor/designationEditor.component.js b/src/app/designationEditor/designationEditor.component.js
@@ -374,9 +374,9 @@ class DesignationEditorController {
 
     if (vanityPath) {
       if (isArray(vanityPath)) {
-        return `${vanityPath[0].replace('/content/give2/us/en', '')}${cacheBust}`
+        return `${vanityPath[0].replace('/content/give/us/en', '')}${cacheBust}`
       } else {
-        return `${vanityPath.replace('/content/give2/us/en', '')}${cacheBust}`
+        return `${vanityPath.replace('/content/give/us/en', '')}${cacheBust}`
       }
     } else {
       return `/${this.designationNumber}${cacheBust}`

diff --git a/src/app/designationEditor/designationEditor.spec.js b/src/app/designationEditor/designationEditor.spec.js
@@ -599,13 +599,13 @@ describe('Designation Editor', function () {
 
     it('should return the first vanity url', () => {
       $ctrl.designationContent = designationSecurityResponse
-      $ctrl.designationContent['sling:vanityPath'] = [`/content/give2/us/en/${designationNumber}`]
+      $ctrl.designationContent['sling:vanityPath'] = [`/content/give/us/en/${designationNumber}`]
       expect($ctrl.getDoneEditingUrl()).toEqual(`/${designationNumber}${cacheBust}`)
     })
 
     it('should return the only vanity url', () => {
       $ctrl.designationContent = designationSecurityResponse
-      $ctrl.designationContent['sling:vanityPath'] = `/content/give2/us/en/${designationNumber}`
+      $ctrl.designationContent['sling:vanityPath'] = `/content/give/us/en/${designationNumber}`
       expect($ctrl.getDoneEditingUrl()).toEqual(`/${designationNumber}${cacheBust}`)
     })
 

diff --git a/src/common/services/api/designations.service.js b/src/common/services/api/designations.service.js
@@ -199,8 +199,8 @@ class DesignationsService {
     const [designationNumber] = code.split('_')
 
     return campaignPage
-      ? `/content/give2/us/en/campaigns/${c}/${designationNumber}/${campaignPage}.infinity.json`
-      : `/content/give2/us/en/designations/${c}/${designationNumber}.infinity.json`
+      ? `/content/give/us/en/campaigns/${c}/${designationNumber}/${campaignPage}.infinity.json`
+      : `/content/give/us/en/designations/${c}/${designationNumber}.infinity.json`
   }
 
   suggestedAmounts (code, itemConfig) {

diff --git a/src/common/services/api/designations.service.spec.js b/src/common/services/api/designations.service.spec.js
@@ -143,7 +143,7 @@ describe('designation service', () => {
   describe('suggestedAmounts', () => {
     it('should load suggested amounts', () => {
       const itemConfig = { amount: 50, 'campaign-page': 9876 }
-      self.$httpBackend.expectGET('https://give-stage2.cru.org/content/give2/us/en/campaigns/0/1/2/3/4/0123456/9876.infinity.json')
+      self.$httpBackend.expectGET('https://give-stage2.cru.org/content/give/us/en/campaigns/0/1/2/3/4/0123456/9876.infinity.json')
         .respond(200, campaignResponse)
       self.designationsService.suggestedAmounts('0123456', itemConfig)
         .subscribe(suggestedAmounts => {
@@ -160,7 +160,7 @@ describe('designation service', () => {
 
     it('should handle an invalid campaign page', () => {
       const itemConfig = { amount: 50, 'campaign-page': 9876 }
-      self.$httpBackend.expectGET('https://give-stage2.cru.org/content/give2/us/en/campaigns/0/1/2/3/4/0123456/9876.infinity.json')
+      self.$httpBackend.expectGET('https://give-stage2.cru.org/content/give/us/en/campaigns/0/1/2/3/4/0123456/9876.infinity.json')
         .respond(400, {})
       self.designationsService.suggestedAmounts('0123456', itemConfig)
         .subscribe(suggestedAmounts => {
@@ -173,7 +173,7 @@ describe('designation service', () => {
 
     it('should handle no campaign page', () => {
       const itemConfig = { amount: 50 }
-      self.$httpBackend.expectGET('https://give-stage2.cru.org/content/give2/us/en/designations/0/1/2/3/4/0123456.infinity.json')
+      self.$httpBackend.expectGET('https://give-stage2.cru.org/content/give/us/en/designations/0/1/2/3/4/0123456.infinity.json')
         .respond(200, designationResponse)
       self.designationsService.suggestedAmounts('0123456', itemConfig)
         .subscribe(suggestedAmounts => {
@@ -187,7 +187,7 @@ describe('designation service', () => {
 
   describe('facebookPixel', () => {
     it('should load facebook pixel id from JCR', () => {
-      self.$httpBackend.expectGET('https://give-stage2.cru.org/content/give2/us/en/designations/0/1/2/3/4/0123456.infinity.json')
+      self.$httpBackend.expectGET('https://give-stage2.cru.org/content/give/us/en/designations/0/1/2/3/4/0123456.infinity.json')
         .respond(200, designationResponse)
       self.designationsService.facebookPixel('0123456')
         .subscribe(pixelId => {
@@ -199,7 +199,7 @@ describe('designation service', () => {
 
   describe('givingLinks', () => {
     it('should load givingLinks from JCR', () => {
-      self.$httpBackend.expectGET('https://give-stage2.cru.org/content/give2/us/en/designations/0/1/2/3/4/0123456.infinity.json')
+      self.$httpBackend.expectGET('https://give-stage2.cru.org/content/give/us/en/designations/0/1/2/3/4/0123456.infinity.json')
         .respond(200, designationResponse)
       self.designationsService.givingLinks('0123456')
         .subscribe(givingLinks => {
@@ -216,30 +216,30 @@ describe('designation service', () => {
       const productCode = '0123456'
 
       const path = self.designationsService.generatePath(productCode)
-      expect(path).toEqual('/content/give2/us/en/designations/0/1/2/3/4/0123456.infinity.json')
+      expect(path).toEqual('/content/give/us/en/designations/0/1/2/3/4/0123456.infinity.json')
     })
 
     it('should return the proper path for one time gift to campaign', () => {
       const productCode = '0123456'
       const campaignPage = 'some-campaign'
 
       const path = self.designationsService.generatePath(productCode, campaignPage)
-      expect(path).toEqual('/content/give2/us/en/campaigns/0/1/2/3/4/0123456/some-campaign.infinity.json')
+      expect(path).toEqual('/content/give/us/en/campaigns/0/1/2/3/4/0123456/some-campaign.infinity.json')
     })
 
     it('should return the proper path for recurring gift to non-campaign', () => {
       const productCode = '0123456_mon'
 
       const path = self.designationsService.generatePath(productCode)
-      expect(path).toEqual('/content/give2/us/en/designations/0/1/2/3/4/0123456.infinity.json')
+      expect(path).toEqual('/content/give/us/en/designations/0/1/2/3/4/0123456.infinity.json')
     })
 
     it('should return the proper path for recurring gift to campaign', () => {
       const productCode = '0123456_mon'
       const campaignPage = 'some-campaign'
 
       const path = self.designationsService.generatePath(productCode, campaignPage)
-      expect(path).toEqual('/content/give2/us/en/campaigns/0/1/2/3/4/0123456/some-campaign.infinity.json')
+      expect(path).toEqual('/content/give/us/en/campaigns/0/1/2/3/4/0123456/some-campaign.infinity.json')
     })
   })