Merge branch 'moment-warning' into staging

CruGlobal · Dec 21, 2023 · 788d1d3 · 788d1d3
2 parents 9841c7d + 438cdd9
commit 788d1d3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/app/analytics/analytics.factory.js b/src/app/analytics/analytics.factory.js
@@ -204,7 +204,7 @@ const analyticsFactory = /* @ngInject */ function ($window, $timeout, envService
         cart.item[0].attributes.donationType = 'one-time donation'
       } else {
         cart.item[0].attributes.donationType = 'recurring donation'
-        recurringDate = moment(`${moment().year()}-${itemConfig.RECURRING_START_MONTH}-${itemConfig.RECURRING_DAY_OF_MONTH} ${moment().format('h:mm:ss a')}`)
+        recurringDate = moment(`${moment().year()}-${itemConfig.RECURRING_START_MONTH}-${itemConfig.RECURRING_DAY_OF_MONTH}`)
       }
 
       // Set donation frequency

diff --git a/src/app/profile/payment-methods/payment-methods.component.spec.js b/src/app/profile/payment-methods/payment-methods.component.spec.js
@@ -128,6 +128,15 @@ describe('PaymentMethodsComponent', function () {
       expect($ctrl.profileService.getPaymentMethodsWithDonations).toHaveBeenCalled()
       expect($ctrl.$log.error.logs[0]).toEqual(['Error loading payment methods', { data: 'some error' }])
     })
+
+    it('should handle 500 errors differently when loading payment methods', () => {
+      jest.spyOn($ctrl.profileService, 'getPaymentMethodsWithDonations').mockReturnValue(Observable.throw({
+        status: 500
+      }))
+      $ctrl.loadPaymentMethods()
+
+      expect($ctrl.loadingError).toEqual('authentication')
+    })
   })
 
   describe('loadDonorDetails()', () => {