Merge pull request #3967 from rmosolgo/node-interface-connection-type-fix

Fix edge/connection class lookup when Node is included in another module

Author: rmosolgo

lib/graphql/schema/member/relay_shortcuts.rb

@@ -8,15 +8,31 @@ def edge_type_class(new_edge_type_class = nil)
           if new_edge_type_class
             @edge_type_class = new_edge_type_class
           else
-            @edge_type_class || find_inherited_value(:edge_type_class, Types::Relay::BaseEdge)
+            # Don't call `ancestor.edge_type_class`
+            # because we don't want a fallback from any ancestors --
+            # only apply the fallback if _no_ ancestor has a configured value!
+            for ancestor in self.ancestors
+              if ancestor.respond_to?(:configured_edge_type_class, true) && (etc = ancestor.configured_edge_type_class)
+                return etc
+              end
+            end
+            Types::Relay::BaseEdge
           end
         end
 
         def connection_type_class(new_connection_type_class = nil)
           if new_connection_type_class
             @connection_type_class = new_connection_type_class
           else
-            @connection_type_class || find_inherited_value(:connection_type_class, Types::Relay::BaseConnection)
+            # Don't call `ancestor.connection_type_class`
+            # because we don't want a fallback from any ancestors --
+            # only apply the fallback if _no_ ancestor has a configured value!
+            for ancestor in self.ancestors
+              if ancestor.respond_to?(:configured_connection_type_class, true) && (ctc = ancestor.configured_connection_type_class)
+                return ctc
+              end
+            end
+            Types::Relay::BaseConnection
           end
         end
 
@@ -41,6 +57,16 @@ def connection_type
             end
           end
         end
+
+        protected
+
+        def configured_connection_type_class
+          @connection_type_class
+        end
+
+        def configured_edge_type_class
+          @edge_type_class
+        end
       end
     end
   end

spec/graphql/schema/member/relay_shortcuts_spec.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::Schema::Member::RelayShortcuts do
+  describe ".connection_type_class, .edge_type_class" do
+    class CustomBaseConnectionType < GraphQL::Types::Relay::BaseConnection
+    end
+
+    class CustomEdgeType < GraphQL::Types::Relay::BaseEdge
+    end
+
+    class ConnectionTypeBaseObject < GraphQL::Schema::Object
+      connection_type_class CustomBaseConnectionType
+      edge_type_class CustomEdgeType
+    end
+
+    class ImplementationTypeObject < ConnectionTypeBaseObject
+      implements GraphQL::Types::Relay::Node
+    end
+
+    module ConnectionTypeBaseInterface
+      include GraphQL::Schema::Interface
+      connection_type_class CustomBaseConnectionType
+      edge_type_class CustomEdgeType
+    end
+
+    module NodeImplementingInterface
+      include ConnectionTypeBaseInterface
+      implements GraphQL::Types::Relay::Node
+    end
+
+    it "uses the custom class, even when Node is implemented" do
+      assert_equal CustomBaseConnectionType, ConnectionTypeBaseObject.connection_type_class
+      assert_equal GraphQL::Types::Relay::BaseConnection, GraphQL::Types::Relay::Node.connection_type_class
+      assert_equal CustomBaseConnectionType, ImplementationTypeObject.connection_type_class
+      assert_equal CustomBaseConnectionType, ConnectionTypeBaseInterface.connection_type_class
+      assert_equal CustomBaseConnectionType, NodeImplementingInterface.connection_type_class
+
+      assert_equal CustomEdgeType, ConnectionTypeBaseObject.edge_type_class
+      assert_equal GraphQL::Types::Relay::BaseEdge, GraphQL::Types::Relay::Node.edge_type_class
+      assert_equal CustomEdgeType, ImplementationTypeObject.edge_type_class
+      assert_equal CustomEdgeType, ConnectionTypeBaseInterface.edge_type_class
+      assert_equal CustomEdgeType, NodeImplementingInterface.edge_type_class
+
+    end
+  end
+end