Remove now-unused methods in api.js and add tests

app/assets/javascripts/api.js

@@ -15,12 +15,7 @@ const Api = {
   mergeRequestChangesPath: '/api/:version/projects/:id/merge_requests/:mrid/changes',
   mergeRequestVersionsPath: '/api/:version/projects/:id/merge_requests/:mrid/versions',
   groupLabelsPath: '/groups/:namespace_path/-/labels',
-  templatesPath: '/api/:version/templates/:key',
-  licensePath: '/api/:version/templates/licenses/:key',
-  gitignorePath: '/api/:version/templates/gitignores/:key',
-  gitlabCiYmlPath: '/api/:version/templates/gitlab_ci_ymls/:key',
   ldapGroupsPath: '/api/:version/ldap/:provider/groups.json',
-  dockerfilePath: '/api/:version/templates/dockerfiles/:key',
   issuableTemplatePath: '/:namespace_path/:project_path/templates/:type/:key',
   projectTemplatePath: '/api/:version/projects/:id/templates/:type/:key',
   projectTemplatesPath: '/api/:version/projects/:id/templates/:type',
@@ -200,31 +195,6 @@ const Api = {
     return axios.get(url);
   },
 
-  // Return text for a specific license
-  licenseText(key, data, callback) {
-    const url = Api.buildUrl(Api.licensePath).replace(':key', key);
-    return axios
-      .get(url, {
-        params: data,
-      })
-      .then(res => callback(res.data));
-  },
-
-  gitignoreText(key, callback) {
-    const url = Api.buildUrl(Api.gitignorePath).replace(':key', key);
-    return axios.get(url).then(({ data }) => callback(data));
-  },
-
-  gitlabCiYml(key, callback) {
-    const url = Api.buildUrl(Api.gitlabCiYmlPath).replace(':key', key);
-    return axios.get(url).then(({ data }) => callback(data));
-  },
-
-  dockerfileYml(key, callback) {
-    const url = Api.buildUrl(Api.dockerfilePath).replace(':key', key);
-    return axios.get(url).then(({ data }) => callback(data));
-  },
-
   projectTemplate(id, type, key, options, callback) {
     const url = Api.buildUrl(this.projectTemplatePath)
       .replace(':id', encodeURIComponent(id))
@@ -305,12 +275,6 @@ const Api = {
     });
   },
 
-  templates(key, params = {}) {
-    const url = Api.buildUrl(this.templatesPath).replace(':key', key);
-
-    return axios.get(url, { params });
-  },
-
   approverUsers(search, options, callback = $.noop) {
     const url = Api.buildUrl('/autocomplete/users.json');
     return axios

app/assets/javascripts/blob/template_selector.js

@@ -66,9 +66,6 @@ export default class TemplateSelector {
     // be added by all subclasses.
   }
 
-  // To be implemented on the extending class
-  // e.g. Api.gitlabCiYml(query.name, file => this.setEditorContent(file));
-
   setEditorContent(file, { skipFocus } = {}) {
     if (!file) return;
 

spec/javascripts/api_spec.js

@@ -250,71 +250,45 @@ describe('Api', () => {
     });
   });
 
-  describe('licenseText', () => {
-    it('fetches a license text', done => {
-      const licenseKey = "driver's license";
-      const data = { unused: 'option' };
-      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/templates/licenses/${licenseKey}`;
+  describe('issueTemplate', () => {
+    it('fetches an issue template', done => {
+      const namespace = 'some namespace';
+      const project = 'some project';
+      const templateKey = ' template #%?.key ';
+      const templateType = 'template type';
+      const expectedUrl = `${dummyUrlRoot}/${namespace}/${project}/templates/${templateType}/${encodeURIComponent(
+        templateKey,
+      )}`;
       mock.onGet(expectedUrl).reply(200, 'test');
 
-      Api.licenseText(licenseKey, data, response => {
+      Api.issueTemplate(namespace, project, templateKey, templateType, (error, response) => {
         expect(response).toBe('test');
         done();
       });
     });
   });
 
-  describe('gitignoreText', () => {
-    it('fetches a gitignore text', done => {
-      const gitignoreKey = 'ignore git';
-      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/templates/gitignores/${gitignoreKey}`;
-      mock.onGet(expectedUrl).reply(200, 'test');
-
-      Api.gitignoreText(gitignoreKey, response => {
-        expect(response).toBe('test');
-        done();
-      });
-    });
-  });
+  describe('projectTemplates', () => {
+    it('fetches a list of templates', done => {
+      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects/gitlab-org%2Fgitlab-ce/templates/licenses`;
 
-  describe('gitlabCiYml', () => {
-    it('fetches a .gitlab-ci.yml', done => {
-      const gitlabCiYmlKey = 'Y CI ML';
-      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/templates/gitlab_ci_ymls/${gitlabCiYmlKey}`;
       mock.onGet(expectedUrl).reply(200, 'test');
 
-      Api.gitlabCiYml(gitlabCiYmlKey, response => {
+      Api.projectTemplates('gitlab-org/gitlab-ce', 'licenses', {}, response => {
         expect(response).toBe('test');
         done();
       });
     });
   });
 
-  describe('dockerfileYml', () => {
-    it('fetches a Dockerfile', done => {
-      const dockerfileYmlKey = 'a giant whale';
-      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/templates/dockerfiles/${dockerfileYmlKey}`;
-      mock.onGet(expectedUrl).reply(200, 'test');
-
-      Api.dockerfileYml(dockerfileYmlKey, response => {
-        expect(response).toBe('test');
-        done();
-      });
-    });
-  });
+  describe('projectTemplate', () => {
+    it('fetches a single template', done => {
+      const data = { unused: 'option' };
+      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects/gitlab-org%2Fgitlab-ce/templates/licenses/test%20license`;
 
-  describe('issueTemplate', () => {
-    it('fetches an issue template', done => {
-      const namespace = 'some namespace';
-      const project = 'some project';
-      const templateKey = ' template #%?.key ';
-      const templateType = 'template type';
-      const expectedUrl = `${dummyUrlRoot}/${namespace}/${project}/templates/${templateType}/${encodeURIComponent(
-        templateKey,
-      )}`;
       mock.onGet(expectedUrl).reply(200, 'test');
 
-      Api.issueTemplate(namespace, project, templateKey, templateType, (error, response) => {
+      Api.projectTemplate('gitlab-org/gitlab-ce', 'licenses', 'test license', data, response => {
         expect(response).toBe('test');
         done();
       });