Skip to content

Commit

Permalink
Merge branch 'master' into update-staging
Browse files Browse the repository at this point in the history
canac authored Jan 8, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 74a49ba + 73af65d commit 929dabd
Showing 3 changed files with 19 additions and 3 deletions.
6 changes: 5 additions & 1 deletion src/app/profile/payment-methods/payment-methods.component.js
Original file line number Diff line number Diff line change
@@ -79,7 +79,11 @@ class PaymentMethodsController {
},
error => {
this.loading = false
this.loadingError = true
if (error.status === 500) {
this.loadingError = 'authentication'
} else {
this.loadingError = true
}
this.$log.error('Error loading payment methods', error)
}
)
Original file line number Diff line number Diff line change
@@ -99,6 +99,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()', () => {
7 changes: 5 additions & 2 deletions src/app/profile/payment-methods/payment-methods.tpl.html
Original file line number Diff line number Diff line change
@@ -22,8 +22,11 @@ <h3 translate>Your Payment Methods</h3>
<loading ng-if="$ctrl.loading" class="mb">
<translate>Loading payment methods...</translate>
</loading>
<div class="alert alert-danger" role="alert" ng-if="$ctrl.loadingError" translate>
There was an error loading your payment methods. You may <a href="" ng-click="$ctrl.loadPaymentMethods()">try again</a>.
<div class="alert alert-danger" role="alert" ng-if="$ctrl.loadingError === true">
<span translate>There was an error loading your payment methods. You may</span> <a href="" ng-click="$ctrl.loadPaymentMethods()" translate>try again</a>.
</div>
<div class="alert alert-danger" role="alert" ng-if="$ctrl.loadingError === 'authentication'" translate>
There was an error loading your payment methods. Please log out and log in again.
</div>
<div class="alert alert-warning" role="alert" ng-if="!$ctrl.loading && !$ctrl.loadingError && $ctrl.paymentMethods.length === 0" translate>
You haven't added any payment methods. Feel free to add one.

0 comments on commit 929dabd

Please sign in to comment.