1 files changed, 5 insertions, 9 deletions
diff --git a/spec/requests/api/graphql/users_spec.rb b/spec/requests/api/graphql/users_spec.rb
index 91ac206676b..72d86c10df1 100644
--- a/spec/requests/api/graphql/users_spec.rb
+++ b/spec/requests/api/graphql/users_spec.rb
@@ -59,20 +59,16 @@ RSpec.describe 'Users' do
   describe 'sorting and pagination' do
     let_it_be(:data_path) { [:users] }
 
-    def pagination_query(params, page_info)
-      graphql_query_for("users", params, "#{page_info} edges { node { id } }")
-    end
-
-    def pagination_results_data(data)
-      data.map { |user| user.dig('node', 'id') }
+    def pagination_query(params)
+      graphql_query_for(:users, params, "#{page_info} nodes { id }")
     end
 
     context 'when sorting by created_at' do
-      let_it_be(:ascending_users) { [user3, user2, user1, current_user].map(&:to_global_id).map(&:to_s) }
+      let_it_be(:ascending_users) { [user3, user2, user1, current_user].map { |u| global_id_of(u) } }
 
       context 'when ascending' do
         it_behaves_like 'sorted paginated query' do
-          let(:sort_param)       { 'created_asc' }
+          let(:sort_param)       { :CREATED_ASC }
           let(:first_param)      { 1 }
           let(:expected_results) { ascending_users }
         end
@@ -80,7 +76,7 @@ RSpec.describe 'Users' do
 
       context 'when descending' do
         it_behaves_like 'sorted paginated query' do
-          let(:sort_param)       { 'created_desc' }
+          let(:sort_param)       { :CREATED_DESC }
           let(:first_param)      { 1 }
           let(:expected_results) { ascending_users.reverse }
         end