diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-03-09 13:54:43 +0000 |
---|---|---|
committer | DJ Mountney <david@twkie.net> | 2017-03-10 13:09:36 -0800 |
commit | fdb1a15f094d5098c204ccf4e4a81413705e90cf (patch) | |
tree | c63304e2d4918e4dfc7d6acbe75d5034332ef731 /spec/finders | |
parent | 28643488b58d002de605b60a830ab9bce61b71f7 (diff) | |
download | gitlab-ce-fdb1a15f094d5098c204ccf4e4a81413705e90cf.tar.gz |
Merge branch 'dz-nested-groups-members' into 'master'
Show members of parent groups on project members page
Closes #28786 and #27962
See merge request !9764
Diffstat (limited to 'spec/finders')
-rw-r--r-- | spec/finders/members_finder_spec.rb | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/spec/finders/members_finder_spec.rb b/spec/finders/members_finder_spec.rb new file mode 100644 index 00000000000..cf691cf684b --- /dev/null +++ b/spec/finders/members_finder_spec.rb @@ -0,0 +1,22 @@ +require 'spec_helper' + +describe MembersFinder, '#execute' do + let(:group) { create(:group) } + let(:nested_group) { create(:group, :access_requestable, parent: group) } + let(:project) { create(:project, namespace: nested_group) } + let(:user1) { create(:user) } + let(:user2) { create(:user) } + let(:user3) { create(:user) } + let(:user4) { create(:user) } + + it 'returns members for project and parent groups' do + nested_group.request_access(user1) + member1 = group.add_master(user2) + member2 = nested_group.add_master(user3) + member3 = project.add_master(user4) + + result = described_class.new(project, user2).execute + + expect(result.to_a).to eq([member3, member2, member1]) + end +end |