1 files changed, 25 insertions, 3 deletions
diff --git a/spec/features/admin/admin_groups_spec.rb b/spec/features/admin/admin_groups_spec.rb
index 2d541a34f62..040c6a65b7c 100644
--- a/spec/features/admin/admin_groups_spec.rb
+++ b/spec/features/admin/admin_groups_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe 'Admin Groups' do
 
   let_it_be(:user) { create :user }
   let_it_be(:group) { create :group }
-  let_it_be(:current_user) { create(:admin) }
+  let_it_be_with_reload(:current_user) { create(:admin) }
 
   before do
     sign_in(current_user)
@@ -231,11 +231,33 @@ RSpec.describe 'Admin Groups' do
     it_behaves_like 'adds user into a group' do
       let(:user_selector) { user.email }
     end
+
+    context 'when membership is set to expire' do
+      it 'renders relative time' do
+        expire_time = Time.current + 2.days
+        current_user.update!(time_display_relative: true)
+        group.add_member(user, Gitlab::Access::REPORTER, expires_at: expire_time)
+
+        visit admin_group_path(group)
+
+        expect(page).to have_content(/Expires in \d day/)
+      end
+
+      it 'renders absolute time' do
+        expire_time = Time.current.tomorrow.middle_of_day
+        current_user.update!(time_display_relative: false)
+        group.add_member(user, Gitlab::Access::REPORTER, expires_at: expire_time)
+
+        visit admin_group_path(group)
+
+        expect(page).to have_content("Expires on #{expire_time.strftime('%b %-d')}")
+      end
+    end
   end
 
   describe 'add admin himself to a group' do
     before do
-      group.add_user(:user, Gitlab::Access::OWNER)
+      group.add_member(:user, Gitlab::Access::OWNER)
     end
 
     it 'adds admin a to a group as developer', :js do
@@ -252,7 +274,7 @@ RSpec.describe 'Admin Groups' do
 
   describe 'admin removes themself from a group', :js do
     it 'removes admin from the group' do
-      group.add_user(current_user, Gitlab::Access::DEVELOPER)
+      group.add_member(current_user, Gitlab::Access::DEVELOPER)
 
       visit group_group_members_path(group)