diff options
author | Phil Hughes <me@iamphill.com> | 2019-02-04 17:58:50 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-02-04 17:58:50 +0000 |
commit | e53471727e46c3f2c29836ab1cca3823591fa567 (patch) | |
tree | 61cd10f41b8b71853ce6ff8b71122f8dad2a8c29 | |
parent | ad513afc3f9efb81ef40ff5f5fa8c4d21f063ce1 (diff) | |
parent | d4e9dd96754324b8899330cd9e2cd480301d5b9c (diff) | |
download | gitlab-ce-e53471727e46c3f2c29836ab1cca3823591fa567.tar.gz |
Merge branch 'fe-api-group-members' into 'master'
Add groupMembers to api.js
See merge request gitlab-org/gitlab-ce!24892
-rw-r--r-- | app/assets/javascripts/api.js | 7 | ||||
-rw-r--r-- | spec/javascripts/api_spec.js | 16 |
2 files changed, 23 insertions, 0 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index d1396b6c4bc..85eb08cc97d 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -5,6 +5,7 @@ import axios from './lib/utils/axios_utils'; const Api = { groupsPath: '/api/:version/groups.json', groupPath: '/api/:version/groups/:id', + groupMembersPath: '/api/:version/groups/:id/members', subgroupsPath: '/api/:version/groups/:id/subgroups', namespacesPath: '/api/:version/namespaces.json', groupProjectsPath: '/api/:version/groups/:id/projects.json', @@ -40,6 +41,12 @@ const Api = { }); }, + groupMembers(id) { + const url = Api.buildUrl(this.groupMembersPath).replace(':id', encodeURIComponent(id)); + + return axios.get(url); + }, + // Return groups list. Filtered by query groups(query, options, callback = $.noop) { const url = Api.buildUrl(Api.groupsPath); diff --git a/spec/javascripts/api_spec.js b/spec/javascripts/api_spec.js index 9d55c615450..1e9470970ff 100644 --- a/spec/javascripts/api_spec.js +++ b/spec/javascripts/api_spec.js @@ -49,6 +49,22 @@ describe('Api', () => { }); }); + describe('groupMembers', () => { + it('fetches group members', done => { + const groupId = '54321'; + const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/groups/${groupId}/members`; + const expectedData = [{ id: 7 }]; + mock.onGet(expectedUrl).reply(200, expectedData); + + Api.groupMembers(groupId) + .then(({ data }) => { + expect(data).toEqual(expectedData); + }) + .then(done) + .catch(done.fail); + }); + }); + describe('groups', () => { it('fetches groups', done => { const query = 'dummy query'; |