Migrate more tests

Author: rmosolgo

spec/graphql/schema/member/scoped_spec.rb

@@ -5,7 +5,6 @@
   class ScopeSchema < GraphQL::Schema
     class BaseObject < GraphQL::Schema::Object
       class BaseField < GraphQL::Schema::Field
-        # include GraphQL::Execution::Next::FieldCompatibility if TESTING_EXEC_NEXT
       end
       field_class BaseField
     end
@@ -86,21 +85,21 @@ def self.resolve_type(item, ctx)
     end
 
     class Query < BaseObject
-      field :items, [Item], null: false
+      field :items, [Item], null: false, resolve_legacy_instance_method: true
       field :unscoped_items, [Item], null: false,
         scope: false,
-        resolver_method: :items
+        resolver_method: :items, resolve_legacy_instance_method: :items
 
-      field :nil_items, [Item]
+      field :nil_items, [Item], resolve_legacy_instance_method: true
       def nil_items
         nil
       end
 
       field :french_items, [FrenchItem], null: false,
-        resolver_method: :items
+        resolver_method: :items, resolve_legacy_instance_method: :items
 
       field :items_connection, Item.connection_type, null: false,
-          resolver_method: :items
+          resolver_method: :items, resolve_legacy_instance_method: :items
 
       def items
         [
@@ -109,15 +108,15 @@ def items
         ]
       end
 
-      field :reauthorize_items, [ReauthorizeItem], resolver_method: :items
+      field :reauthorize_items, [ReauthorizeItem], resolver_method: :items, resolve_legacy_instance_method: :items
 
-      field :things, [Thing], null: false
+      field :things, [Thing], null: false, resolve_legacy_instance_method: true
       def things
         items + [OpenStruct.new(name: "Turbine")]
       end
 
-      field :lazy_items, [Item], null: false
-      field :lazy_items_connection, Item.connection_type, null: false, resolver_method: :lazy_items
+      field :lazy_items, [Item], null: false, resolve_legacy_instance_method: true
+      field :lazy_items_connection, Item.connection_type, null: false, resolver_method: :lazy_items, resolve_legacy_instance_method: :lazy_items
       def lazy_items
         ->() { items }
       end
@@ -315,7 +314,6 @@ def get_item_names_with_context(ctx, field_name: "items")
     class SkipAuthSchema < GraphQL::Schema
       class Book < GraphQL::Schema::Object
         class BaseField < GraphQL::Schema::Field
-          # include(GraphQL::Execution::Next::FieldCompatibility) if TESTING_EXEC_NEXT
         end
         field_class(BaseField)
 
@@ -329,7 +327,7 @@ def self.scope_items(list, ctx)
           list.dup # Skipping authorized objects requires a new object to be returned
         end
 
-        field :title, String
+        field :title, String, hash_key: :title
       end
 
       class SkipAuthorizationBook < Book

spec/graphql/schema/validator/validator_helpers.rb

@@ -32,7 +32,6 @@ def visible?(_ctx)
     end
 
     base_field = Class.new(GraphQL::Schema::Field) do
-      # include GraphQL::Execution::Next::FieldCompatibility
       argument_class(base_argument)
     end
 
@@ -72,15 +71,15 @@ def resolve(input: :NO_INPUT)
     query_type = Class.new(GraphQL::Schema::Object) do
       graphql_name "Query"
       field_class(base_field)
-      field :validated, arg_type do
+      field :validated, arg_type, resolve_legacy_instance_method: true do
         argument :value, arg_type, required: false, validates: validates_config
       end
 
       def validated(value: nil)
         value
       end
 
-      field :multi_validated, arg_type, validates: validates_config do
+      field :multi_validated, arg_type, validates: validates_config, resolve_legacy_instance_method: true do
         argument :a, arg_type, required: false
         argument :b, arg_type, required: false
         argument :c, arg_type, required: false
@@ -92,7 +91,7 @@ def multi_validated(a: 0, b: 0, c: 0)
         a + b + c
       end
 
-      field :validated_input, arg_type do
+      field :validated_input, arg_type, resolve_legacy_instance_method: true do
         argument :input, validated_input
       end
 
@@ -102,7 +101,7 @@ def validated_input(input:)
 
       field :validated_resolver, resolver: validated_resolver
       field :validated_arg_resolver, resolver: validated_arg_resolver
-      field :list, [self], null: false
+      field :list, [self], null: false, resolve_legacy_instance_method: true
 
       def list
         [:a, :b, :c]

spec/graphql/schema/visibility_spec.rb

@@ -4,7 +4,6 @@
 describe GraphQL::Schema::Visibility do
   class VisSchema < GraphQL::Schema
     class BaseField < GraphQL::Schema::Field
-      # include GraphQL::Execution::Next::FieldCompatibility if TESTING_EXEC_NEXT
       def initialize(*args, admin_only: false, **kwargs, &block)
         super(*args, **kwargs, &block)
         @admin_only = admin_only
@@ -32,9 +31,9 @@ def self.admin_only(new_value = nil)
     end
 
     class Product < BaseObject
-      field :name, String
-      field :price, Integer
-      field :cost_of_goods_sold, Integer, admin_only: true
+      field :name, String, hash_key: :name
+      field :price, Integer, hash_key: :price
+      field :cost_of_goods_sold, Integer, admin_only: true, hash_key: :cost_of_goods_sold
     end
 
     class Widget < BaseObject
@@ -48,7 +47,7 @@ class WidgetKind < GraphQL::Schema::Enum
     end
 
     class Query < BaseObject
-      field :products, [Product]
+      field :products, [Product], resolve_legacy_instance_method: true
       field :widget, Widget do
         argument :type, WidgetKind
       end