Skip to content

G
gitlab-ce
Commit 72f91b7f authored by Sanad Liaquat's avatar Sanad Liaquat
Browse files
Options

Ensure correct group owner role

parent b3bb149e
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 56 deletions
qa/qa/specs/features/ee/browser_ui/1_manage/group/group_ldap_sync_spec.rb
View file @ 72f91b7f
...@@ -35,35 +35,35 @@ module QA ...@@ -35,35 +35,35 @@ module QA
context 'using group cn method' do context 'using group cn method' do
let(:ldap_users) do let(:ldap_users) do
[ [
{ {
name: 'ENG User 1', name: 'ENG User 1',
username: 'enguser1', username: 'enguser1',
email: 'enguser1@example.org', email: 'enguser1@example.org',
provider: 'ldapmain', provider: 'ldapmain',
extern_uid: 'uid=enguser1,ou=people,ou=global groups,dc=example,dc=org' extern_uid: 'uid=enguser1,ou=people,ou=global groups,dc=example,dc=org'
}, },
{ {
name: 'ENG User 2', name: 'ENG User 2',
username: 'enguser2', username: 'enguser2',
email: 'enguser2@example.org', email: 'enguser2@example.org',
provider: 'ldapmain', provider: 'ldapmain',
extern_uid: 'uid=enguser2,ou=people,ou=global groups,dc=example,dc=org' extern_uid: 'uid=enguser2,ou=people,ou=global groups,dc=example,dc=org'
}, },
{ {
name: 'ENG User 3', name: 'ENG User 3',
username: 'enguser3', username: 'enguser3',
email: 'enguser3@example.org', email: 'enguser3@example.org',
provider: 'ldapmain', provider: 'ldapmain',
extern_uid: 'uid=enguser3,ou=people,ou=global groups,dc=example,dc=org' extern_uid: 'uid=enguser3,ou=people,ou=global groups,dc=example,dc=org'
} }
] ]
end end
let(:owner_user) { 'enguser1' } let(:owner_user) { 'enguser1' }
let(:sync_users) { ['ENG User 2', 'ENG User 3'] } let(:sync_users) { ['ENG User 2', 'ENG User 3'] }
before do before do
create_users_via_api(ldap_users) @created_users = create_users_via_api(ldap_users)
group = create_group_and_add_user_via_api(owner_user, 'Synched-engineering-group') group = create_group_and_add_user_via_api(owner_user, 'Synched-engineering-group', Resource::Members::AccessLevel::OWNER)
signin_and_visit_group_as_user(owner_user, group) signin_and_visit_group_as_user(owner_user, group)
Page::Group::Menu.perform(&:go_to_ldap_sync_settings) Page::Group::Menu.perform(&:go_to_ldap_sync_settings)
...@@ -85,35 +85,37 @@ module QA ...@@ -85,35 +85,37 @@ module QA
context 'user filter method' do context 'user filter method' do
let(:ldap_users) do let(:ldap_users) do
[ [
{ {
name: 'HR User 1', name: 'HR User 1',
username: 'hruser1', username: 'hruser1',
email: 'hruser1@example.org', email: 'hruser1@example.org',
provider: 'ldapmain', provider: 'ldapmain',
extern_uid: 'uid=hruser1,ou=people,ou=global groups,dc=example,dc=org' extern_uid: 'uid=hruser1,ou=people,ou=global groups,dc=example,dc=org'
}, },
{ {
name: 'HR User 2', name: 'HR User 2',
username: 'hruser2', username: 'hruser2',
email: 'hruser2@example.org', email: 'hruser2@example.org',
provider: 'ldapmain', provider: 'ldapmain',
extern_uid: 'uid=hruser2,ou=people,ou=global groups,dc=example,dc=org' extern_uid: 'uid=hruser2,ou=people,ou=global groups,dc=example,dc=org'
}, },
{ {
name: 'HR User 3', name: 'HR User 3',
username: 'hruser3', username: 'hruser3',
email: 'hruser3@example.org', email: 'hruser3@example.org',
provider: 'ldapmain', provider: 'ldapmain',
extern_uid: 'uid=hruser3,ou=people,ou=global groups,dc=example,dc=org' extern_uid: 'uid=hruser3,ou=people,ou=global groups,dc=example,dc=org'
} }
] ]
end end
let(:owner_user) { 'hruser1' } let(:owner_user) { 'hruser1' }
let(:sync_users) { ['HR User 2', 'HR User 3'] } let(:sync_users) { ['HR User 2', 'HR User 3'] }
before do before do
create_users_via_api(ldap_users) @created_users = create_users_via_api(ldap_users)
group = create_group_and_add_user_via_api(owner_user, 'Synched-human-resources-group')
group = create_group_and_add_user_via_api(owner_user, 'Synched-human-resources-group', Resource::Members::AccessLevel::OWNER)
signin_and_visit_group_as_user(owner_user, group) signin_and_visit_group_as_user(owner_user, group)
Page::Group::Menu.perform(&:go_to_ldap_sync_settings) Page::Group::Menu.perform(&:go_to_ldap_sync_settings)
...@@ -126,14 +128,16 @@ module QA ...@@ -126,14 +128,16 @@ module QA
Page::Group::Menu.perform(&:click_group_members_item) Page::Group::Menu.perform(&:click_group_members_item)
end end
it 'has LDAP users synced', quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/196040' do it 'has LDAP users synced' do
verify_users_synced(sync_users) verify_users_synced(sync_users)
end end
end end
def create_users_via_api(users) def create_users_via_api(users)
created_users = {}
users.each do |user| users.each do |user|
Resource::User.fabricate_via_api! do |resource| created_users[user[:username]] = Resource::User.fabricate_via_api! do |resource|
resource.username = user[:username] resource.username = user[:username]
resource.name = user[:name] resource.name = user[:name]
resource.email = user[:email] resource.email = user[:email]
...@@ -141,20 +145,15 @@ module QA ...@@ -141,20 +145,15 @@ module QA
resource.provider = user[:provider] resource.provider = user[:provider]
end end
end end
created_users
end end
def add_user_to_group_via_api(user, group) def create_group_and_add_user_via_api(user_name, group_name, role)
api_client = Runtime::API::Client.new(:gitlab)
response = get Runtime::API::Request.new(api_client, "/users?username=#{user}").url
post Runtime::API::Request.new(api_client, group.api_members_path).url, { user_id: parse_body(response).first[:id], access_level: '50' }
end
def create_group_and_add_user_via_api(user_name, group_name)
group = Resource::Group.fabricate_via_api! do |resource| group = Resource::Group.fabricate_via_api! do |resource|
resource.path = "#{group_name}-#{SecureRandom.hex(4)}" resource.path = "#{group_name}-#{SecureRandom.hex(4)}"
end end
add_user_to_group_via_api(user_name, group) group.add_member(@created_users[user_name], role)
group group
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7