diff options
| -rw-r--r-- | app/assets/javascripts/diff.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/gpg_badges.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/gpg_badges_spec.js | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js index b26422ab725..3ab8f3ab7ad 100644 --- a/app/assets/javascripts/diff.js +++ b/app/assets/javascripts/diff.js @@ -72,7 +72,6 @@ export default class Diff { const view = file.data('view'); const params = { since, to, bottom, offset, unfold, view }; - // $.get(link, params, response => $target.parent().replaceWith(response)); axios.get(link, { params }) .then(({ data }) => $target.parent().replaceWith(data)) .catch(() => flash(__('An error occurred while loading diff'))); diff --git a/app/assets/javascripts/gpg_badges.js b/app/assets/javascripts/gpg_badges.js index 11adf4d2826..5e17ee7d32d 100644 --- a/app/assets/javascripts/gpg_badges.js +++ b/app/assets/javascripts/gpg_badges.js @@ -16,6 +16,6 @@ export default class GpgBadges { badges.filter(`[data-commit-sha="${signature.commit_sha}"]`).replaceWith(signature.html); }); }) - .catch(() => flash(__('An error occurred while loading comm'))); + .catch(() => flash(__('An error occurred while loading commits'))); } } diff --git a/spec/javascripts/gpg_badges_spec.js b/spec/javascripts/gpg_badges_spec.js index d739cd55ef3..5decb5e6bbd 100644 --- a/spec/javascripts/gpg_badges_spec.js +++ b/spec/javascripts/gpg_badges_spec.js @@ -40,7 +40,7 @@ describe('GpgBadges', () => { const spinners = document.querySelectorAll('.js-loading-gpg-badge i.fa.fa-spinner.fa-spin'); expect(spinners.length).toBe(1); done(); - }).catch(err => done(err)); + }).catch(done.fail); }); it('replaces the loading spinner', (done) => { @@ -51,6 +51,6 @@ describe('GpgBadges', () => { const parentContainer = document.querySelector('.parent-container'); expect(parentContainer.innerHTML.trim()).toEqual(dummyBadgeHtml); done(); - }).catch(err => done(err)); + }).catch(done.fail); }); }); |