1 files changed, 12 insertions, 19 deletions
diff --git a/spec/features/admin/admin_users_impersonation_tokens_spec.rb b/spec/features/admin/admin_users_impersonation_tokens_spec.rb
index 45dccf9921f..d93dac4834e 100644
--- a/spec/features/admin/admin_users_impersonation_tokens_spec.rb
+++ b/spec/features/admin/admin_users_impersonation_tokens_spec.rb
@@ -4,18 +4,11 @@ require 'spec_helper'
 
 RSpec.describe 'Admin > Users > Impersonation Tokens', :js do
   include Spec::Support::Helpers::ModalHelpers
+  include Spec::Support::Helpers::AccessTokenHelpers
 
   let(:admin) { create(:admin) }
   let!(:user) { create(:user) }
 
-  def active_impersonation_tokens
-    find("[data-testid='active-tokens']")
-  end
-
-  def created_impersonation_token
-    find_field('new-access-token').value
-  end
-
   before do
     sign_in(admin)
     gitlab_enable_admin_mode_sign_in(admin)
@@ -39,12 +32,12 @@ RSpec.describe 'Admin > Users > Impersonation Tokens', :js do
 
       click_on "Create impersonation token"
 
-      expect(active_impersonation_tokens).to have_text(name)
-      expect(active_impersonation_tokens).to have_text('in')
-      expect(active_impersonation_tokens).to have_text('read_api')
-      expect(active_impersonation_tokens).to have_text('read_user')
+      expect(active_access_tokens).to have_text(name)
+      expect(active_access_tokens).to have_text('in')
+      expect(active_access_tokens).to have_text('read_api')
+      expect(active_access_tokens).to have_text('read_user')
       expect(PersonalAccessTokensFinder.new(impersonation: true).execute.count).to equal(1)
-      expect(created_impersonation_token).not_to be_empty
+      expect(created_access_token).to match(/[\w-]{20}/)
     end
   end
 
@@ -55,16 +48,16 @@ RSpec.describe 'Admin > Users > Impersonation Tokens', :js do
     it 'only shows impersonation tokens' do
       visit admin_user_impersonation_tokens_path(user_id: user.username)
 
-      expect(active_impersonation_tokens).to have_text(impersonation_token.name)
-      expect(active_impersonation_tokens).not_to have_text(personal_access_token.name)
-      expect(active_impersonation_tokens).to have_text('in')
+      expect(active_access_tokens).to have_text(impersonation_token.name)
+      expect(active_access_tokens).not_to have_text(personal_access_token.name)
+      expect(active_access_tokens).to have_text('in')
     end
 
     it 'shows absolute times' do
       admin.update!(time_display_relative: false)
       visit admin_user_impersonation_tokens_path(user_id: user.username)
 
-      expect(active_impersonation_tokens).to have_text(personal_access_token.expires_at.strftime('%b %-d'))
+      expect(active_access_tokens).to have_text(personal_access_token.expires_at.strftime('%b %-d'))
     end
   end
 
@@ -76,7 +69,7 @@ RSpec.describe 'Admin > Users > Impersonation Tokens', :js do
 
       accept_gl_confirm(button_text: 'Revoke') { click_on "Revoke" }
 
-      expect(active_impersonation_tokens).to have_text("This user has no active impersonation tokens.")
+      expect(active_access_tokens).to have_text("This user has no active impersonation tokens.")
     end
 
     it "removes expired tokens from 'active' section" do
@@ -84,7 +77,7 @@ RSpec.describe 'Admin > Users > Impersonation Tokens', :js do
 
       visit admin_user_impersonation_tokens_path(user_id: user.username)
 
-      expect(active_impersonation_tokens).to have_text("This user has no active impersonation tokens.")
+      expect(active_access_tokens).to have_text("This user has no active impersonation tokens.")
     end
   end