diff options
Diffstat (limited to 'spec/features/groups/members')
3 files changed, 122 insertions, 68 deletions
diff --git a/spec/features/groups/members/leave_group_spec.rb b/spec/features/groups/members/leave_group_spec.rb index 9eb5cc15c5e..32acf7edd2a 100644 --- a/spec/features/groups/members/leave_group_spec.rb +++ b/spec/features/groups/members/leave_group_spec.rb @@ -70,7 +70,7 @@ RSpec.describe 'Groups > Members > Leave group' do visit group_group_members_path(group) - expect(find(:css, '.project-members-page li', text: user.name)).not_to have_selector(:css, 'a.btn-remove') + expect(find(:css, '.project-members-page li', text: user.name)).to have_no_selector(:css, 'a.btn-danger') end it 'owner can not leave the group by url param if they are the last owner', :js do diff --git a/spec/features/groups/members/manage_groups_spec.rb b/spec/features/groups/members/manage_groups_spec.rb index e3bbbd4d73b..33caa3af36d 100644 --- a/spec/features/groups/members/manage_groups_spec.rb +++ b/spec/features/groups/members/manage_groups_spec.rb @@ -6,62 +6,115 @@ RSpec.describe 'Groups > Members > Manage groups', :js do include Select2Helper include Spec::Support::Helpers::Features::ListRowsHelpers - let(:user) { create(:user) } - let(:shared_with_group) { create(:group) } - let(:shared_group) { create(:group) } + let_it_be(:user) { create(:user) } before do stub_feature_flags(vue_group_members_list: false) - shared_group.add_owner(user) sign_in(user) end - it 'add group to group' do - visit group_group_members_path(shared_group) + context 'when group link does not exist' do + let_it_be(:group) { create(:group) } + let_it_be(:group_to_add) { create(:group) } - add_group(shared_with_group.id, 'Reporter') + before do + group.add_owner(user) + visit group_group_members_path(group) + end - click_groups_tab + it 'add group to group' do + add_group(group_to_add.id, 'Reporter') - page.within(first_row) do - expect(page).to have_content(shared_with_group.name) - expect(page).to have_content('Reporter') + click_groups_tab + + page.within(first_row) do + expect(page).to have_content(group_to_add.name) + expect(page).to have_content('Reporter') + end end end - it 'remove group from group' do - create(:group_group_link, shared_group: shared_group, - shared_with_group: shared_with_group, group_access: ::Gitlab::Access::DEVELOPER) + context 'when group link exists' do + let_it_be(:shared_with_group) { create(:group) } + let_it_be(:shared_group) { create(:group) } - visit group_group_members_path(shared_group) + let(:additional_link_attrs) { {} } - click_groups_tab + let_it_be(:group_link, refind: true) do + create( + :group_group_link, + shared_group: shared_group, + shared_with_group: shared_with_group, + group_access: ::Gitlab::Access::DEVELOPER + ) + end - expect(page).to have_content(shared_with_group.name) + before do + travel_to Time.now.utc.beginning_of_day + group_link.update!(additional_link_attrs) - accept_confirm do - find(:css, '#tab-groups li', text: shared_with_group.name).find(:css, 'a.btn-remove').click + shared_group.add_owner(user) + visit group_group_members_path(shared_group) end - expect(page).not_to have_content(shared_with_group.name) - end + it 'remove group from group' do + click_groups_tab + + expect(page).to have_content(shared_with_group.name) + + accept_confirm do + find(:css, '#tab-groups li', text: shared_with_group.name).find(:css, 'a.btn-danger').click + end + + expect(page).not_to have_content(shared_with_group.name) + end - it 'update group to owner level' do - create(:group_group_link, shared_group: shared_group, - shared_with_group: shared_with_group, group_access: ::Gitlab::Access::DEVELOPER) + it 'update group to owner level' do + click_groups_tab - visit group_group_members_path(shared_group) + page.within(first_row) do + click_button('Developer') + click_link('Maintainer') - click_groups_tab + wait_for_requests - page.within(first_row) do - click_button('Developer') - click_link('Maintainer') + expect(page).to have_button('Maintainer') + end + end + + it 'updates expiry date' do + click_groups_tab + + expires_at_field = "member_expires_at_#{shared_with_group.id}" + fill_in "member_expires_at_#{shared_with_group.id}", with: 3.days.from_now.to_date + find_field(expires_at_field).native.send_keys :enter wait_for_requests - expect(page).to have_button('Maintainer') + page.within(find('li.group_member')) do + expect(page).to have_content('Expires in 3 days') + end + end + + context 'when expiry date is set' do + let(:additional_link_attrs) { { expires_at: 3.days.from_now.to_date } } + + it 'clears expiry date' do + click_groups_tab + + page.within(find('li.group_member')) do + expect(page).to have_content('Expires in 3 days') + + page.within(find('.js-edit-member-form')) do + find('.js-clear-input').click + end + + wait_for_requests + + expect(page).not_to have_content('Expires in') + end + end end end diff --git a/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb index d94cc85f411..dd708c243a8 100644 --- a/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb +++ b/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb @@ -6,65 +6,66 @@ RSpec.describe 'Groups > Members > Owner adds member with expiration date', :js include Select2Helper include ActiveSupport::Testing::TimeHelpers - let(:user1) { create(:user, name: 'John Doe') } - let!(:new_member) { create(:user, name: 'Mary Jane') } - let(:group) { create(:group) } + let_it_be(:user1) { create(:user, name: 'John Doe') } + let_it_be(:group) { create(:group) } + let(:new_member) { create(:user, name: 'Mary Jane') } before do stub_feature_flags(vue_group_members_list: false) + travel_to Time.now.utc.beginning_of_day + group.add_owner(user1) sign_in(user1) end it 'expiration date is displayed in the members list' do - travel_to Time.zone.parse('2016-08-06 08:00') do - date = 4.days.from_now - visit group_group_members_path(group) - - page.within '.invite-users-form' do - select2(new_member.id, from: '#user_ids', multiple: true) - fill_in 'expires_at', with: date.to_s(:medium) + "\n" - click_on 'Invite' - end - - page.within "#group_member_#{group_member_id(new_member)}" do - expect(page).to have_content('Expires in 4 days') - end + visit group_group_members_path(group) + + page.within '.invite-users-form' do + select2(new_member.id, from: '#user_ids', multiple: true) + + fill_in 'expires_at', with: 3.days.from_now.to_date + find_field('expires_at').native.send_keys :enter + + click_on 'Invite' + end + + page.within "#group_member_#{group_member_id}" do + expect(page).to have_content('Expires in 3 days') end end - it 'change expiration date' do - travel_to Time.zone.parse('2016-08-06 08:00') do - date = 3.days.from_now - group.add_developer(new_member) + it 'changes expiration date' do + group.add_developer(new_member) + visit group_group_members_path(group) + + page.within "#group_member_#{group_member_id}" do + fill_in 'Expiration date', with: 3.days.from_now.to_date + find_field('Expiration date').native.send_keys :enter - visit group_group_members_path(group) + wait_for_requests - page.within "#group_member_#{group_member_id(new_member)}" do - find('.js-access-expiration-date').set date.to_s(:medium) + "\n" - wait_for_requests - expect(page).to have_content('Expires in 3 days') - end + expect(page).to have_content('Expires in 3 days') end end - it 'remove expiration date' do - travel_to Time.zone.parse('2016-08-06 08:00') do - date = 3.days.from_now - group_member = create(:group_member, :developer, user: new_member, group: group, expires_at: date.to_s(:medium)) + it 'clears expiration date' do + create(:group_member, :developer, user: new_member, group: group, expires_at: 3.days.from_now.to_date) + visit group_group_members_path(group) + + page.within "#group_member_#{group_member_id}" do + expect(page).to have_content('Expires in 3 days') + + find('.js-clear-input').click - visit group_group_members_path(group) + wait_for_requests - page.within "#group_member_#{group_member.id}" do - find('.js-clear-input').click - wait_for_requests - expect(page).not_to have_content('Expires in 3 days') - end + expect(page).not_to have_content('Expires in') end end - def group_member_id(user) + def group_member_id group.members.find_by(user_id: new_member).id end end |