3 files changed, 80 insertions, 0 deletions
diff --git a/spec/requests/api/graphql/ci/group_variables_spec.rb b/spec/requests/api/graphql/ci/group_variables_spec.rb
index 51cbb4719f7..e45ddbb1585 100644
--- a/spec/requests/api/graphql/ci/group_variables_spec.rb
+++ b/spec/requests/api/graphql/ci/group_variables_spec.rb
@@ -72,4 +72,32 @@ RSpec.describe 'Query.group(fullPath).ciVariables', feature_category: :pipeline_
       expect(graphql_data.dig('group', 'ciVariables')).to be_nil
     end
   end
+
+  describe 'sorting and pagination' do
+    let_it_be(:current_user) { user }
+    let_it_be(:data_path) { [:group, :ci_variables] }
+    let_it_be(:variables) do
+      [
+        create(:ci_group_variable, group: group, key: 'd'),
+        create(:ci_group_variable, group: group, key: 'a'),
+        create(:ci_group_variable, group: group, key: 'c'),
+        create(:ci_group_variable, group: group, key: 'e'),
+        create(:ci_group_variable, group: group, key: 'b')
+      ]
+    end
+
+    def pagination_query(params)
+      graphql_query_for(
+        :group,
+        { fullPath: group.full_path },
+        query_graphql_field('ciVariables', params, "#{page_info} nodes { id }")
+      )
+    end
+
+    before do
+      group.add_owner(current_user)
+    end
+
+    it_behaves_like 'sorted paginated variables'
+  end
 end
diff --git a/spec/requests/api/graphql/ci/instance_variables_spec.rb b/spec/requests/api/graphql/ci/instance_variables_spec.rb
index e0397e17923..5b65ae88426 100644
--- a/spec/requests/api/graphql/ci/instance_variables_spec.rb
+++ b/spec/requests/api/graphql/ci/instance_variables_spec.rb
@@ -69,4 +69,28 @@ RSpec.describe 'Query.ciVariables', feature_category: :pipeline_authoring do
       expect(graphql_data.dig('ciVariables')).to be_nil
     end
   end
+
+  describe 'sorting and pagination' do
+    let_it_be(:current_user) { create(:admin) }
+    let_it_be(:data_path) { [:ci_variables] }
+    let_it_be(:variables) do
+      [
+        create(:ci_instance_variable, key: 'd'),
+        create(:ci_instance_variable, key: 'a'),
+        create(:ci_instance_variable, key: 'c'),
+        create(:ci_instance_variable, key: 'e'),
+        create(:ci_instance_variable, key: 'b')
+      ]
+    end
+
+    def pagination_query(params)
+      graphql_query_for(
+        :ci_variables,
+        params,
+        "#{page_info} nodes { id }"
+      )
+    end
+
+    it_behaves_like 'sorted paginated variables'
+  end
 end
diff --git a/spec/requests/api/graphql/ci/project_variables_spec.rb b/spec/requests/api/graphql/ci/project_variables_spec.rb
index 0338b58a0ea..f9a32b42b4d 100644
--- a/spec/requests/api/graphql/ci/project_variables_spec.rb
+++ b/spec/requests/api/graphql/ci/project_variables_spec.rb
@@ -66,4 +66,32 @@ RSpec.describe 'Query.project(fullPath).ciVariables', feature_category: :pipelin
       expect(graphql_data.dig('project', 'ciVariables')).to be_nil
     end
   end
+
+  describe 'sorting and pagination' do
+    let_it_be(:current_user) { user }
+    let_it_be(:data_path) { [:project, :ci_variables] }
+    let_it_be(:variables) do
+      [
+        create(:ci_variable, project: project, key: 'd'),
+        create(:ci_variable, project: project, key: 'a'),
+        create(:ci_variable, project: project, key: 'c'),
+        create(:ci_variable, project: project, key: 'e'),
+        create(:ci_variable, project: project, key: 'b')
+      ]
+    end
+
+    def pagination_query(params)
+      graphql_query_for(
+        :project,
+        { fullPath: project.full_path },
+        query_graphql_field('ciVariables', params, "#{page_info} nodes { id }")
+      )
+    end
+
+    before do
+      project.add_maintainer(current_user)
+    end
+
+    it_behaves_like 'sorted paginated variables'
+  end
 end