Merge branch 'master' into snake-casesnake-case

1 files changed, 59 insertions, 118 deletions

diff --git a/spec/javascripts/api_spec.js b/spec/javascripts/api_spec.js
index 2aa4fb1f6c6..cf3a76d0d2e 100644
--- a/spec/javascripts/api_spec.js
+++ b/spec/javascripts/api_spec.js
@@ -1,3 +1,5 @@
+import MockAdapter from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
 import Api from '~/api';
 
 describe('Api', () => {
@@ -7,20 +9,17 @@ describe('Api', () => {
     api_version: dummyApiVersion,
     relative_url_root: dummyUrlRoot,
   };
-  const dummyResponse = 'hello from outer space!';
-  const sendDummyResponse = () => {
-    const deferred = $.Deferred();
-    deferred.resolve(dummyResponse);
-    return deferred.promise();
-  };
   let originalGon;
+  let mock;
 
   beforeEach(() => {
+    mock = new MockAdapter(axios);
     originalGon = window.gon;
     window.gon = Object.assign({}, dummyGon);
   });
 
   afterEach(() => {
+    mock.restore();
     window.gon = originalGon;
   });
 
@@ -38,15 +37,13 @@ describe('Api', () => {
   describe('group', () => {
     it('fetches a group', (done) => {
       const groupId = '123456';
-      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/groups/${groupId}.json`;
-      spyOn(jQuery, 'ajax').and.callFake((request) => {
-        expect(request.url).toEqual(expectedUrl);
-        expect(request.dataType).toEqual('json');
-        return sendDummyResponse();
+      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/groups/${groupId}`;
+      mock.onGet(expectedUrl).reply(200, {
+        name: 'test',
       });
 
       Api.group(groupId, (response) => {
-        expect(response).toBe(dummyResponse);
+        expect(response.name).toBe('test');
         done();
       });
     });
@@ -57,19 +54,13 @@ describe('Api', () => {
       const query = 'dummy query';
       const options = { unused: 'option' };
       const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/groups.json`;
-      const expectedData = Object.assign({
-        search: query,
-        per_page: 20,
-      }, options);
-      spyOn(jQuery, 'ajax').and.callFake((request) => {
-        expect(request.url).toEqual(expectedUrl);
-        expect(request.dataType).toEqual('json');
-        expect(request.data).toEqual(expectedData);
-        return sendDummyResponse();
-      });
+      mock.onGet(expectedUrl).reply(200, [{
+        name: 'test',
+      }]);
 
       Api.groups(query, options, (response) => {
-        expect(response).toBe(dummyResponse);
+        expect(response.length).toBe(1);
+        expect(response[0].name).toBe('test');
         done();
       });
     });
@@ -79,19 +70,13 @@ describe('Api', () => {
     it('fetches namespaces', (done) => {
       const query = 'dummy query';
       const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/namespaces.json`;
-      const expectedData = {
-        search: query,
-        per_page: 20,
-      };
-      spyOn(jQuery, 'ajax').and.callFake((request) => {
-        expect(request.url).toEqual(expectedUrl);
-        expect(request.dataType).toEqual('json');
-        expect(request.data).toEqual(expectedData);
-        return sendDummyResponse();
-      });
+      mock.onGet(expectedUrl).reply(200, [{
+        name: 'test',
+      }]);
 
       Api.namespaces(query, (response) => {
-        expect(response).toBe(dummyResponse);
+        expect(response.length).toBe(1);
+        expect(response[0].name).toBe('test');
         done();
       });
     });
@@ -103,21 +88,13 @@ describe('Api', () => {
       const options = { unused: 'option' };
       const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects.json`;
       window.gon.current_user_id = 1;
-      const expectedData = Object.assign({
-        search: query,
-        per_page: 20,
-        membership: true,
-        simple: true,
-      }, options);
-      spyOn(jQuery, 'ajax').and.callFake((request) => {
-        expect(request.url).toEqual(expectedUrl);
-        expect(request.dataType).toEqual('json');
-        expect(request.data).toEqual(expectedData);
-        return sendDummyResponse();
-      });
+      mock.onGet(expectedUrl).reply(200, [{
+        name: 'test',
+      }]);
 
       Api.projects(query, options, (response) => {
-        expect(response).toBe(dummyResponse);
+        expect(response.length).toBe(1);
+        expect(response[0].name).toBe('test');
         done();
       });
     });
@@ -126,20 +103,13 @@ describe('Api', () => {
       const query = 'dummy query';
       const options = { unused: 'option' };
       const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects.json`;
-      const expectedData = Object.assign({
-        search: query,
-        per_page: 20,
-        simple: true,
-      }, options);
-      spyOn(jQuery, 'ajax').and.callFake((request) => {
-        expect(request.url).toEqual(expectedUrl);
-        expect(request.dataType).toEqual('json');
-        expect(request.data).toEqual(expectedData);
-        return sendDummyResponse();
-      });
+      mock.onGet(expectedUrl).reply(200, [{
+        name: 'test',
+      }]);
 
       Api.projects(query, options, (response) => {
-        expect(response).toBe(dummyResponse);
+        expect(response.length).toBe(1);
+        expect(response[0].name).toBe('test');
         done();
       });
     });
@@ -154,16 +124,16 @@ describe('Api', () => {
       const expectedData = {
         label: labelData,
       };
-      spyOn(jQuery, 'ajax').and.callFake((request) => {
-        expect(request.url).toEqual(expectedUrl);
-        expect(request.dataType).toEqual('json');
-        expect(request.type).toEqual('POST');
-        expect(request.data).toEqual(expectedData);
-        return sendDummyResponse();
+      mock.onPost(expectedUrl).reply((config) => {
+        expect(config.data).toBe(JSON.stringify(expectedData));
+
+        return [200, {
+          name: 'test',
+        }];
       });
 
       Api.newLabel(namespace, project, labelData, (response) => {
-        expect(response).toBe(dummyResponse);
+        expect(response.name).toBe('test');
         done();
       });
     });
@@ -174,19 +144,13 @@ describe('Api', () => {
       const groupId = '123456';
       const query = 'dummy query';
       const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/groups/${groupId}/projects.json`;
-      const expectedData = {
-        search: query,
-        per_page: 20,
-      };
-      spyOn(jQuery, 'ajax').and.callFake((request) => {
-        expect(request.url).toEqual(expectedUrl);
-        expect(request.dataType).toEqual('json');
-        expect(request.data).toEqual(expectedData);
-        return sendDummyResponse();
-      });
+      mock.onGet(expectedUrl).reply(200, [{
+        name: 'test',
+      }]);
 
       Api.groupProjects(groupId, query, (response) => {
-        expect(response).toBe(dummyResponse);
+        expect(response.length).toBe(1);
+        expect(response[0].name).toBe('test');
         done();
       });
     });
@@ -197,14 +161,10 @@ describe('Api', () => {
       const licenseKey = "driver's license";
       const data = { unused: 'option' };
       const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/templates/licenses/${licenseKey}`;
-      spyOn(jQuery, 'ajax').and.callFake((request) => {
-        expect(request.url).toEqual(expectedUrl);
-        expect(request.data).toEqual(data);
-        return sendDummyResponse();
-      });
+      mock.onGet(expectedUrl).reply(200, 'test');
 
       Api.licenseText(licenseKey, data, (response) => {
-        expect(response).toBe(dummyResponse);
+        expect(response).toBe('test');
         done();
       });
     });
@@ -214,13 +174,10 @@ describe('Api', () => {
     it('fetches a gitignore text', (done) => {
       const gitignoreKey = 'ignore git';
       const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/templates/gitignores/${gitignoreKey}`;
-      spyOn(jQuery, 'get').and.callFake((url, callback) => {
-        expect(url).toEqual(expectedUrl);
-        callback(dummyResponse);
-      });
+      mock.onGet(expectedUrl).reply(200, 'test');
 
       Api.gitignoreText(gitignoreKey, (response) => {
-        expect(response).toBe(dummyResponse);
+        expect(response).toBe('test');
         done();
       });
     });
@@ -230,13 +187,10 @@ describe('Api', () => {
     it('fetches a .gitlab-ci.yml', (done) => {
       const gitlabCiYmlKey = 'Y CI ML';
       const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/templates/gitlab_ci_ymls/${gitlabCiYmlKey}`;
-      spyOn(jQuery, 'get').and.callFake((url, callback) => {
-        expect(url).toEqual(expectedUrl);
-        callback(dummyResponse);
-      });
+      mock.onGet(expectedUrl).reply(200, 'test');
 
       Api.gitlabCiYml(gitlabCiYmlKey, (response) => {
-        expect(response).toBe(dummyResponse);
+        expect(response).toBe('test');
         done();
       });
     });
@@ -246,13 +200,10 @@ describe('Api', () => {
     it('fetches a Dockerfile', (done) => {
       const dockerfileYmlKey = 'a giant whale';
       const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/templates/dockerfiles/${dockerfileYmlKey}`;
-      spyOn(jQuery, 'get').and.callFake((url, callback) => {
-        expect(url).toEqual(expectedUrl);
-        callback(dummyResponse);
-      });
+      mock.onGet(expectedUrl).reply(200, 'test');
 
       Api.dockerfileYml(dockerfileYmlKey, (response) => {
-        expect(response).toBe(dummyResponse);
+        expect(response).toBe('test');
         done();
       });
     });
@@ -262,17 +213,13 @@ describe('Api', () => {
     it('fetches an issue template', (done) => {
       const namespace = 'some namespace';
       const project = 'some project';
-      const templateKey = 'template key';
+      const templateKey = ' template #%?.key ';
       const templateType = 'template type';
-      const expectedUrl = `${dummyUrlRoot}/${namespace}/${project}/templates/${templateType}/${templateKey}`;
-      spyOn(jQuery, 'ajax').and.callFake((request) => {
-        expect(request.url).toEqual(expectedUrl);
-        return sendDummyResponse();
-      });
+      const expectedUrl = `${dummyUrlRoot}/${namespace}/${project}/templates/${templateType}/${encodeURIComponent(templateKey)}`;
+      mock.onGet(expectedUrl).reply(200, 'test');
 
       Api.issueTemplate(namespace, project, templateKey, templateType, (error, response) => {
-        expect(error).toBe(null);
-        expect(response).toBe(dummyResponse);
+        expect(response).toBe('test');
         done();
       });
     });
@@ -283,20 +230,14 @@ describe('Api', () => {
       const query = 'dummy query';
       const options = { unused: 'option' };
       const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/users.json`;
-      const expectedData = Object.assign({
-        search: query,
-        per_page: 20,
-      }, options);
-      spyOn(jQuery, 'ajax').and.callFake((request) => {
-        expect(request.url).toEqual(expectedUrl);
-        expect(request.dataType).toEqual('json');
-        expect(request.data).toEqual(expectedData);
-        return sendDummyResponse();
-      });
+      mock.onGet(expectedUrl).reply(200, [{
+        name: 'test',
+      }]);
 
       Api.users(query, options)
-        .then((response) => {
-          expect(response).toBe(dummyResponse);
+        .then(({ data }) => {
+          expect(data.length).toBe(1);
+          expect(data[0].name).toBe('test');
         })
         .then(done)
         .catch(done.fail);