graphql 1.8.0.pre7 → 1.8.0.pre8

data/spec/graphql/schema/argument_spec.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::Schema::Argument do
+  class SchemaArgumentTest < GraphQL::Schema::Object
+    field :field, String, null: false do
+      argument :arg, String, description: "test", required: false
+
+      argument :argWithBlock, String, required: false do
+        description "test"
+      end
+    end
+  end
+
+  describe "graphql definition" do
+    it "calls block" do
+      assert_equal "test", SchemaArgumentTest.fields["field"].arguments["argWithBlock"].description
+    end
+  end
+
+  describe "#description" do
+    it "sets description" do
+      SchemaArgumentTest.fields["field"].arguments["arg"].description "new description"
+      assert_equal "new description", SchemaArgumentTest.fields["field"].arguments["arg"].description
+    end
+
+    it "returns description" do
+      assert_equal "test", SchemaArgumentTest.fields["field"].arguments["argWithBlock"].description
+    end
+  end
+end

data/spec/graphql/schema/enum_spec.rb

@@ -28,6 +28,11 @@ describe GraphQL::Schema::Enum do
     it "accepts a block" do
       assert_equal "Neither here nor there, really", enum.values["KEYS"].description
     end
+
+    it "is the #owner of its values" do
+      value = enum.values["STRING"]
+      assert_equal enum, value.owner
+    end
   end
 
   it "uses a custom enum value class" do

data/spec/graphql/schema/field_spec.rb

@@ -14,7 +14,7 @@ describe GraphQL::Schema::Field do
     it "camelizes the field name, unless camelize: false" do
       assert_equal 'inspectInput', field.graphql_definition.name
 
-      underscored_field = GraphQL::Schema::Field.new(:underscored_field, String, null: false, camelize: false) do
+      underscored_field = GraphQL::Schema::Field.new(:underscored_field, String, null: false, camelize: false, owner: nil) do
         argument :underscored_arg, String, required: true, camelize: false
       end
 
@@ -66,6 +66,16 @@ describe GraphQL::Schema::Field do
       end
     end
 
+    it "is the #owner of its arguments" do
+      field = Jazz::Query.fields["find"]
+      argument = field.arguments["id"]
+      assert_equal field, argument.owner
+    end
+
+    it "has a reference to the object that owns it with #owner" do
+      assert_equal Jazz::Query, field.owner
+    end
+
     describe "complexity" do
       it "accepts a keyword argument" do
         object = Class.new(Jazz::BaseObject) do

data/spec/graphql/schema/input_object_spec.rb

@@ -9,6 +9,11 @@ describe GraphQL::Schema::InputObject do
       assert_equal nil, input_object.description
       assert_equal 1, input_object.arguments.size
     end
+
+    it "is the #owner of its arguments" do
+      argument = input_object.arguments["name"]
+      assert_equal input_object, argument.owner
+    end
   end
 
   describe ".to_graphql" do

data/spec/graphql/schema/interface_spec.rb

@@ -49,6 +49,35 @@ describe GraphQL::Schema::Interface do
       assert_equal "id", field.name
       assert_equal GraphQL::ID_TYPE.to_non_null_type, field.type
       assert_equal "A unique identifier for this object", field.description
+      assert_nil interface_type.resolve_type_proc
+      assert_empty interface_type.orphan_types
+    end
+
+    it "can specify a resolve_type method" do
+      interface = Class.new(GraphQL::Schema::Interface) do
+        def self.resolve_type(_object, _context)
+          "MyType"
+        end
+
+        def self.name
+          "MyInterface"
+        end
+      end
+      interface_type = interface.to_graphql
+      assert_equal "MyType", interface_type.resolve_type_proc.call(nil, nil)
+    end
+
+    it "can specify orphan types" do
+      interface = Class.new(GraphQL::Schema::Interface) do
+        def self.name
+          "MyInterface"
+        end
+
+        orphan_types Dummy::CheeseType, Dummy::HoneyType
+      end
+
+      interface_type = interface.to_graphql
+      assert_equal [Dummy::CheeseType, Dummy::HoneyType], interface_type.orphan_types
     end
   end
 

data/spec/graphql/schema/member/accepts_definition_spec.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::Schema::Member::AcceptsDefinition do
+  class AcceptsDefinitionSchema < GraphQL::Schema
+    accepts_definition :set_metadata
+    set_metadata :a, 999
+
+    class Option < GraphQL::Schema::Enum
+      class EnumValue < GraphQL::Schema::EnumValue
+        accepts_definition :metadata
+      end
+      enum_value_class EnumValue
+      accepts_definition :metadata
+      metadata :a, 123
+      value "A", metadata: [:a, 456]
+      value "B"
+    end
+
+    class Query < GraphQL::Schema::Object
+      class Field < GraphQL::Schema::Field
+        class Argument < GraphQL::Schema::Argument
+          accepts_definition :metadata
+        end
+        argument_class Argument
+        accepts_definition :metadata
+      end
+      field_class Field
+      accepts_definition :metadata
+      metadata :a, :abc
+
+      field :option, Option, null: false do
+        metadata :a, :def
+        argument :value, Integer, required: true, metadata: [:a, :ghi]
+      end
+    end
+
+    query(Query)
+  end
+
+
+  it "passes along configs for types" do
+    assert_equal [:a, 123], AcceptsDefinitionSchema::Option.metadata
+    assert_equal 123, AcceptsDefinitionSchema::Option.graphql_definition.metadata[:a]
+    assert_equal [:a, :abc], AcceptsDefinitionSchema::Query.metadata
+    assert_equal :abc, AcceptsDefinitionSchema::Query.graphql_definition.metadata[:a]
+  end
+
+  it "passes along configs for fields and arguments" do
+    assert_equal :def, AcceptsDefinitionSchema.find("Query.option").metadata[:a]
+    assert_equal :ghi, AcceptsDefinitionSchema.find("Query.option.value").metadata[:a]
+  end
+
+  it "passes along configs for enum values" do
+    assert_equal 456, AcceptsDefinitionSchema.find("Option.A").metadata[:a]
+    assert_nil AcceptsDefinitionSchema.find("Option.B").metadata[:a]
+  end
+
+  it "passes along configs for schemas" do
+    assert_equal 999, AcceptsDefinitionSchema.graphql_definition.metadata[:a]
+  end
+end

data/spec/graphql/schema/printer_spec.rb

@@ -629,6 +629,40 @@ type Post {
 SCHEMA
       assert_equal expected.chomp, GraphQL::Schema::Printer.new(schema).print_type(schema.types['Post'])
     end
+
+    it "can print arguments that use non-standard Ruby objects as default values" do
+      backing_object = Struct.new(:value)
+
+      scalar_type = GraphQL::ScalarType.define do
+        name "SomeType"
+        coerce_input ->(value, ctx) { backing_object.new(value) }
+        coerce_result ->(obj, ctx) { obj.value }
+      end
+
+      query_root = GraphQL::ObjectType.define do
+        name "Query"
+        description "The query root of this schema"
+
+        field :example do
+          type scalar_type
+          argument :input, scalar_type, default_value: backing_object.new("Howdy")
+          resolve ->(obj, args, ctx) { args[:input] }
+        end
+      end
+
+      schema = GraphQL::Schema.define do
+        query query_root
+      end
+
+      expected = <<SCHEMA
+# The query root of this schema
+type Query {
+  example(input: SomeType = "Howdy"): SomeType
+}
+SCHEMA
+
+      assert_equal expected.chomp, GraphQL::Schema::Printer.new(schema).print_type(query_root)
+    end
   end
 
   describe "#print_directive" do

data/spec/graphql/schema/traversal_spec.rb

@@ -188,4 +188,35 @@ describe GraphQL::Schema::Traversal do
     }
     assert_equal expected, result
   end
+
+  it "finds orphan types from interfaces" do
+    b_type = GraphQL::ObjectType.define do
+      name "B"
+    end
+
+    c_type = GraphQL::ObjectType.define do
+      name "C"
+    end
+
+    interface = GraphQL::InterfaceType.define do
+      name "AInterface"
+      orphan_types [b_type]
+    end
+
+    another_interface = GraphQL::InterfaceType.define do
+      name "AnotherIterface"
+      orphan_types [b_type, c_type]
+    end
+
+    result = traversal([interface, another_interface]).type_map
+    expected = {
+      "Boolean" => GraphQL::BOOLEAN_TYPE,
+      "String" => GraphQL::STRING_TYPE,
+      "AInterface" => interface,
+      "AnotherIterface" => another_interface,
+      "B" => b_type,
+      "C" => c_type
+    }
+    assert_equal expected, result
+  end
 end

data/spec/graphql/schema/union_spec.rb

@@ -9,6 +9,36 @@ describe GraphQL::Schema::Union do
     end
   end
 
+  describe ".to_graphql" do
+    it "creates a UnionType" do
+      union = Class.new(GraphQL::Schema::Union) do
+        possible_types Jazz::Musician, Jazz::Ensemble
+
+        def self.name
+          "MyUnion"
+        end
+      end
+      union_type = union.to_graphql
+      assert_equal "MyUnion", union_type.name
+      assert_equal [Jazz::Musician.to_graphql, Jazz::Ensemble.to_graphql], union_type.possible_types
+      assert_nil union_type.resolve_type_proc
+    end
+
+    it "can specify a resolve_type method" do
+      union = Class.new(GraphQL::Schema::Union) do
+        def self.resolve_type(_object, _context)
+          "MyType"
+        end
+
+        def self.name
+          "MyUnion"
+        end
+      end
+      union_type = union.to_graphql
+      assert_equal "MyType", union_type.resolve_type_proc.call(nil, nil)
+    end
+  end
+
   describe "in queries" do
     it "works" do
       query_str = <<-GRAPHQL

data/spec/graphql/schema_spec.rb

@@ -6,6 +6,12 @@ describe GraphQL::Schema do
   let(:relay_schema)  { StarWars::Schema }
   let(:empty_schema) { GraphQL::Schema.define }
 
+  describe "#graphql_definition" do
+    it "returns itself" do
+      assert_equal empty_schema, empty_schema.graphql_definition
+    end
+  end
+
   describe "#rescue_from" do
     it "adds handlers to the rescue middleware" do
       schema_defn = schema.graphql_definition

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

@@ -515,7 +515,7 @@ describe GraphQL::StaticValidation::FieldsWillMerge do
           scalar: String!
         }
 
-        type NonNullStringBox1Impl implements SomeBox, NonNullStringBox1 {
+        type NonNullStringBox1Impl implements SomeBox & NonNullStringBox1 {
           scalar: String!
           unrelatedField: String
           deepBox: SomeBox
@@ -525,7 +525,7 @@ describe GraphQL::StaticValidation::FieldsWillMerge do
           scalar: String!
         }
 
-        type NonNullStringBox2Impl implements SomeBox, NonNullStringBox2 {
+        type NonNullStringBox2Impl implements SomeBox & NonNullStringBox2 {
           scalar: String!
           unrelatedField: String
           deepBox: SomeBox

data/spec/graphql/tracing/active_support_notifications_tracing_spec.rb

@@ -41,10 +41,10 @@ describe GraphQL::Tracing::ActiveSupportNotificationsTracing do
       "graphql.execute_field",
       "graphql.execute_query",
       "graphql.lazy_loader",
-      "graphql.execute_field",
       "graphql.execute_field_lazy",
       "graphql.execute_field",
       "graphql.execute_field_lazy",
+      "graphql.execute_field",
       "graphql.execute_field_lazy",
       "graphql.execute_field_lazy",
       "graphql.execute_query_lazy",

data/spec/graphql/union_type_spec.rb

@@ -150,7 +150,7 @@ describe GraphQL::UnionType do
   end
 
   describe "#dup" do
-    it "copies possible types without affecting the orginal" do
+    it "copies possible types without affecting the original" do
       union.possible_types # load the internal cache
       union_2 = union.dup
       union_2.possible_types << type_3

data/spec/spec_helper.rb

@@ -38,6 +38,7 @@ Minitest.backtrace_filter = Minitest::BacktraceFilter.new
 # This is for convenient access to metadata in test definitions
 assign_metadata_key = ->(target, key, value) { target.metadata[key] = value }
 assign_metadata_flag = ->(target, flag) { target.metadata[flag] = true }
+GraphQL::Schema.accepts_definitions(set_metadata: assign_metadata_key)
 GraphQL::BaseType.accepts_definitions(metadata: assign_metadata_key)
 GraphQL::Field.accepts_definitions(metadata: assign_metadata_key)
 GraphQL::Argument.accepts_definitions(metadata: assign_metadata_key)

data/spec/support/dummy/schema.rb

@@ -223,10 +223,7 @@ module Dummy
       description "Where it came from"
     end
 
-    input_field :originDairy, types.String, "Dairy which produced it", default_value: "Sugar Hollow Dairy" do
-      description   "Ignored because arg takes precedence"
-      default_value "Ignored because keyword arg takes precedence"
-    end
+    input_field :originDairy, types.String, "Dairy which produced it", default_value: "Sugar Hollow Dairy"
 
     input_field :fatContent, types.Float, "How much fat it has" do
       # ensure we can define default in block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre7
+  version: 1.8.0.pre8
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -523,6 +523,7 @@ files:
 - lib/graphql/schema/late_bound_type.rb
 - lib/graphql/schema/loader.rb
 - lib/graphql/schema/member.rb
+- lib/graphql/schema/member/accepts_definition.rb
 - lib/graphql/schema/member/build_type.rb
 - lib/graphql/schema/member/has_fields.rb
 - lib/graphql/schema/member/instrumentation.rb
@@ -999,6 +1000,7 @@ files:
 - spec/graphql/relay/range_add_spec.rb
 - spec/graphql/relay/relation_connection_spec.rb
 - spec/graphql/scalar_type_spec.rb
+- spec/graphql/schema/argument_spec.rb
 - spec/graphql/schema/build_from_definition_spec.rb
 - spec/graphql/schema/catchall_middleware_spec.rb
 - spec/graphql/schema/enum_spec.rb
@@ -1009,6 +1011,7 @@ files:
 - spec/graphql/schema/interface_spec.rb
 - spec/graphql/schema/introspection_system_spec.rb
 - spec/graphql/schema/loader_spec.rb
+- spec/graphql/schema/member/accepts_definition_spec.rb
 - spec/graphql/schema/middleware_chain_spec.rb
 - spec/graphql/schema/object_spec.rb
 - spec/graphql/schema/printer_spec.rb
@@ -1500,6 +1503,7 @@ test_files:
 - spec/graphql/relay/range_add_spec.rb
 - spec/graphql/relay/relation_connection_spec.rb
 - spec/graphql/scalar_type_spec.rb
+- spec/graphql/schema/argument_spec.rb
 - spec/graphql/schema/build_from_definition_spec.rb
 - spec/graphql/schema/catchall_middleware_spec.rb
 - spec/graphql/schema/enum_spec.rb
@@ -1510,6 +1514,7 @@ test_files:
 - spec/graphql/schema/interface_spec.rb
 - spec/graphql/schema/introspection_system_spec.rb
 - spec/graphql/schema/loader_spec.rb
+- spec/graphql/schema/member/accepts_definition_spec.rb
 - spec/graphql/schema/middleware_chain_spec.rb
 - spec/graphql/schema/object_spec.rb
 - spec/graphql/schema/printer_spec.rb