1 files changed, 83 insertions, 30 deletions

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