Update more tests

Author: rmosolgo

lib/graphql/schema.rb

@@ -862,7 +862,7 @@ def orphan_types(*new_orphan_types)
             raise ArgumentError, <<~ERR
               Only object type classes should be added as `orphan_types(...)`.
 
-              - Remove these no-op types from `orphan_types`: #{non_object_types.map(&:inspect).join(", ")}
+              - Remove these no-op types from `orphan_types`: #{non_object_types.map { |t| "#{t.inspect} (#{t.kind.name})"}.join(", ")}
               - See https://graphql-ruby.org/type_definitions/interfaces.html#orphan-types
 
               To add other types to your schema, you might want `extra_types`: https://graphql-ruby.org/schema/definition.html#extra-types

spec/graphql/schema/dynamic_members_spec.rb

@@ -325,6 +325,10 @@ def actor
       def yell(scream:)
         scream
       end
+
+      # just to attach these to the schema:
+      field :example_locale, Locale
+      field :example_region, Region
     end
 
     class BaseMutation < GraphQL::Schema::RelayClassicMutation
@@ -475,6 +479,8 @@ def legacy_schema_sdl
 type Query {
   actor: Actor
   add(left: Float!, right: Float!): String!
+  exampleLocale: Locale
+  exampleRegion: Region
   f1: String
   favoriteLanguage(lang: Language): Language!
   legacyThing(id: ID!): LegacyThing!
@@ -878,7 +884,6 @@ def thing
       end
 
       query(Query)
-      extra_types(ThingScalar, ThingEnum, ThingInput, ThingObject, ThingUnion, ThingInterface)
     end
   end
 

spec/graphql/schema/printer_spec.rb

@@ -92,6 +92,8 @@ class Query < GraphQL::Schema::Object
       field :no_fields_type, NoFields do
         argument :no_arguments_input, NoArguments
       end
+
+      field :example_media, Media
     end
 
     class CreatePost < GraphQL::Schema::RelayClassicMutation
@@ -114,7 +116,7 @@ class Subscription < GraphQL::Schema::Object
     query(Query)
     mutation(Mutation)
     subscription(Subscription)
-    extra_types [Media, MediaRating]
+    extra_types [MediaRating]
   end
 
   let(:schema) { PrinterTestSchema }
@@ -587,6 +589,7 @@ class Subscription < GraphQL::Schema::Object
 The query root of this schema
 """
 type Query {
+  exampleMedia: Media
   noFieldsType(noArgumentsInput: NoArguments!): NoFields
   post(
     deprecatedArg: String @deprecated(reason: "Use something else")
@@ -791,6 +794,7 @@ def self.visible?(member, ctx)
 The query root of this schema
 """
 type Query {
+  exampleMedia: Media
   noFieldsType(noArgumentsInput: NoArguments!): NoFields
   post(
     """

spec/graphql/schema/union_spec.rb

@@ -282,10 +282,12 @@ def unboxed_union
       possible_types object_type, GraphQL::Schema::LateBoundType.new("SomeInterface")
     end
 
+    object_type.field(:u, union_type)
+    object_type.field(:i, interface_type)
+
     err2 = assert_raises ArgumentError do
       Class.new(GraphQL::Schema) do
         query(object_type)
-        orphan_types(union_type, interface_type)
       end
     end
 

spec/graphql/schema/warden_spec.rb

@@ -566,8 +566,8 @@ def self.visible?(member, context)
       assert_nil res["data"]["BagOfThings"]
       assert_equal [], res["data"]["Query"]["fields"]
 
-      # Unreferenced but still visible because orphan type
-      schema.orphan_types([schema.find("BagOfThings")])
+      # Unreferenced but still visible because extra type
+      schema.extra_types([schema.find("BagOfThings")])
       res = schema.execute(query_string, context: { except: ->(m, _) { m.graphql_name == "bag" } })
       assert res["data"]["BagOfThings"]
     end

spec/graphql/schema_spec.rb

@@ -164,7 +164,7 @@ class ExampleOptionEnum < GraphQL::Schema::Enum
 
     expected_msg = "Only object type classes should be added as `orphan_types(...)`.
 
-- Remove these no-op types from `orphan_types`: ExampleOptionEnum
+- Remove these no-op types from `orphan_types`: ExampleOptionEnum (ENUM)
 - See https://graphql-ruby.org/type_definitions/interfaces.html#orphan-types
 
 To add other types to your schema, you might want `extra_types`: https://graphql-ruby.org/schema/definition.html#extra-types