Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 27 insertions, 83 deletions

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 1127c64e0c7..d22097a2f6f 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
@@ -18,107 +18,51 @@ RSpec.describe 'Projects > Members > Maintainer adds member with expiration date
     sign_in(maintainer)
   end
 
-  context 'when `vue_project_members_list` feature flag is enabled' do
-    it 'expiration date is displayed in the members list' do
-      stub_feature_flags(invite_members_group_modal: false)
+  it 'expiration date is displayed in the members list' do
+    stub_feature_flags(invite_members_group_modal: false)
 
-      visit project_project_members_path(project)
+    visit project_project_members_path(project)
 
-      page.within '.invite-users-form' do
-        select2(new_member.id, from: '#user_ids', multiple: true)
+    page.within '.invite-users-form' do
+      select2(new_member.id, from: '#user_ids', multiple: true)
 
-        fill_in 'expires_at', with: 5.days.from_now.to_date
-        find_field('expires_at').native.send_keys :enter
+      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 find_member_row(new_member) do
-        expect(page).to have_content(/in \d days/)
-      end
-    end
-
-    it 'changes expiration date' do
-      project.team.add_users([new_member.id], :developer, expires_at: 3.days.from_now.to_date)
-      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
-        find_field('Expiration date').native.send_keys :enter
-
-        wait_for_requests
-
-        expect(page).to have_content(/in \d days/)
-      end
+      click_on 'Invite'
     end
 
-    it 'clears expiration date' do
-      project.team.add_users([new_member.id], :developer, expires_at: 5.days.from_now.to_date)
-      visit project_project_members_path(project)
-
-      page.within find_member_row(new_member) do
-        expect(page).to have_content(/in \d days/)
-
-        find('[data-testid="clear-button"]').click
-
-        wait_for_requests
-
-        expect(page).to have_content('No expiration set')
-      end
+    page.within find_member_row(new_member) do
+      expect(page).to have_content(/in \d days/)
     end
   end
 
-  context 'when `vue_project_members_list` feature flag is disabled' do
-    before do
-      stub_feature_flags(vue_project_members_list: false)
-    end
-
-    it 'expiration date is displayed in the members list' do
-      stub_feature_flags(invite_members_group_modal: false)
-
-      visit project_project_members_path(project)
-
-      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
+  it 'changes expiration date' do
+    project.team.add_users([new_member.id], :developer, expires_at: 3.days.from_now.to_date)
+    visit project_project_members_path(project)
 
-        click_on 'Invite'
-      end
+    page.within find_member_row(new_member) do
+      fill_in 'Expiration date', with: 5.days.from_now.to_date
+      find_field('Expiration date').native.send_keys :enter
 
-      page.within "#project_member_#{project_member_id}" do
-        expect(page).to have_content('Expires in 3 days')
-      end
-    end
-
-    it 'changes expiration date' do
-      project.team.add_users([new_member.id], :developer, expires_at: 1.day.from_now.to_date)
-      visit project_project_members_path(project)
-
-      page.within "#project_member_#{project_member_id}" do
-        fill_in 'Expiration date', with: 3.days.from_now.to_date
-        find_field('Expiration date').native.send_keys :enter
+      wait_for_requests
 
-        wait_for_requests
-
-        expect(page).to have_content('Expires in 3 days')
-      end
+      expect(page).to have_content(/in \d days/)
     end
+  end
 
-    it 'clears expiration date' do
-      project.team.add_users([new_member.id], :developer, expires_at: 3.days.from_now.to_date)
-      visit project_project_members_path(project)
+  it 'clears expiration date' do
+    project.team.add_users([new_member.id], :developer, expires_at: 5.days.from_now.to_date)
+    visit project_project_members_path(project)
 
-      page.within "#project_member_#{project_member_id}" do
-        expect(page).to have_content('Expires in 3 days')
+    page.within find_member_row(new_member) do
+      expect(page).to have_content(/in \d days/)
 
-        find('.js-clear-input').click
+      find('[data-testid="clear-button"]').click
 
-        wait_for_requests
+      wait_for_requests
 
-        expect(page).not_to have_content('Expires in')
-      end
+      expect(page).to have_content('No expiration set')
     end
   end