Commit 23ade007 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Expose ldap_cn and ldap_access group attributes through API

parent 0fdfcb23
...@@ -60,7 +60,7 @@ module API ...@@ -60,7 +60,7 @@ module API
end end
class Group < Grape::Entity class Group < Grape::Entity
expose :id, :name, :path, :owner_id expose :id, :name, :path, :owner_id, :ldap_cn, :ldap_access
end end
class GroupDetail < Group class GroupDetail < Group
......
...@@ -6,7 +6,7 @@ describe API::API do ...@@ -6,7 +6,7 @@ describe API::API do
let(:user1) { create(:user) } let(:user1) { create(:user) }
let(:user2) { create(:user) } let(:user2) { create(:user) }
let(:admin) { create(:admin) } let(:admin) { create(:admin) }
let!(:group1) { create(:group, owner: user1) } let!(:group1) { create(:group, owner: user1, ldap_cn: "ldap-group", ldap_access: Gitlab::Access::MASTER ) }
let!(:group2) { create(:group, owner: user2) } let!(:group2) { create(:group, owner: user2) }
describe "GET /groups" do describe "GET /groups" do
...@@ -24,6 +24,8 @@ describe API::API do ...@@ -24,6 +24,8 @@ describe API::API do
json_response.should be_an Array json_response.should be_an Array
json_response.length.should == 1 json_response.length.should == 1
json_response.first['name'].should == group1.name json_response.first['name'].should == group1.name
json_response.first['ldap_cn'].should == group1.ldap_cn
json_response.first['ldap_access'].should == group1.ldap_access
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment