diff options
Diffstat (limited to 'spec/features/projects/members/list_spec.rb')
| -rw-r--r-- | spec/features/projects/members/list_spec.rb | 254 |
1 files changed, 107 insertions, 147 deletions
diff --git a/spec/features/projects/members/list_spec.rb b/spec/features/projects/members/list_spec.rb index b0fe5b9c48a..0830585da9b 100644 --- a/spec/features/projects/members/list_spec.rb +++ b/spec/features/projects/members/list_spec.rb @@ -2,232 +2,192 @@ require 'spec_helper' -RSpec.describe 'Project members list' do +RSpec.describe 'Project members list', :js do include Select2Helper + include Spec::Support::Helpers::Features::MembersHelpers let(:user1) { create(:user, name: 'John Doe') } let(:user2) { create(:user, name: 'Mary Jane') } let(:group) { create(:group) } - let(:project) { create(:project, namespace: group) } + let(:project) { create(:project, :internal, namespace: group) } before do - stub_feature_flags(invite_members_group_modal: false) + stub_feature_flags(invite_members_group_modal: true) sign_in(user1) group.add_owner(user1) end - context 'when `vue_project_members_list` feature flag is enabled', :js do - include Spec::Support::Helpers::Features::MembersHelpers + it 'show members from project and group' do + project.add_developer(user2) - it 'pushes `vue_project_members_list` feature flag to the frontend' do - visit_members_page - - expect(page).to have_pushed_frontend_feature_flags(vueProjectMembersList: true) - end + visit_members_page - it 'show members from project and group' do - project.add_developer(user2) - - visit_members_page - - expect(first_row).to have_content(user1.name) - expect(second_row).to have_content(user2.name) - end + expect(first_row).to have_content(user1.name) + expect(second_row).to have_content(user2.name) + end - it 'show user once if member of both group and project' do - project.add_developer(user1) + it 'show user once if member of both group and project' do + project.add_developer(user1) - visit_members_page + visit_members_page - expect(first_row).to have_content(user1.name) - expect(second_row).to be_blank - end + expect(first_row).to have_content(user1.name) + expect(second_row).to be_blank + end - it 'update user access level', :js do - project.add_developer(user2) + it 'update user access level' do + project.add_developer(user2) - visit_members_page + visit_members_page - page.within find_member_row(user2) do - click_button('Developer') - click_button('Reporter') + page.within find_member_row(user2) do + click_button('Developer') + click_button('Reporter') - expect(page).to have_button('Reporter') - end + expect(page).to have_button('Reporter') end + end - it 'add user to project', :js do - visit_members_page + it 'add user to project' do + visit_members_page - add_user(user2.id, 'Reporter') + add_user(user2.name, 'Reporter') - page.within find_member_row(user2) do - expect(page).to have_button('Reporter') - end + page.within find_member_row(user2) do + expect(page).to have_button('Reporter') end + end - it 'remove user from project', :js do - other_user = create(:user) - project.add_developer(other_user) - - visit_members_page - - # Open modal - page.within find_member_row(other_user) do - click_button 'Remove member' - end + it 'uses ProjectMember access_level_roles for the invite members modal access option' do + visit_members_page - page.within('[role="dialog"]') do - expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests' - click_button('Remove member') - end + click_on 'Invite members' - wait_for_requests + click_on 'Guest' + wait_for_requests - expect(members_table).not_to have_content(other_user.name) + page.within '.dropdown-menu' do + expect(page).to have_button('Guest') + expect(page).to have_button('Reporter') + expect(page).to have_button('Developer') + expect(page).to have_button('Maintainer') + expect(page).not_to have_button('Owner') end + end - it 'invite user to project', :js do - visit_members_page + it 'remove user from project' do + other_user = create(:user) + project.add_developer(other_user) - add_user('test@example.com', 'Reporter') + visit_members_page - click_link 'Invited' + # Open modal + page.within find_member_row(other_user) do + click_button 'Remove member' + end - page.within find_invited_member_row('test@example.com') do - expect(page).to have_button('Reporter') - end + page.within('[role="dialog"]') do + expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests' + click_button('Remove member') end - context 'project bots' do - let(:project_bot) { create(:user, :project_bot, name: 'project_bot') } + wait_for_requests - before do - project.add_maintainer(project_bot) - end + expect(members_table).not_to have_content(other_user.name) + end - it 'does not show form used to change roles and "Expiration date" or the remove user button' do - visit_members_page + it 'invite user to project' do + visit_members_page - page.within find_member_row(project_bot) do - expect(page).not_to have_button('Maintainer') - expect(page).to have_field('Expiration date', disabled: true) - expect(page).not_to have_button('Remove member') - end - end + add_user('test@example.com', 'Reporter') + + click_link 'Invited' + + page.within find_invited_member_row('test@example.com') do + expect(page).to have_button('Reporter') end end - context 'when `vue_project_members_list` feature flag is disabled' do - include Spec::Support::Helpers::Features::ListRowsHelpers + context 'project bots' do + let(:project_bot) { create(:user, :project_bot, name: 'project_bot') } before do - stub_feature_flags(vue_project_members_list: false) + project.add_maintainer(project_bot) end - it 'show members from project and group' do - project.add_developer(user2) - + it 'does not show form used to change roles and "Expiration date" or the remove user button' do visit_members_page - expect(first_row.text).to include(user1.name) - expect(second_row.text).to include(user2.name) + page.within find_member_row(project_bot) do + expect(page).not_to have_button('Maintainer') + expect(page).to have_field('Expiration date', disabled: true) + expect(page).not_to have_button('Remove member') + end end + end - it 'show user once if member of both group and project' do - project.add_developer(user1) - - visit_members_page + describe 'when user has 2FA enabled' do + let_it_be(:admin) { create(:admin) } + let_it_be(:user_with_2fa) { create(:user, :two_factor_via_otp) } - expect(first_row.text).to include(user1.name) - expect(second_row).to be_blank + before do + project.add_guest(user_with_2fa) end - it 'update user access level', :js do - project.add_developer(user2) + it 'shows 2FA badge to user with "Maintainer" access level' do + project.add_maintainer(user1) visit_members_page - page.within(second_row) do - click_button('Developer') - click_link('Reporter') - - expect(page).to have_button('Reporter') - end + expect(find_member_row(user_with_2fa)).to have_content('2FA') end - it 'add user to project', :js do - visit_members_page + it 'shows 2FA badge to admins' do + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) - add_user(user2.id, 'Reporter') + visit_members_page - page.within(second_row) do - expect(page).to have_content(user2.name) - expect(page).to have_button('Reporter') - end + expect(find_member_row(user_with_2fa)).to have_content('2FA') end - it 'remove user from project', :js do - other_user = create(:user) - project.add_developer(other_user) + it 'does not show 2FA badge to users with access level below "Maintainer"' do + group.add_developer(user1) visit_members_page - # Open modal - find(:css, 'li.project_member', text: other_user.name).find(:css, 'button.btn-danger').click - - expect(page).to have_unchecked_field 'Also unassign this user from related issues and merge requests' - - click_on('Remove member') - - wait_for_requests - - expect(page).not_to have_content(other_user.name) - expect(project.users).not_to include(other_user) + expect(find_member_row(user_with_2fa)).not_to have_content('2FA') end - it 'invite user to project', :js do - visit_members_page - - add_user('test@example.com', 'Reporter') + it 'shows 2FA badge to themselves' do + sign_in(user_with_2fa) - click_link 'Invited' + visit_members_page - page.within(first_row) do - expect(page).to have_content('test@example.com') - expect(page).to have_content('Invited') - expect(page).to have_button('Reporter') - end + expect(find_member_row(user_with_2fa)).to have_content('2FA') end + end - context 'project bots' do - let(:project_bot) { create(:user, :project_bot, name: 'project_bot') } - - before do - project.add_maintainer(project_bot) - end + private - it 'does not show form used to change roles and "Expiration date" or the remove user button' do - project_member = project.project_members.find_by(user_id: project_bot.id) + def add_user(id, role) + click_on 'Invite members' - visit_members_page + page.within '#invite-members-modal' do + fill_in 'Search for members to invite', with: id - expect(page).not_to have_selector("#edit_project_member_#{project_member.id}") - expect(page).to have_no_selector("#project_member_#{project_member.id} .btn-danger") - end - end - end + wait_for_requests + click_button id - private + click_button 'Guest' + wait_for_requests + click_button role - def add_user(id, role) - page.within ".invite-users-form" do - select2(id, from: "#user_ids", multiple: true) - select(role, from: "access_level") + click_button 'Invite' end - click_button "Invite" + page.refresh end def visit_members_page |