graphql 1.8.6 → 1.8.7

data/spec/generators/graphql/enum_generator_spec.rb

@@ -7,12 +7,14 @@ class GraphQLGeneratorsEnumGeneratorTest < BaseGeneratorTest
 
   test "it generate enums with values" do
     expected_content = <<-RUBY
-class Types::FamilyType < Types::BaseEnum
-  value "NIGHTSHADE"
-  value "BRASSICA", value: Family::COLE
-  value "UMBELLIFER", value: :umbellifer
-  value "LEGUME", value: "bean & friends"
-  value "CURCURBITS", value: 5
+module Types
+  class FamilyType < Types::BaseEnum
+    value "NIGHTSHADE"
+    value "BRASSICA", value: Family::COLE
+    value "UMBELLIFER", value: :umbellifer
+    value "LEGUME", value: "bean & friends"
+    value "CURCURBITS", value: 5
+  end
 end
 RUBY
 

data/spec/generators/graphql/install_generator_spec.rb

@@ -48,15 +48,17 @@ RUBY
 
 
     expected_query_type = <<-RUBY
-class Types::QueryType < Types::BaseObject
-  # Add root-level fields here.
-  # They will be entry points for queries on your schema.
-
-  # TODO: remove me
-  field :test_field, String, null: false,
-    description: \"An example field added by the generator\"
-  def test_field
-    \"Hello World!\"
+module Types
+  class QueryType < Types::BaseObject
+    # Add root-level fields here.
+    # They will be entry points for queries on your schema.
+
+    # TODO: remove me
+    field :test_field, String, null: false,
+      description: \"An example field added by the generator\"
+    def test_field
+      \"Hello World!\"
+    end
   end
 end
 RUBY
@@ -80,18 +82,20 @@ RUBY
     end
 
     expected_query_type = <<-RUBY
-class Types::QueryType < Types::BaseObject
-  # Add root-level fields here.
-  # They will be entry points for queries on your schema.
-
-  # TODO: remove me
-  field :test_field, String, null: false,
-    description: \"An example field added by the generator\"
-  def test_field
-    \"Hello World!\"
-  end
+module Types
+  class QueryType < Types::BaseObject
+    # Add root-level fields here.
+    # They will be entry points for queries on your schema.
+
+    # TODO: remove me
+    field :test_field, String, null: false,
+      description: \"An example field added by the generator\"
+    def test_field
+      \"Hello World!\"
+    end
 
-  field :node, field: GraphQL::Relay::Node.field
+    field :node, field: GraphQL::Relay::Node.field
+  end
 end
 RUBY
 

data/spec/generators/graphql/interface_generator_spec.rb

@@ -16,10 +16,12 @@ class GraphQLGeneratorsInterfaceGeneratorTest < BaseGeneratorTest
     ]
 
     expected_content = <<-RUBY
-module Types::BirdType
-  include Types::BaseInterface
-  field :wingspan, Integer, null: false
-  field :foliage, [Types::ColorType], null: true
+module Types
+  module BirdType
+    include Types::BaseInterface
+    field :wingspan, Integer, null: false
+    field :foliage, [Types::ColorType], null: true
+  end
 end
 RUBY
 

data/spec/generators/graphql/loader_generator_spec.rb

@@ -9,19 +9,21 @@ class GraphQLGeneratorsLoaderGeneratorTest < BaseGeneratorTest
     run_generator(["RecordLoader"])
 
     expected_content = <<-RUBY
-class Loaders::RecordLoader < GraphQL::Batch::Loader
-  # Define `initialize` to store grouping arguments, eg
-  #
-  #     Loaders::RecordLoader.for(group).load(value)
-  #
-  # def initialize()
-  # end
-
-  # `keys` contains each key from `.load(key)`.
-  # Find the corresponding values, then
-  # call `fulfill(key, value)` or `fulfill(key, nil)`
-  # for each key.
-  def perform(keys)
+module Loaders
+  class RecordLoader < GraphQL::Batch::Loader
+    # Define `initialize` to store grouping arguments, eg
+    #
+    #     Loaders::RecordLoader.for(group).load(value)
+    #
+    # def initialize()
+    # end
+
+    # `keys` contains each key from `.load(key)`.
+    # Find the corresponding values, then
+    # call `fulfill(key, value)` or `fulfill(key, nil)`
+    # for each key.
+    def perform(keys)
+    end
   end
 end
 RUBY
@@ -33,19 +35,21 @@ RUBY
     run_generator(["active_record::record_loader"])
 
     expected_content = <<-RUBY
-class Loaders::ActiveRecord::RecordLoader < GraphQL::Batch::Loader
-  # Define `initialize` to store grouping arguments, eg
-  #
-  #     Loaders::ActiveRecord::RecordLoader.for(group).load(value)
-  #
-  # def initialize()
-  # end
-
-  # `keys` contains each key from `.load(key)`.
-  # Find the corresponding values, then
-  # call `fulfill(key, value)` or `fulfill(key, nil)`
-  # for each key.
-  def perform(keys)
+module Loaders
+  class ActiveRecord::RecordLoader < GraphQL::Batch::Loader
+    # Define `initialize` to store grouping arguments, eg
+    #
+    #     Loaders::ActiveRecord::RecordLoader.for(group).load(value)
+    #
+    # def initialize()
+    # end
+
+    # `keys` contains each key from `.load(key)`.
+    # Find the corresponding values, then
+    # call `fulfill(key, value)` or `fulfill(key, nil)`
+    # for each key.
+    def perform(keys)
+    end
   end
 end
 RUBY

data/spec/generators/graphql/mutation_generator_spec.rb

@@ -20,27 +20,32 @@ class GraphQLGeneratorsMutationGeneratorTest < BaseGeneratorTest
   end
 
   UPDATE_NAME_MUTATION = <<-RUBY
-class Mutations::UpdateName < GraphQL::Schema::RelayClassicMutation
-  # TODO: define return fields
-  # return_field :post, Types::PostType
+module Mutations
+  class UpdateName < GraphQL::Schema::RelayClassicMutation
+    # TODO: define return fields
+    # field :post, Types::PostType, null: false
 
-  # TODO: define arguments
-  # input_field :name, !types.String
+    # TODO: define arguments
+    # argument :name, String, required: true
 
-  def resolve(**inputs)
     # TODO: define resolve method
+    # def resolve(name:)
+    #   { post: ... }
+    # end
   end
 end
 RUBY
 
   EXPECTED_MUTATION_TYPE = <<-RUBY
-class Types::MutationType < Types::BaseObject
-  field :updateName, mutation: Mutations::UpdateName
-  # TODO: remove me
-  field :test_field, String, null: false,
-    description: "An example field added by the generator"
-  def test_field
-    "Hello World"
+module Types
+  class MutationType < Types::BaseObject
+    field :updateName, mutation: Mutations::UpdateName
+    # TODO: remove me
+    field :test_field, String, null: false,
+      description: "An example field added by the generator"
+    def test_field
+      "Hello World"
+    end
   end
 end
 RUBY

data/spec/generators/graphql/object_generator_spec.rb

@@ -16,9 +16,11 @@ class GraphQLGeneratorsObjectGeneratorTest < BaseGeneratorTest
     ]
 
     expected_content = <<-RUBY
-class Types::BirdType < Types::BaseObject
-  field :wingspan, Integer, null: false
-  field :foliage, [Types::ColorType], null: true
+module Types
+  class BirdType < Types::BaseObject
+    field :wingspan, Integer, null: false
+    field :foliage, [Types::ColorType], null: true
+  end
 end
 RUBY
 
@@ -32,7 +34,9 @@ RUBY
   test "it generates classifed file" do
     run_generator(["page"])
     assert_file "app/graphql/types/page_type.rb", <<-RUBY
-class Types::PageType < Types::BaseObject
+module Types
+  class PageType < Types::BaseObject
+  end
 end
 RUBY
   end
@@ -40,8 +44,10 @@ RUBY
   test "it makes Relay nodes" do
     run_generator(["Page", "--node"])
     assert_file "app/graphql/types/page_type.rb", <<-RUBY
-class Types::PageType < Types::BaseObject
-  implements GraphQL::Relay::Node.interface
+module Types
+  class PageType < Types::BaseObject
+    implements GraphQL::Relay::Node.interface
+  end
 end
 RUBY
   end

data/spec/generators/graphql/union_generator_spec.rb

@@ -14,8 +14,10 @@ class GraphQLGeneratorsUnionGeneratorTest < BaseGeneratorTest
     ]
 
     expected_content = <<-RUBY
-class Types::WingedCreatureType < Types::BaseUnion
-  possible_types [Types::InsectType, Types::BirdType]
+module Types
+  class WingedCreatureType < Types::BaseUnion
+    possible_types [Types::InsectType, Types::BirdType]
+  end
 end
 RUBY
 
@@ -35,7 +37,9 @@ RUBY
     ]
 
     expected_content = <<-RUBY
-class Types::WingedCreatureType < Types::BaseUnion
+module Types
+  class WingedCreatureType < Types::BaseUnion
+  end
 end
 RUBY
 
@@ -50,7 +54,9 @@ RUBY
     command = ["WingedCreature", "--directory", "app/mydirectory"]
 
     expected_content = <<-RUBY
-class Types::WingedCreatureType < Types::BaseUnion
+module Types
+  class WingedCreatureType < Types::BaseUnion
+  end
 end
 RUBY
 

data/spec/graphql/authorization_spec.rb

@@ -272,18 +272,27 @@ describe GraphQL::Authorization do
       field :hidden_interface, HiddenInterface, null: false, method: :itself
       field :hidden_default_interface, HiddenDefaultInterface, null: false, method: :itself
       field :hidden_connection, RelayObject.connection_type, null: :false, method: :empty_array
-      field :hidden_edge, RelayObject.edge_type, null: :false, method: :itself
+      field :hidden_edge, RelayObject.edge_type, null: :false, method: :edge_object
 
       field :inaccessible, Integer, null: false, method: :object_id
       field :inaccessible_object, InaccessibleObject, null: false, method: :itself
       field :inaccessible_interface, InaccessibleInterface, null: false, method: :itself
       field :inaccessible_default_interface, InaccessibleDefaultInterface, null: false, method: :itself
       field :inaccessible_connection, RelayObject.connection_type, null: :false, method: :empty_array
-      field :inaccessible_edge, RelayObject.edge_type, null: :false, method: :itself
+      field :inaccessible_edge, RelayObject.edge_type, null: :false, method: :edge_object
 
       field :unauthorized_object, UnauthorizedObject, null: true, method: :itself
-      field :unauthorized_connection, RelayObject.connection_type, null: :false, method: :empty_array
-      field :unauthorized_edge, RelayObject.edge_type, null: :false, method: :itself
+      field :unauthorized_connection, RelayObject.connection_type, null: false, method: :array_with_item
+      field :unauthorized_edge, RelayObject.edge_type, null: false, method: :edge_object
+
+      def edge_object
+        OpenStruct.new(node: 100)
+      end
+
+      def array_with_item
+        [1]
+      end
+
       field :unauthorized_lazy_box, UnauthorizedBox, null: true do
         argument :value, String, required: true
       end
@@ -623,24 +632,56 @@ describe GraphQL::Authorization do
     end
 
     it "works with edges and connections" do
-      skip <<-MSG
-        This doesn't work because edge and connection type definitions
-        aren't class-based, and authorization is checked during class-based field execution.
-      MSG
       query = <<-GRAPHQL
       {
-        unauthorizedConnection { __typename }
-        unauthorizedEdge { __typename }
+        unauthorizedConnection {
+          __typename
+          edges {
+            __typename
+            node {
+              __typename
+            }
+          }
+          nodes {
+            __typename
+          }
+        }
+        unauthorizedEdge {
+          __typename
+          node {
+            __typename
+          }
+        }
       }
       GRAPHQL
 
       unauthorized_res = auth_execute(query, context: { unauthorized_relay: true })
-      assert_nil unauthorized_res["data"].fetch("unauthorizedConnection")
-      assert_nil unauthorized_res["data"].fetch("unauthorizedEdge")
+      conn = unauthorized_res["data"].fetch("unauthorizedConnection")
+      assert_equal "RelayObjectConnection", conn.fetch("__typename")
+      assert_equal nil, conn.fetch("nodes")
+      assert_equal [{"node" => nil, "__typename" => "RelayObjectEdge"}], conn.fetch("edges")
+
+      edge = unauthorized_res["data"].fetch("unauthorizedEdge")
+      assert_nil edge.fetch("node")
+      assert_equal "RelayObjectEdge", edge["__typename"]
+
+      unauthorized_object_paths = [
+        ["unauthorizedConnection", "edges", 0, "node"],
+        ["unauthorizedConnection", "nodes"],
+        ["unauthorizedEdge", "node"]
+      ]
+
+      assert_equal unauthorized_object_paths, unauthorized_res["errors"].map { |e| e["path"] }
 
       authorized_res = auth_execute(query)
-      assert_nil authorized_res["data"].fetch("unauthorizedConnection").fetch("__typename")
-      assert_nil authorized_res["data"].fetch("unauthorizedEdge").fetch("__typename")
+      conn = authorized_res["data"].fetch("unauthorizedConnection")
+      assert_equal "RelayObjectConnection", conn.fetch("__typename")
+      assert_equal [{"__typename"=>"RelayObject"}], conn.fetch("nodes")
+      assert_equal [{"node" => {"__typename" => "RelayObject"}, "__typename" => "RelayObjectEdge"}], conn.fetch("edges")
+
+      edge = authorized_res["data"].fetch("unauthorizedEdge")
+      assert_equal "RelayObject", edge.fetch("node").fetch("__typename")
+      assert_equal "RelayObjectEdge", edge["__typename"]
     end
 
     it "authorizes _after_ resolving lazy objects" do

data/spec/graphql/input_object_type_spec.rb

@@ -254,6 +254,10 @@ describe GraphQL::InputObjectType do
         c: String = "Default"
         d: Boolean = false
       }
+
+      input SecondLevelInputObject {
+        example: ExampleInputObject = {b: 42, d: true}
+      }
     |) }
     let(:input_type) { schema.types['ExampleInputObject'] }
 
@@ -295,6 +299,13 @@ describe GraphQL::InputObjectType do
 
       assert_equal false, result['d']
     end
+
+    it "merges defaults of nested input objects" do
+      result = schema.types['SecondLevelInputObject'].coerce_isolated_input({})
+      assert_equal 42, result['example']['b']
+      assert_equal "Default", result['example']['c']
+      assert_equal true, result['example']['d']
+    end
   end
 
   describe "when sent into a query" do

data/spec/graphql/language/generation_spec.rb

@@ -7,11 +7,13 @@ describe GraphQL::Language::Generation do
       GraphQL.parse('type Query { a: String! }')
     }
 
-    class CustomPrinter < GraphQL::Language::Printer
-      def print_field_definition(print_field_definition)
-        "<Field Hidden>"
-      end
-    end
+    let(:custom_printer_class) {
+      Class.new(GraphQL::Language::Printer) {
+        def print_field_definition(print_field_definition)
+          "<Field Hidden>"
+        end
+      }
+    }
 
     it "accepts a custom printer" do
       expected = <<-SCHEMA
@@ -30,7 +32,7 @@ type Query {
 }
       SCHEMA
 
-      assert_equal expected.chomp, GraphQL::Language::Generation.generate(document, printer: CustomPrinter.new)
+      assert_equal expected.chomp, GraphQL::Language::Generation.generate(document, printer: custom_printer_class.new)
     end
   end
 end

data/spec/graphql/language/nodes_spec.rb

@@ -27,11 +27,13 @@ describe GraphQL::Language::Nodes::AbstractNode do
       GraphQL.parse('type Query { a: String! }')
     }
 
-    class CustomPrinter < GraphQL::Language::Printer
-      def print_field_definition(print_field_definition)
-        "<Field Hidden>"
-      end
-    end
+    let(:custom_printer_class) {
+      Class.new(GraphQL::Language::Printer) {
+        def print_field_definition(print_field_definition)
+          "<Field Hidden>"
+        end
+      }
+    }
 
     it "accepts a custom printer" do
       expected = <<-SCHEMA
@@ -39,7 +41,7 @@ type Query {
   <Field Hidden>
 }
       SCHEMA
-      assert_equal expected.chomp, document.to_query_string(printer: CustomPrinter.new)
+      assert_equal expected.chomp, document.to_query_string(printer: custom_printer_class.new)
     end
   end
 end