Merge pull request #3438 from rmosolgo/fix-field-page-size-override

Fix when field max_page_size override is nil

Author: Robert Mosolgo

lib/graphql/pagination/connections.rb

@@ -79,7 +79,7 @@ def wrap(field, parent, items, arguments, context)
           context: context,
           parent: parent,
           field: field,
-          max_page_size: field.max_page_size || context.schema.default_max_page_size,
+          max_page_size: field.has_max_page_size? ? field.max_page_size : context.schema.default_max_page_size,
           first: arguments[:first],
           after: arguments[:after],
           last: arguments[:last],

spec/graphql/pagination/connections_spec.rb

@@ -35,7 +35,7 @@ class OtherArrayConnection < GraphQL::Pagination::ArrayConnection; end
   end
 
   it "returns connections by class, using inherited mappings and local overrides" do
-    field_defn = OpenStruct.new(max_page_size: 10, type: GraphQL::Types::Relay::BaseConnection)
+    field_defn = OpenStruct.new(has_max_page_size?: true, max_page_size: 10, type: GraphQL::Types::Relay::BaseConnection)
 
     set_wrapper = schema.connections.wrap(field_defn, nil, Set.new([1,2,3]), {}, nil)
     assert_instance_of SetConnection, set_wrapper
@@ -114,12 +114,45 @@ def things2
 
   it "lets unrelated NoMethodErrors bubble up" do
     err = assert_raises NoMethodError do
-      pp ConnectionErrorTestSchema.execute("{ things2 { name } }")
+      ConnectionErrorTestSchema.execute("{ things2 { name } }")
     end
 
     assert_includes err.message, "undefined method `no_such_method' for <BadThing!>"
   end
 
+  it "uses a field's `max_page_size: nil` configuration" do
+    user_type = Class.new(GraphQL::Schema::Object) do
+      graphql_name 'User'
+      field :name, String, null: false
+    end
+
+    query_type = Class.new(GraphQL::Schema::Object) do
+      graphql_name 'Query'
+      field :users, user_type.connection_type, null: true, max_page_size: nil
+      def users
+        [{ name: 'Yoda' }, { name: 'Anakin' }, { name: 'Obi Wan' }]
+      end
+    end
+
+    schema = Class.new(GraphQL::Schema) do
+      # This value should be overriden by `max_page_size: nil` in the field definition above
+      default_max_page_size 2
+      query(query_type)
+    end
+
+    res = schema.execute(<<-GRAPHQL).to_h
+      {
+        users {
+          nodes {
+            name
+          }
+        }
+      }
+    GRAPHQL
+
+    assert_equal ["Yoda", "Anakin", "Obi Wan"], res['data']['users']['nodes'].map { |node| node['name'] }
+  end
+
   class SingleNewConnectionSchema < GraphQL::Schema
     class Query < GraphQL::Schema::Object
       field :strings, GraphQL::Types::String.connection_type, null: false