Fixes #36509 - Fix totalCount handling for GraphQL queries with first…

… parameter
theforeman · Jun 19, 2023 · cb88310 · cb88310
1 parent 59bf491
commit cb88310
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/app/graphql/connections/base_connection.rb b/app/graphql/connections/base_connection.rb
@@ -3,7 +3,7 @@ class BaseConnection < GraphQL::Types::Relay::BaseConnection
     field :total_count, Integer, null: false
 
     def total_count
-      object.nodes.size
+      object.items&.size || 0
     end
   end
 end
diff --git a/test/graphql/queries/models_query_test.rb b/test/graphql/queries/models_query_test.rb
@@ -2,10 +2,12 @@
 
 module Queries
   class ModelsQueryTest < GraphQLQueryTestCase
+    let(:page_size) { 10 }
+
     let(:query) do
       <<-GRAPHQL
       query {
-        models {
+        models(first: #{page_size}) {
           totalCount
           pageInfo {
             startCursor
@@ -27,17 +29,16 @@ class ModelsQueryTest < GraphQLQueryTestCase
     let(:data) { result['data']['models'] }
 
     setup do
-      FactoryBot.create_list(:model, 2)
+      FactoryBot.create_list(:model, 20)
     end
 
     test 'fetching models attributes' do
       assert_empty result['errors']
 
-      expected_count = Model.count
+      expected_total_count = Model.count
 
-      assert_not_equal 0, expected_count
-      assert_equal expected_count, data['totalCount']
-      assert_equal expected_count, data['edges'].count
+      assert_equal expected_total_count, data['totalCount']
+      assert_equal page_size, data['edges'].count
     end
   end
 end