From d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 Oct 2021 08:43:02 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-4-stable-ee --- .../master_adds_member_with_expiration_date_spec.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb') diff --git a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb index c1b14cf60e7..830ada29a2e 100644 --- a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb +++ b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb @@ -9,6 +9,8 @@ RSpec.describe 'Projects > Members > Maintainer adds member with expiration date let_it_be(:maintainer) { create(:user) } let_it_be(:project) { create(:project) } + let_it_be(:three_days_from_now) { 3.days.from_now.to_date } + let_it_be(:five_days_from_now) { 5.days.from_now.to_date } let(:new_member) { create(:user) } @@ -22,39 +24,39 @@ RSpec.describe 'Projects > Members > Maintainer adds member with expiration date it 'expiration date is displayed in the members list' do visit project_project_members_path(project) - invite_member(new_member.name, role: 'Guest', expires_at: 5.days.from_now.to_date) + invite_member(new_member.name, role: 'Guest', expires_at: five_days_from_now) page.within find_member_row(new_member) do - expect(page).to have_content(/in \d days/) + expect(page).to have_field('Expiration date', with: five_days_from_now) end end it 'changes expiration date' do - project.team.add_users([new_member.id], :developer, expires_at: 3.days.from_now.to_date) + project.team.add_users([new_member.id], :developer, expires_at: three_days_from_now) visit project_project_members_path(project) page.within find_member_row(new_member) do - fill_in 'Expiration date', with: 5.days.from_now.to_date + fill_in 'Expiration date', with: five_days_from_now find_field('Expiration date').native.send_keys :enter wait_for_requests - expect(page).to have_content(/in \d days/) + expect(page).to have_field('Expiration date', with: five_days_from_now) end end it 'clears expiration date' do - project.team.add_users([new_member.id], :developer, expires_at: 5.days.from_now.to_date) + project.team.add_users([new_member.id], :developer, expires_at: five_days_from_now) visit project_project_members_path(project) page.within find_member_row(new_member) do - expect(page).to have_content(/in \d days/) + expect(page).to have_field('Expiration date', with: five_days_from_now) find('[data-testid="clear-button"]').click wait_for_requests - expect(page).to have_content('No expiration set') + expect(page).to have_field('Expiration date', with: '') end end -- cgit v1.2.3