Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 5 insertions, 11 deletions

diff --git a/spec/support/shared_examples/requests/api/graphql/group_and_project_boards_query_shared_examples.rb b/spec/support/shared_examples/requests/api/graphql/group_and_project_boards_query_shared_examples.rb
index 5145880ef9a..54f4ba7ff73 100644
--- a/spec/support/shared_examples/requests/api/graphql/group_and_project_boards_query_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/graphql/group_and_project_boards_query_shared_examples.rb
@@ -47,18 +47,12 @@ RSpec.shared_examples 'group and project boards query' do
     describe 'sorting and pagination' do
       let(:data_path) { [board_parent_type, :boards] }
 
-      def pagination_query(params, page_info)
-        graphql_query_for(
-          board_parent_type,
-          { 'fullPath' => board_parent.full_path },
-          query_graphql_field('boards', params, "#{page_info} edges { node { id } }")
+      def pagination_query(params)
+        graphql_query_for(board_parent_type, { full_path: board_parent.full_path },
+          query_nodes(:boards, :id, include_pagination_info: true, args: params)
         )
       end
 
-      def pagination_results_data(data)
-        data.map { |board| board.dig('node', 'id') }
-      end
-
       context 'when using default sorting' do
         let!(:board_B) { create(:board, resource_parent: board_parent, name: 'B') }
         let!(:board_C) { create(:board, resource_parent: board_parent, name: 'C') }
@@ -72,9 +66,9 @@ RSpec.shared_examples 'group and project boards query' do
             let(:first_param)      { 2 }
             let(:expected_results) do
               if board_parent.multiple_issue_boards_available?
-                boards.map { |board| board.to_global_id.to_s }
+                boards.map { |board| global_id_of(board) }
               else
-                [boards.first.to_global_id.to_s]
+                [global_id_of(boards.first)]
               end
             end
           end