graphql 0.18.4 → 0.18.5

data/spec/graphql/schema/printer_spec.rb

@@ -60,7 +60,7 @@ describe GraphQL::Schema::Printer do
       end
     end
 
-    GraphQL::Schema.new(query: query_root)
+    GraphQL::Schema.define(query: query_root)
   }
 
   describe ".print_introspection_schema" do

data/spec/graphql/schema/reduce_types_spec.rb

@@ -96,7 +96,7 @@ describe GraphQL::Schema::ReduceTypes do
   end
 
   describe "when a field is only accessible through an interface" do
-    it "is found through Schema.new(types:)" do
+    it "is found through Schema.define(types:)" do
       assert_equal HoneyType, DummySchema.types["Honey"]
     end
   end

data/spec/graphql/schema/timeout_middleware_spec.rb

@@ -35,7 +35,7 @@ describe GraphQL::Schema::TimeoutMiddleware do
       end
     end
 
-    schema = GraphQL::Schema.new(query: query_type)
+    schema = GraphQL::Schema.define(query: query_type)
     schema.middleware << timeout_middleware
     schema
   }

data/spec/graphql/schema_spec.rb

@@ -20,4 +20,22 @@ describe GraphQL::Schema do
       assert_equal("Test", res["data"]["test"])
     end
   end
+
+  describe "#resolve_type" do
+    describe "when the return value is nil" do
+      it "returns nil" do
+        result = StarWarsSchema.resolve_type(123, nil)
+        assert_equal(nil, result)
+      end
+    end
+
+    describe "when the return value is not a BaseType" do
+      it "raises an error " do
+        err = assert_raises(RuntimeError) {
+          StarWarsSchema.resolve_type(:test_error, nil)
+        }
+        assert_includes err.message, "not_a_type (Symbol)"
+      end
+    end
+  end
 end

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

@@ -25,42 +25,42 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
     assert_equal(6, errors.length)
 
     query_root_error = {
-      "message"=>"Argument 'id' on Field 'cheese' has an invalid value",
+      "message"=>"Argument 'id' on Field 'cheese' has an invalid value. Expected type 'Int!'.",
       "locations"=>[{"line"=>3, "column"=>7}],
       "path"=>["query getCheese", "cheese", "id"],
     }
     assert_includes(errors, query_root_error)
 
     directive_error = {
-      "message"=>"Argument 'if' on Directive 'skip' has an invalid value",
+      "message"=>"Argument 'if' on Directive 'skip' has an invalid value. Expected type 'Boolean!'.",
       "locations"=>[{"line"=>4, "column"=>30}],
       "path"=>["query getCheese", "cheese", "source", "if"],
     }
     assert_includes(errors, directive_error)
 
     input_object_error = {
-      "message"=>"Argument 'product' on Field 'badSource' has an invalid value",
+      "message"=>"Argument 'product' on Field 'badSource' has an invalid value. Expected type '[DairyProductInput]'.",
       "locations"=>[{"line"=>6, "column"=>7}],
       "path"=>["query getCheese", "badSource", "product"],
     }
     assert_includes(errors, input_object_error)
 
     input_object_field_error = {
-      "message"=>"Argument 'source' on InputObject 'DairyProductInput' has an invalid value",
+      "message"=>"Argument 'source' on InputObject 'DairyProductInput' has an invalid value. Expected type 'DairyAnimal!'.",
       "locations"=>[{"line"=>6, "column"=>40}],
       "path"=>["query getCheese", "badSource", "product", "source"],
     }
     assert_includes(errors, input_object_field_error)
 
     missing_required_field_error = {
-      "message"=>"Argument 'product' on Field 'missingSource' has an invalid value",
+      "message"=>"Argument 'product' on Field 'missingSource' has an invalid value. Expected type '[DairyProductInput]'.",
       "locations"=>[{"line"=>7, "column"=>7}],
       "path"=>["query getCheese", "missingSource", "product"],
     }
     assert_includes(errors, missing_required_field_error)
 
     fragment_error = {
-      "message"=>"Argument 'source' on Field 'similarCheese' has an invalid value",
+      "message"=>"Argument 'source' on Field 'similarCheese' has an invalid value. Expected type '[DairyAnimal!]!'.",
       "locations"=>[{"line"=>13, "column"=>7}],
       "path"=>["fragment cheeseFields", "similarCheese", "source"],
     }

data/spec/graphql/union_type_spec.rb

@@ -17,10 +17,6 @@ describe GraphQL::UnionType do
     assert_equal("MyUnion", union.name)
   end
 
-  it "infers type from an object" do
-    assert_equal(CheeseType, DairyProductUnion.resolve_type(CHEESES[1], OpenStruct.new(schema: DummySchema)))
-  end
-
   it '#include? returns true if type in in possible_types' do
     assert union.include?(type_1)
   end

data/spec/spec_helper.rb

@@ -20,6 +20,6 @@ Minitest.backtrace_filter = Minitest::BacktraceFilter.new
 # # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-def query(string, variables={})
+def star_wars_query(string, variables={})
   GraphQL::Query.new(StarWarsSchema, string, variables: variables).result
 end

data/spec/support/dairy_app.rb

@@ -333,11 +333,16 @@ SubscriptionType = GraphQL::ObjectType.define do
   end
 end
 
-DummySchema = GraphQL::Schema.new(
-  query: DairyAppQueryType,
-  mutation: DairyAppMutationType,
-  subscription: SubscriptionType,
-  max_depth: 5,
-  types: [HoneyType, BeverageUnion],
-)
-DummySchema.rescue_from(NoSuchDairyError) { |err| err.message  }
+DummySchema = GraphQL::Schema.define do
+  query DairyAppQueryType
+  mutation DairyAppMutationType
+  subscription SubscriptionType
+  max_depth 5
+  orphan_types [HoneyType, BeverageUnion]
+
+  rescue_from(NoSuchDairyError) { |err| err.message  }
+
+  resolve_type -> (obj, ctx) {
+    DummySchema.types[obj.class.name]
+  }
+end

data/spec/support/star_wars_schema.rb

@@ -11,20 +11,6 @@ NodeIdentification = GraphQL::Relay::GlobalNodeIdentification.define do
     type_name, id = NodeIdentification.from_global_id(node_id)
     STAR_WARS_DATA[type_name][id]
   end
-
-  type_from_object -> (object) do
-    if object == :test_error
-      :not_a_type
-    elsif object.is_a?(Base)
-      BaseType
-    elsif STAR_WARS_DATA["Faction"].values.include?(object)
-      Faction
-    elsif STAR_WARS_DATA["Ship"].values.include?(object)
-      Ship
-    else
-      nil
-    end
-  end
 end
 
 Ship = GraphQL::ObjectType.define do
@@ -215,5 +201,21 @@ MutationType = GraphQL::ObjectType.define do
   field :introduceShip, field: IntroduceShipMutation.field
 end
 
-StarWarsSchema = GraphQL::Schema.new(query: QueryType, mutation: MutationType)
-StarWarsSchema.node_identification = NodeIdentification
+StarWarsSchema = GraphQL::Schema.define do
+  query(QueryType)
+  mutation(MutationType)
+  node_identification(NodeIdentification)
+  resolve_type -> (object, ctx) {
+    if object == :test_error
+      :not_a_type
+    elsif object.is_a?(Base)
+      BaseType
+    elsif STAR_WARS_DATA["Faction"].values.include?(object)
+      Faction
+    elsif STAR_WARS_DATA["Ship"].values.include?(object)
+      Ship
+    else
+      nil
+    end
+  }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: 0.18.5
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter