diff options
Diffstat (limited to 'spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb')
-rw-r--r-- | spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb | 34 |
1 files changed, 13 insertions, 21 deletions
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 dd708c243a8..de9b32e00aa 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 @@ -4,17 +4,13 @@ require 'spec_helper' RSpec.describe 'Groups > Members > Owner adds member with expiration date', :js do include Select2Helper - include ActiveSupport::Testing::TimeHelpers + include Spec::Support::Helpers::Features::MembersHelpers 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 @@ -22,17 +18,17 @@ RSpec.describe 'Groups > Members > Owner adds member with expiration date', :js it 'expiration date is displayed in the members list' do visit group_group_members_path(group) - page.within '.invite-users-form' do + 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 + fill_in 'expires_at', with: 5.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') + page.within second_row do + expect(page).to have_content(/in \d days/) end end @@ -40,32 +36,28 @@ RSpec.describe 'Groups > Members > Owner adds member with expiration date', :js 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 + page.within second_row do + fill_in 'Expiration date', with: 5.days.from_now.to_date find_field('Expiration date').native.send_keys :enter wait_for_requests - expect(page).to have_content('Expires in 3 days') + expect(page).to have_content(/in \d days/) end end it 'clears expiration date' do - create(:group_member, :developer, user: new_member, group: group, expires_at: 3.days.from_now.to_date) + create(:group_member, :developer, user: new_member, group: group, expires_at: 5.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') + page.within second_row do + expect(page).to have_content(/in \d days/) - find('.js-clear-input').click + find('[data-testid="clear-button"]').click wait_for_requests - expect(page).not_to have_content('Expires in') + expect(page).to have_content('No expiration set') end end - - def group_member_id - group.members.find_by(user_id: new_member).id - end end |