graphql 1.8.0.pre6 → 1.8.0.pre7

data/spec/graphql/schema/input_object_spec.rb

@@ -15,6 +15,12 @@ describe GraphQL::Schema::InputObject do
     it "assigns itself as the arguments_class" do
       assert_equal input_object, input_object.to_graphql.arguments_class
     end
+
+    it "accepts description: kwarg" do
+      input_obj_class = Jazz::InspectableInput
+      input_obj_type = input_obj_class.to_graphql
+      assert_equal "Test description kwarg", input_obj_type.arguments["stringValue"].description
+    end
   end
 
   describe "in queries" do

data/spec/graphql/schema/interface_spec.rb

@@ -52,6 +52,21 @@ describe GraphQL::Schema::Interface do
     end
   end
 
+  it 'supports global_id_field' do
+    object = Class.new(GraphQL::Schema::Interface) do
+      graphql_name 'GlobalIdFieldTest'
+      global_id_field :uuid
+    end.to_graphql
+    uuid_field = object.fields["uuid"]
+
+    assert_equal GraphQL::NonNullType, uuid_field.type.class
+    assert_equal GraphQL::ScalarType, uuid_field.type.unwrap.class
+    assert_equal(
+      GraphQL::Schema::Member::GraphQLTypeNames::ID,
+      uuid_field.type.unwrap.name
+    )
+  end
+
   describe "in queries" do
     it "works" do
       query_str = <<-GRAPHQL

data/spec/graphql/schema/object_spec.rb

@@ -7,7 +7,7 @@ describe GraphQL::Schema::Object do
     it "tells type data" do
       assert_equal "Ensemble", object_class.graphql_name
       assert_equal "A group of musicians playing together", object_class.description
-      assert_equal 5, object_class.fields.size
+      assert_equal 6, object_class.fields.size
       assert_equal 2, object_class.interfaces.size
       # Compatibility methods are delegated to the underlying BaseType
       assert object_class.respond_to?(:connection_type)
@@ -20,7 +20,7 @@ describe GraphQL::Schema::Object do
       end
 
       # one more than the parent class
-      assert_equal 6, new_object_class.fields.size
+      assert_equal 7, new_object_class.fields.size
       # inherited interfaces are present
       assert_equal 2, new_object_class.interfaces.size
       # The new field is present
@@ -49,6 +49,7 @@ describe GraphQL::Schema::Object do
         hashyEnsemble {
           name
           musicians { name }
+          formedAt
         }
       }
       GRAPHQL
@@ -56,6 +57,7 @@ describe GraphQL::Schema::Object do
       ensemble = res["data"]["hashyEnsemble"]
       assert_equal "The Grateful Dead", ensemble["name"]
       assert_equal ["Jerry Garcia"], ensemble["musicians"].map { |m| m["name"] }
+      assert_equal "May 5, 1965", ensemble["formedAt"]
     end
   end
 
@@ -64,7 +66,7 @@ describe GraphQL::Schema::Object do
     it "returns a matching GraphQL::ObjectType" do
       assert_equal "Ensemble", obj_type.name
       assert_equal "A group of musicians playing together", obj_type.description
-      assert_equal 5, obj_type.all_fields.size
+      assert_equal 6, obj_type.all_fields.size
 
       name_field = obj_type.all_fields[2]
       assert_equal "name", name_field.name

data/spec/graphql/schema/printer_spec.rb

@@ -481,6 +481,25 @@ SCHEMA
 
       assert_equal expected.chomp, GraphQL::Schema::Printer.print_schema(schema)
     end
+
+    it 'prints a schema without directives' do
+      query_type = Class.new(GraphQL::Schema::Object) do
+        graphql_name 'Query'
+
+        field :foobar, Integer, null: false
+
+        def foobar
+          152
+        end
+      end
+
+      schema = Class.new(GraphQL::Schema) do
+        query query_type
+      end
+
+      expected = "type Query {\n  foobar: Int!\n}"
+      assert_equal expected, GraphQL::Schema::Printer.new(schema).print_schema
+    end
   end
 
   it "applies an `only` filter" do

data/spec/graphql/schema_spec.rb

@@ -7,12 +7,12 @@ describe GraphQL::Schema do
   let(:empty_schema) { GraphQL::Schema.define }
 
   describe "#rescue_from" do
-    let(:rescue_middleware) { schema.middleware.first }
-
     it "adds handlers to the rescue middleware" do
+      schema_defn = schema.graphql_definition
+      rescue_middleware = schema_defn.middleware.first
       assert_equal(1, rescue_middleware.rescue_table.length)
       # normally, you'd use a real class, not a symbol:
-      schema.rescue_from(:error_class) { "my custom message" }
+      schema_defn.rescue_from(:error_class) { "my custom message" }
       assert_equal(2, rescue_middleware.rescue_table.length)
     end
   end
@@ -433,6 +433,13 @@ type Query {
     end
   end
 
+  describe "#as_json" do
+    it "returns a hash" do
+      result = schema.execute(GraphQL::Introspection::INTROSPECTION_QUERY)
+      assert_equal result.as_json.class, Hash
+    end
+  end
+
   describe "#get_field" do
     it "returns fields by type or type name" do
       field = schema.get_field("Cheese", "id")

data/spec/graphql/static_validation/rules/fields_have_appropriate_selections_spec.rb

@@ -8,18 +8,19 @@ describe GraphQL::StaticValidation::FieldsHaveAppropriateSelections do
       okCheese: cheese(id: 1) { fatContent, similarCheese(source: YAK) { source } }
       missingFieldsCheese: cheese(id: 1)
       illegalSelectionCheese: cheese(id: 1) { id { something, ... someFields } }
+      incorrectFragmentSpread: cheese(id: 1) { flavor { ... on String { __typename } } }
     }
   "}
 
   it "adds errors for selections on scalars" do
-    assert_equal(2, errors.length)
+    assert_equal(3, errors.length)
 
     illegal_selection_error = {
       "message"=>"Selections can't be made on scalars (field 'id' returns Int but has selections [something, someFields])",
       "locations"=>[{"line"=>5, "column"=>47}],
       "fields"=>["query getCheese", "illegalSelectionCheese", "id"],
     }
-    assert_includes(errors, illegal_selection_error, "finds illegal selections on scalarss")
+    assert_includes(errors, illegal_selection_error, "finds illegal selections on scalars")
 
     selection_required_error = {
       "message"=>"Objects must have selections (field 'cheese' returns Cheese but has no selections)",
@@ -27,6 +28,13 @@ describe GraphQL::StaticValidation::FieldsHaveAppropriateSelections do
       "fields"=>["query getCheese", "missingFieldsCheese"],
     }
     assert_includes(errors, selection_required_error, "finds objects without selections")
+
+    incorrect_fragment_error = {
+      "message"=>"Selections can't be made on scalars (field 'flavor' returns String but has inline fragments [String])",
+      "locations"=>[{"line"=>6, "column"=>48}],
+      "fields"=>["query getCheese", "incorrectFragmentSpread", "flavor"],
+    }
+    assert_includes(errors, incorrect_fragment_error, "finds scalar fields with selections")
   end
 
   describe "anonymous operations" do

data/spec/graphql/upgrader/member_spec.rb

@@ -300,12 +300,12 @@ describe GraphQL::Upgrader::Member do
       new = %{field :name, Name.connection_type, "names", null: false, connection: true}
       assert_equal new, upgrade(old)
 
-      old = %{field :names, types[types.String]}
+      old = %{field :names, types[!types.String]}
       new = %{field :names, [String], null: true}
       assert_equal new, upgrade(old)
 
       old = %{field :names, !types[types.String]}
-      new = %{field :names, [String], null: false}
+      new = %{field :names, [String, null: true], null: false}
       assert_equal new, upgrade(old)
 
       old = %{

data/spec/support/jazz.rb

@@ -156,7 +156,7 @@ module Jazz
     field :upcase_name, String, null: false, upcase: true
 
     def upcase_name
-      @object.name # upcase is applied by the superclass
+      object.name # upcase is applied by the superclass
     end
   end
 
@@ -168,6 +168,7 @@ module Jazz
     # Test string type names:
     field :name, "String", null: false
     field :musicians, "[Jazz::Musician]", null: false
+    field :formed_at, String, null: true, hash_key: "formedAtDate"
   end
 
   class Family < BaseEnum
@@ -221,7 +222,7 @@ module Jazz
     field :favorite_key, Key, null: true
     # Test lists with nullable members:
     field :inspect_context, [String, null: true], null: false
-
+    field :add_error, String, null: false, extras: [:execution_errors]
     def inspect_context
       [
         @context.custom_method,
@@ -230,6 +231,11 @@ module Jazz
         nil,
       ]
     end
+
+    def add_error(execution_errors:)
+      execution_errors.add("this has a path")
+      "done"
+    end
   end
 
   LegacyInputType = GraphQL::InputObjectType.define do
@@ -238,15 +244,15 @@ module Jazz
   end
 
   class InspectableInput < GraphQL::Schema::InputObject
-    argument :string_value, String, required: true
+    argument :string_value, String, required: true, description: "Test description kwarg"
     argument :nested_input, InspectableInput, required: false
     argument :legacy_input, LegacyInputType, required: false
     def helper_method
       [
         # Context is available in the InputObject
-        @context[:message],
+        context[:message],
         # A GraphQL::Query::Arguments instance is available
-        @arguments[:stringValue],
+        arguments[:stringValue],
         # Legacy inputs have underscored method access too
         legacy_input ? legacy_input.int_value : "-",
         # Access by method call is available
@@ -264,8 +270,8 @@ module Jazz
   class PerformingAct < GraphQL::Schema::Union
     possible_types Musician, Ensemble
 
-    def resolve_type
-      if @object.is_a?(Models::Ensemble)
+    def self.resolve_type(object, context)
+      if object.is_a?(Models::Ensemble)
         Ensemble
       else
         Musician
@@ -300,7 +306,7 @@ module Jazz
 
     def find(id:)
       if id == "MagicalSkipId"
-        @context.skip
+        context.skip
       else
         GloballyIdentifiableType.find(id)
       end
@@ -333,9 +339,9 @@ module Jazz
 
     def inspect_context
       [
-        @context.custom_method,
-        @context[:magic_key],
-        @context[:normal_key]
+        context.custom_method,
+        context[:magic_key],
+        context[:normal_key]
       ]
     end
 
@@ -347,6 +353,7 @@ module Jazz
           "musicians" => [
             OpenStruct.new(name: "Jerry Garcia"),
           ],
+          "formedAtDate" => "May 5, 1965",
       }
     end
   end
@@ -390,7 +397,7 @@ module Jazz
   module Introspection
     class TypeType < GraphQL::Introspection::TypeType
       def name
-        @object.name.upcase
+        object.name.upcase
       end
     end
 
@@ -404,7 +411,7 @@ module Jazz
     end
 
     class DynamicFields < GraphQL::Introspection::DynamicFields
-      field :__typename_length, Integer, null: false, extras: [:irep_node]
+      field :__typename_length, Int, null: false, extras: [:irep_node]
       field :__ast_node_class, String, null: false, extras: [:ast_node]
       def __typename_length(irep_node:)
         __typename(irep_node: irep_node).length
@@ -418,7 +425,7 @@ module Jazz
     class EntryPoints < GraphQL::Introspection::EntryPoints
       field :__classname, String, "The Ruby class name of the root object", null: false
       def __classname
-        @object.class.name
+        object.class.name
       end
     end
   end

data/spec/support/star_wars/schema.rb

@@ -119,7 +119,7 @@ module StarWars
       argument :nameIncludes, String, required: false
     end
 
-    field :shipsWithMaxPageSize, max_page_size: 2, function: ShipsWithMaxPageSize.new
+    field :shipsWithMaxPageSize, "Ships with max page size", max_page_size: 2, function: ShipsWithMaxPageSize.new
 
     field :bases, BaseConnectionWithTotalCountType, null: true, connection: true, resolve: ->(obj, args, ctx) {
       all_bases = Base.where(id: obj.bases)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre6
+  version: 1.8.0.pre7
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -910,6 +910,8 @@ files:
 - spec/fixtures/upgrader/gist_order_field.transformed.rb
 - spec/fixtures/upgrader/release_order.original.rb
 - spec/fixtures/upgrader/release_order.transformed.rb
+- spec/fixtures/upgrader/starrable.original.rb
+- spec/fixtures/upgrader/starrable.transformed.rb
 - spec/fixtures/upgrader/subscribable.original.rb
 - spec/fixtures/upgrader/subscribable.transformed.rb
 - spec/fixtures/upgrader/type_x.original.rb
@@ -1092,7 +1094,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby
@@ -1409,6 +1411,8 @@ test_files:
 - spec/fixtures/upgrader/gist_order_field.transformed.rb
 - spec/fixtures/upgrader/release_order.original.rb
 - spec/fixtures/upgrader/release_order.transformed.rb
+- spec/fixtures/upgrader/starrable.original.rb
+- spec/fixtures/upgrader/starrable.transformed.rb
 - spec/fixtures/upgrader/subscribable.original.rb
 - spec/fixtures/upgrader/subscribable.transformed.rb
 - spec/fixtures/upgrader/type_x.original.rb