1 files changed, 18 insertions, 7 deletions

diff --git a/spec/requests/groups/settings/access_tokens_controller_spec.rb b/spec/requests/groups/settings/access_tokens_controller_spec.rb
index cf728b3935f..6b150e0acb6 100644
--- a/spec/requests/groups/settings/access_tokens_controller_spec.rb
+++ b/spec/requests/groups/settings/access_tokens_controller_spec.rb
@@ -5,11 +5,11 @@ require 'spec_helper'
 RSpec.describe Groups::Settings::AccessTokensController do
   let_it_be(:user) { create(:user) }
   let_it_be(:resource) { create(:group) }
-  let_it_be(:bot_user) { create(:user, :project_bot) }
+  let_it_be(:access_token_user) { create(:user, :project_bot) }
 
   before_all do
     resource.add_owner(user)
-    resource.add_maintainer(bot_user)
+    resource.add_maintainer(access_token_user)
   end
 
   before do
@@ -27,13 +27,24 @@ RSpec.describe Groups::Settings::AccessTokensController do
   end
 
   describe 'GET /:namespace/-/settings/access_tokens' do
-    subject do
+    let(:get_access_tokens) do
       get group_settings_access_tokens_path(resource)
       response
     end
 
+    let(:get_access_tokens_json) do
+      get group_settings_access_tokens_path(resource), params: { format: :json }
+      response
+    end
+
+    subject(:get_access_tokens_with_page) do
+      get group_settings_access_tokens_path(resource), params: { page: 1 }
+      response
+    end
+
     it_behaves_like 'feature unavailable'
     it_behaves_like 'GET resource access tokens available'
+    it_behaves_like 'GET access tokens are paginated and ordered'
   end
 
   describe 'POST /:namespace/-/settings/access_tokens' do
@@ -77,7 +88,7 @@ RSpec.describe Groups::Settings::AccessTokensController do
   end
 
   describe 'PUT /:namespace/-/settings/access_tokens/:id', :sidekiq_inline do
-    let(:resource_access_token) { create(:personal_access_token, user: bot_user) }
+    let(:resource_access_token) { create(:personal_access_token, user: access_token_user) }
 
     subject do
       put revoke_group_settings_access_token_path(resource, resource_access_token)
@@ -89,17 +100,17 @@ RSpec.describe Groups::Settings::AccessTokensController do
   end
 
   describe '#index' do
-    let_it_be(:resource_access_tokens) { create_list(:personal_access_token, 3, user: bot_user) }
+    let_it_be(:resource_access_tokens) { create_list(:personal_access_token, 3, user: access_token_user) }
 
     before do
       get group_settings_access_tokens_path(resource)
     end
 
     it 'includes details of the active group access tokens' do
-      active_resource_access_tokens =
+      active_access_tokens =
         ::GroupAccessTokenSerializer.new.represent(resource_access_tokens.reverse, group: resource)
 
-      expect(assigns(:active_resource_access_tokens).to_json).to eq(active_resource_access_tokens.to_json)
+      expect(assigns(:active_access_tokens).to_json).to eq(active_access_tokens.to_json)
     end
   end
 end