Merge branch 'ph-ajax-into-axios' into 'master'

More $.ajax conversions to axios

See merge request gitlab-org/gitlab-ce!16761

8 files changed, 180 insertions, 143 deletions

diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js
index 64f258aed64..15df7a7f989 100644
--- a/app/assets/javascripts/gl_dropdown.js
+++ b/app/assets/javascripts/gl_dropdown.js
@@ -2,6 +2,7 @@
 /* global fuzzaldrinPlus */
 import _ from 'underscore';
 import fuzzaldrinPlus from 'fuzzaldrin-plus';
+import axios from './lib/utils/axios_utils';
 import { visitUrl } from './lib/utils/url_utility';
 import { isObject } from './lib/utils/type_utility';
 
@@ -212,25 +213,17 @@ GitLabDropdownRemote = (function() {
   };
 
   GitLabDropdownRemote.prototype.fetchData = function() {
-    return $.ajax({
-      url: this.dataEndpoint,
-      dataType: this.options.dataType,
-      beforeSend: (function(_this) {
-        return function() {
-          if (_this.options.beforeSend) {
-            return _this.options.beforeSend();
-          }
-        };
-      })(this),
-      success: (function(_this) {
-        return function(data) {
-          if (_this.options.success) {
-            return _this.options.success(data);
-          }
-        };
-      })(this)
-    });
-  // Fetch the data through ajax if the data is a string
+    if (this.options.beforeSend) {
+      this.options.beforeSend();
+    }
+
+    // Fetch the data through ajax if the data is a string
+    return axios.get(this.dataEndpoint)
+      .then(({ data }) => {
+        if (this.options.success) {
+          return this.options.success(data);
+        }
+      });
   };
 
   return GitLabDropdownRemote;
diff --git a/app/assets/javascripts/graphs/graphs_show.js b/app/assets/javascripts/graphs/graphs_show.js
index 36bad6db3e1..b670e907a5c 100644
--- a/app/assets/javascripts/graphs/graphs_show.js
+++ b/app/assets/javascripts/graphs/graphs_show.js
@@ -1,11 +1,13 @@
+import flash from '../flash';
+import { __ } from '../locale';
+import axios from '../lib/utils/axios_utils';
 import ContributorsStatGraph from './stat_graph_contributors';
 
 document.addEventListener('DOMContentLoaded', () => {
-  $.ajax({
-    type: 'GET',
-    url: document.querySelector('.js-graphs-show').dataset.projectGraphPath,
-    dataType: 'json',
-    success(data) {
+  const url = document.querySelector('.js-graphs-show').dataset.projectGraphPath;
+
+  axios.get(url)
+    .then(({ data }) => {
       const graph = new ContributorsStatGraph();
       graph.init(data);
 
@@ -16,6 +18,6 @@ document.addEventListener('DOMContentLoaded', () => {
 
       $('.stat-graph').fadeIn();
       $('.loading-graph').hide();
-    },
-  });
+    })
+    .catch(() => flash(__('Error fetching contributors data.')));
 });
diff --git a/app/assets/javascripts/group_label_subscription.js b/app/assets/javascripts/group_label_subscription.js
index befaebb635e..df9429b1e02 100644
--- a/app/assets/javascripts/group_label_subscription.js
+++ b/app/assets/javascripts/group_label_subscription.js
@@ -1,3 +1,7 @@
+import axios from './lib/utils/axios_utils';
+import flash from './flash';
+import { __ } from './locale';
+
 export default class GroupLabelSubscription {
   constructor(container) {
     const $container = $(container);
@@ -13,14 +17,12 @@ export default class GroupLabelSubscription {
     event.preventDefault();
 
     const url = this.$unsubscribeButtons.attr('data-url');
-
-    $.ajax({
-      type: 'POST',
-      url,
-    }).done(() => {
-      this.toggleSubscriptionButtons();
-      this.$unsubscribeButtons.removeAttr('data-url');
-    });
+    axios.post(url)
+      .then(() => {
+        this.toggleSubscriptionButtons();
+        this.$unsubscribeButtons.removeAttr('data-url');
+      })
+      .catch(() => flash(__('There was an error when unsubscribing from this label.')));
   }
 
   subscribe(event) {
@@ -31,12 +33,9 @@ export default class GroupLabelSubscription {
 
     this.$unsubscribeButtons.attr('data-url', url);
 
-    $.ajax({
-      type: 'POST',
-      url,
-    }).done(() => {
-      this.toggleSubscriptionButtons();
-    });
+    axios.post(url)
+      .then(() => this.toggleSubscriptionButtons())
+      .catch(() => flash(__('There was an error when subscribing to this label.')));
   }
 
   toggleSubscriptionButtons() {
diff --git a/app/assets/javascripts/integrations/integration_settings_form.js b/app/assets/javascripts/integrations/integration_settings_form.js
index 32415a8791f..3f27cfc2f6d 100644
--- a/app/assets/javascripts/integrations/integration_settings_form.js
+++ b/app/assets/javascripts/integrations/integration_settings_form.js
@@ -1,4 +1,5 @@
-import Flash from '../flash';
+import axios from '../lib/utils/axios_utils';
+import flash from '../flash';
 
 export default class IntegrationSettingsForm {
   constructor(formSelector) {
@@ -95,29 +96,26 @@ export default class IntegrationSettingsForm {
    */
   testSettings(formData) {
     this.toggleSubmitBtnState(true);
-    $.ajax({
-      type: 'PUT',
-      url: this.testEndPoint,
-      data: formData,
-    })
-    .done((res) => {
-      if (res.error) {
-        new Flash(`${res.message} ${res.service_response}`, 'alert', document, {
-          title: 'Save anyway',
-          clickHandler: (e) => {
-            e.preventDefault();
-            this.$form.submit();
-          },
-        });
-      } else {
-        this.$form.submit();
-      }
-    })
-    .fail(() => {
-      new Flash('Something went wrong on our end.');
-    })
-    .always(() => {
-      this.toggleSubmitBtnState(false);
-    });
+
+    return axios.put(this.testEndPoint, formData)
+      .then(({ data }) => {
+        if (data.error) {
+          flash(`${data.message} ${data.service_response}`, 'alert', document, {
+            title: 'Save anyway',
+            clickHandler: (e) => {
+              e.preventDefault();
+              this.$form.submit();
+            },
+          });
+        } else {
+          this.$form.submit();
+        }
+
+        this.toggleSubmitBtnState(false);
+      })
+      .catch(() => {
+        flash('Something went wrong on our end.');
+        this.toggleSubmitBtnState(false);
+      });
   }
 }
diff --git a/app/assets/javascripts/issuable_bulk_update_actions.js b/app/assets/javascripts/issuable_bulk_update_actions.js
index b124fafec70..8c1b2e78ca4 100644
--- a/app/assets/javascripts/issuable_bulk_update_actions.js
+++ b/app/assets/javascripts/issuable_bulk_update_actions.js
@@ -1,5 +1,6 @@
 /* eslint-disable comma-dangle, quotes, consistent-return, func-names, array-callback-return, space-before-function-paren, prefer-arrow-callback, max-len, no-unused-expressions, no-sequences, no-underscore-dangle, no-unused-vars, no-param-reassign */
 import _ from 'underscore';
+import axios from './lib/utils/axios_utils';
 import Flash from './flash';
 
 export default {
@@ -22,15 +23,9 @@ export default {
   },
 
   submit() {
-    const _this = this;
-    const xhr = $.ajax({
-      url: this.form.attr('action'),
-      method: this.form.attr('method'),
-      dataType: 'JSON',
-      data: this.getFormDataAsObject()
-    });
-    xhr.done(() => window.location.reload());
-    xhr.fail(() => this.onFormSubmitFailure());
+    axios[this.form.attr('method')](this.form.attr('action'), this.getFormDataAsObject())
+      .then(() => window.location.reload())
+      .catch(() => this.onFormSubmitFailure());
   },
 
   onFormSubmitFailure() {
diff --git a/app/assets/javascripts/issuable_index.js b/app/assets/javascripts/issuable_index.js
index c3e0acdff66..0683ca82a38 100644
--- a/app/assets/javascripts/issuable_index.js
+++ b/app/assets/javascripts/issuable_index.js
@@ -1,3 +1,6 @@
+import axios from './lib/utils/axios_utils';
+import flash from './flash';
+import { __ } from './locale';
 import IssuableBulkUpdateSidebar from './issuable_bulk_update_sidebar';
 import IssuableBulkUpdateActions from './issuable_bulk_update_actions';
 
@@ -20,23 +23,24 @@ export default class IssuableIndex {
   }
 
   static resetIncomingEmailToken() {
-    $('.incoming-email-token-reset').on('click', (e) => {
+    const $resetToken = $('.incoming-email-token-reset');
+
+    $resetToken.on('click', (e) => {
       e.preventDefault();
 
-      $.ajax({
-        type: 'PUT',
-        url: $('.incoming-email-token-reset').attr('href'),
-        dataType: 'json',
-        success(response) {
-          $('#issuable_email').val(response.new_address).focus();
-        },
-        beforeSend() {
-          $('.incoming-email-token-reset').text('resetting...');
-        },
-        complete() {
-          $('.incoming-email-token-reset').text('reset it');
-        },
-      });
+      $resetToken.text('resetting...');
+
+      axios.put($resetToken.attr('href'))
+        .then(({ data }) => {
+          $('#issuable_email').val(data.new_address).focus();
+
+          $resetToken.text('reset it');
+        })
+        .catch(() => {
+          flash(__('There was an error when reseting email token.'));
+
+          $resetToken.text('reset it');
+        });
     });
   }
 }
diff --git a/spec/javascripts/integrations/integration_settings_form_spec.js b/spec/javascripts/integrations/integration_settings_form_spec.js
index 9033eb9ce02..d0fba908e34 100644
--- a/spec/javascripts/integrations/integration_settings_form_spec.js
+++ b/spec/javascripts/integrations/integration_settings_form_spec.js
@@ -1,3 +1,5 @@
+import MockAdaptor from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
 import IntegrationSettingsForm from '~/integrations/integration_settings_form';
 
 describe('IntegrationSettingsForm', () => {
@@ -109,91 +111,117 @@ describe('IntegrationSettingsForm', () => {
   describe('testSettings', () => {
     let integrationSettingsForm;
     let formData;
+    let mock;
 
     beforeEach(() => {
+      mock = new MockAdaptor(axios);
+
+      spyOn(axios, 'put').and.callThrough();
+
       integrationSettingsForm = new IntegrationSettingsForm('.js-integration-settings-form');
       formData = integrationSettingsForm.$form.serialize();
     });
 
-    it('should make an ajax request with provided `formData`', () => {
-      const deferred = $.Deferred();
-      spyOn($, 'ajax').and.returnValue(deferred.promise());
+    afterEach(() => {
+      mock.restore();
+    });
 
-      integrationSettingsForm.testSettings(formData);
+    it('should make an ajax request with provided `formData`', (done) => {
+      integrationSettingsForm.testSettings(formData)
+        .then(() => {
+          expect(axios.put).toHaveBeenCalledWith(integrationSettingsForm.testEndPoint, formData);
 
-      expect($.ajax).toHaveBeenCalledWith({
-        type: 'PUT',
-        url: integrationSettingsForm.testEndPoint,
-        data: formData,
-      });
+          done();
+        })
+        .catch(done.fail);
     });
 
-    it('should show error Flash with `Save anyway` action if ajax request responds with error in test', () => {
+    it('should show error Flash with `Save anyway` action if ajax request responds with error in test', (done) => {
       const errorMessage = 'Test failed.';
-      const deferred = $.Deferred();
-      spyOn($, 'ajax').and.returnValue(deferred.promise());
-
-      integrationSettingsForm.testSettings(formData);
+      mock.onPut(integrationSettingsForm.testEndPoint).reply(200, {
+        error: true,
+        message: errorMessage,
+        service_response: 'some error',
+      });
 
-      deferred.resolve({ error: true, message: errorMessage, service_response: 'some error' });
+      integrationSettingsForm.testSettings(formData)
+        .then(() => {
+          const $flashContainer = $('.flash-container');
+          expect($flashContainer.find('.flash-text').text().trim()).toEqual('Test failed. some error');
+          expect($flashContainer.find('.flash-action')).toBeDefined();
+          expect($flashContainer.find('.flash-action').text().trim()).toEqual('Save anyway');
 
-      const $flashContainer = $('.flash-container');
-      expect($flashContainer.find('.flash-text').text().trim()).toEqual('Test failed. some error');
-      expect($flashContainer.find('.flash-action')).toBeDefined();
-      expect($flashContainer.find('.flash-action').text().trim()).toEqual('Save anyway');
+          done();
+        })
+        .catch(done.fail);
     });
 
-    it('should submit form if ajax request responds without any error in test', () => {
-      const deferred = $.Deferred();
-      spyOn($, 'ajax').and.returnValue(deferred.promise());
+    it('should submit form if ajax request responds without any error in test', (done) => {
+      spyOn(integrationSettingsForm.$form, 'submit');
 
-      integrationSettingsForm.testSettings(formData);
+      mock.onPut(integrationSettingsForm.testEndPoint).reply(200, {
+        error: false,
+      });
 
-      spyOn(integrationSettingsForm.$form, 'submit');
-      deferred.resolve({ error: false });
+      integrationSettingsForm.testSettings(formData)
+        .then(() => {
+          expect(integrationSettingsForm.$form.submit).toHaveBeenCalled();
 
-      expect(integrationSettingsForm.$form.submit).toHaveBeenCalled();
+          done();
+        })
+        .catch(done.fail);
     });
 
-    it('should submit form when clicked on `Save anyway` action of error Flash', () => {
-      const errorMessage = 'Test failed.';
-      const deferred = $.Deferred();
-      spyOn($, 'ajax').and.returnValue(deferred.promise());
+    it('should submit form when clicked on `Save anyway` action of error Flash', (done) => {
+      spyOn(integrationSettingsForm.$form, 'submit');
 
-      integrationSettingsForm.testSettings(formData);
+      const errorMessage = 'Test failed.';
+      mock.onPut(integrationSettingsForm.testEndPoint).reply(200, {
+        error: true,
+        message: errorMessage,
+      });
 
-      deferred.resolve({ error: true, message: errorMessage });
+      integrationSettingsForm.testSettings(formData)
+        .then(() => {
+          const $flashAction = $('.flash-container .flash-action');
+          expect($flashAction).toBeDefined();
 
-      const $flashAction = $('.flash-container .flash-action');
-      expect($flashAction).toBeDefined();
+          $flashAction.get(0).click();
+        })
+        .then(() => {
+          expect(integrationSettingsForm.$form.submit).toHaveBeenCalled();
 
-      spyOn(integrationSettingsForm.$form, 'submit');
-      $flashAction.get(0).click();
-      expect(integrationSettingsForm.$form.submit).toHaveBeenCalled();
+          done();
+        })
+        .catch(done.fail);
     });
 
-    it('should show error Flash if ajax request failed', () => {
+    it('should show error Flash if ajax request failed', (done) => {
       const errorMessage = 'Something went wrong on our end.';
-      const deferred = $.Deferred();
-      spyOn($, 'ajax').and.returnValue(deferred.promise());
 
-      integrationSettingsForm.testSettings(formData);
+      mock.onPut(integrationSettingsForm.testEndPoint).networkError();
 
-      deferred.reject();
+      integrationSettingsForm.testSettings(formData)
+        .then(() => {
+          expect($('.flash-container .flash-text').text().trim()).toEqual(errorMessage);
 
-      expect($('.flash-container .flash-text').text().trim()).toEqual(errorMessage);
+          done();
+        })
+        .catch(done.fail);
     });
 
-    it('should always call `toggleSubmitBtnState` with `false` once request is completed', () => {
-      const deferred = $.Deferred();
-      spyOn($, 'ajax').and.returnValue(deferred.promise());
-
-      integrationSettingsForm.testSettings(formData);
+    it('should always call `toggleSubmitBtnState` with `false` once request is completed', (done) => {
+      mock.onPut(integrationSettingsForm.testEndPoint).networkError();
 
       spyOn(integrationSettingsForm, 'toggleSubmitBtnState');
-      deferred.reject();
 
-      expect(integrationSettingsForm.toggleSubmitBtnState).toHaveBeenCalledWith(false);
+      integrationSettingsForm.testSettings(formData)
+        .then(() => {
+          expect(integrationSettingsForm.toggleSubmitBtnState).toHaveBeenCalledWith(false);
+
+          done();
+        })
+        .catch(done.fail);
     });
   });
 });
diff --git a/spec/javascripts/issuable_spec.js b/spec/javascripts/issuable_spec.js
index 5a9112716f4..d53ffecbd35 100644
--- a/spec/javascripts/issuable_spec.js
+++ b/spec/javascripts/issuable_spec.js
@@ -1,3 +1,5 @@
+import MockAdaptor from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
 import IssuableIndex from '~/issuable_index';
 
 describe('Issuable', () => {
@@ -19,6 +21,8 @@ describe('Issuable', () => {
   });
 
   describe('resetIncomingEmailToken', () => {
+    let mock;
+
     beforeEach(() => {
       const element = document.createElement('a');
       element.classList.add('incoming-email-token-reset');
@@ -30,14 +34,28 @@ describe('Issuable', () => {
       document.body.appendChild(input);
 
       Issuable = new IssuableIndex('issue_');
+
+      mock = new MockAdaptor(axios);
+
+      mock.onPut('foo').reply(200, {
+        new_address: 'testing123',
+      });
     });
 
-    it('should send request to reset email token', () => {
-      spyOn(jQuery, 'ajax').and.callThrough();
+    afterEach(() => {
+      mock.restore();
+    });
+
+    it('should send request to reset email token', (done) => {
+      spyOn(axios, 'put').and.callThrough();
       document.querySelector('.incoming-email-token-reset').click();
 
-      expect(jQuery.ajax).toHaveBeenCalled();
-      expect(jQuery.ajax.calls.argsFor(0)[0].url).toEqual('foo');
+      setTimeout(() => {
+        expect(axios.put).toHaveBeenCalledWith('foo');
+        expect($('#issuable_email').val()).toBe('testing123');
+
+        done();
+      });
     });
   });
 });