graphql 0.12.1 → 0.13.0

data/spec/graphql/schema/field_validator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::Schema::FieldValidator do
   let(:field_defn) {{

data/spec/graphql/schema/middleware_chain_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::Schema::MiddlewareChain do
   let(:step_1) { -> (step_values, next_step) { step_values << 1; next_step.call } }
@@ -27,5 +27,16 @@ describe GraphQL::Schema::MiddlewareChain do
         assert_equal([1,2], step_values)
       end
     end
+
+    describe "when a step provides alternate arguments" do
+      it "passes the new arguments to the next step" do
+        step_1 = -> (test_arg, next_step) { assert_equal(test_arg, 'HELLO'); next_step.call(['WORLD']) }
+        step_2 = -> (test_arg, next_step) { assert_equal(test_arg, 'WORLD'); test_arg }
+
+        chain = GraphQL::Schema::MiddlewareChain.new(steps: [step_1, step_2], arguments: ['HELLO'])
+        result = chain.call
+        assert_equal(result, 'WORLD')
+      end
+    end
   end
 end

data/spec/graphql/schema/printer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::Schema::Printer do
   let(:schema) {
@@ -70,9 +70,17 @@ type __Directive {
   name: String!
   description: String
   args: [__InputValue!]!
-  onOperation: Boolean!
-  onFragment: Boolean!
-  onField: Boolean!
+  locations: [__DirectiveLocation!]!
+}
+
+enum __DirectiveLocation {
+  QUERY
+  MUTATION
+  SUBSCRIPTION
+  FIELD
+  FRAGMENT_DEFINITION
+  FRAGMENT_SPREAD
+  INLINE_FRAGMENT
 }
 
 type __EnumValue {

data/spec/graphql/schema/rescue_middleware_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 class SpecExampleError < StandardError; end
 

data/spec/graphql/schema/type_expression_spec.rb

@@ -3,8 +3,8 @@ require "spec_helper"
 describe GraphQL::Schema::TypeExpression do
   let(:schema) { DummySchema }
   let(:ast_node) {
-    ast = GraphQL::PARSER.type.parse(type_name)
-    GraphQL::TRANSFORM.apply(ast)
+    document = GraphQL.parse("query dostuff($var: #{type_name}) { id } ")
+    document.definitions.first.variables.first.type
   }
   let(:type_expression) { GraphQL::Schema::TypeExpression.new(schema, ast_node) }
 

data/spec/graphql/schema/type_reducer_spec.rb

@@ -1,9 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::Schema::TypeReducer do
-  let(:type_map) { GraphQL::Schema::TypeMap.new }
-  it 'finds types from a single type and its fields' do
-    reducer = GraphQL::Schema::TypeReducer.new(CheeseType, type_map)
+  it "finds types from a single type and its fields" do
+    reducer = GraphQL::Schema::TypeReducer.new(CheeseType, {})
     expected = {
       "Cheese" => CheeseType,
       "Float" => GraphQL::FLOAT_TYPE,
@@ -11,21 +10,18 @@ describe GraphQL::Schema::TypeReducer do
       "DairyAnimal" => DairyAnimalEnum,
       "Int" => GraphQL::INT_TYPE,
       "Edible" => EdibleInterface,
-      "Milk" => MilkType,
-      "ID" => GraphQL::ID_TYPE,
       "AnimalProduct" => AnimalProductInterface,
-      "Honey" => HoneyType,
     }
     assert_equal(expected.keys, reducer.result.keys)
-    assert_equal(expected, reducer.result.to_h)
+    assert_equal(expected, reducer.result)
   end
 
-  it 'finds type from arguments' do
-    reducer = GraphQL::Schema::TypeReducer.new(QueryType, type_map)
+  it "finds type from arguments" do
+    reducer = GraphQL::Schema::TypeReducer.new(QueryType, {})
     assert_equal(DairyProductInputType, reducer.result["DairyProductInput"])
   end
 
-  it 'finds types from nested InputObjectTypes' do
+  it "finds types from nested InputObjectTypes" do
     type_child = GraphQL::InputObjectType.define do
       name "InputTypeChild"
       input_field :someField, GraphQL::STRING_TYPE
@@ -36,16 +32,16 @@ describe GraphQL::Schema::TypeReducer do
       input_field :child, type_child
     end
 
-    reducer = GraphQL::Schema::TypeReducer.new(type_parent, type_map)
+    reducer = GraphQL::Schema::TypeReducer.new(type_parent, {})
     expected = {
       "InputTypeParent" => type_parent,
       "InputTypeChild" => type_child,
       "String" => GraphQL::STRING_TYPE
     }
-    assert_equal(expected, reducer.result.to_h)
+    assert_equal(expected, reducer.result)
   end
 
-  describe 'when a type is invalid' do
+  describe "when a type is invalid" do
     let(:invalid_type) {
       GraphQL::ObjectType.define do
         name "InvalidType"
@@ -60,18 +56,18 @@ describe GraphQL::Schema::TypeReducer do
       end
     }
 
-    it 'raises an InvalidTypeError when passed nil' do
-      reducer = GraphQL::Schema::TypeReducer.new(invalid_type, type_map)
+    it "raises an InvalidTypeError when passed nil" do
+      reducer = GraphQL::Schema::TypeReducer.new(invalid_type, {})
       assert_raises(GraphQL::Schema::InvalidTypeError) { reducer.result }
     end
 
-    it 'raises an InvalidTypeError when passed an object that isnt a GraphQL::BaseType' do
-      reducer = GraphQL::Schema::TypeReducer.new(another_invalid_type, type_map)
+    it "raises an InvalidTypeError when passed an object that isnt a GraphQL::BaseType" do
+      reducer = GraphQL::Schema::TypeReducer.new(another_invalid_type, {})
       assert_raises(GraphQL::Schema::InvalidTypeError) { reducer.result }
     end
   end
 
-  describe 'when a schema has multiple types with the same name' do
+  describe "when a schema has multiple types with the same name" do
     let(:type_1) {
       GraphQL::ObjectType.define do
         name "MyType"
@@ -82,34 +78,23 @@ describe GraphQL::Schema::TypeReducer do
         name "MyType"
       end
     }
-    it 'raises an error' do
+    it "raises an error" do
       assert_raises(RuntimeError) {
         GraphQL::Schema::TypeReducer.find_all([type_1, type_2])
       }
     end
   end
 
-  describe 'when getting a type which doesnt exist' do
-    it 'raises an error' do
+  describe "when getting a type which doesnt exist" do
+    it "raises an error" do
       type_map = GraphQL::Schema::TypeReducer.find_all([])
       assert_raises(RuntimeError) { type_map["SomeType"] }
     end
   end
 
-  describe "when a type can only be inferred through an interface" do
-    it "logs a warning" do
-      out, err = capture_io do
-         GraphQL::Schema::TypeReducer.find_all([EdibleInterface])
-      end
-      assert_match /Type "Milk" was inferred from an interface/, err
-      assert_match /Type "Honey" was inferred from an interface/, err
-    end
-
-    it "is ok if the types are passed in explicitly" do
-      out, err = capture_io do
-         GraphQL::Schema::TypeReducer.find_all([EdibleInterface, HoneyType, MilkType])
-      end
-      assert_equal "", err
+  describe "when a field is only accessible through an interface" do
+    it "is found through Schema.new(types:)" do
+      assert_equal HoneyType, DummySchema.types["Honey"]
     end
   end
 end

data/spec/graphql/schema/type_validator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::Schema::TypeValidator do
   let(:base_type_defn) {
@@ -18,9 +18,9 @@ describe GraphQL::Schema::TypeValidator do
   }
   let(:validator) { GraphQL::Schema::TypeValidator.new }
   let(:errors) { e = []; validator.validate(object, e); e;}
-  describe 'when name isnt defined' do
+  describe "when name isnt defined" do
     let(:type_defn) { base_type_defn.delete_if {|k,v| k == :name }}
-    it 'requires name' do
+    it "requires name" do
       assert_equal(
         ["InvalidType must respond to #name() to be a Type"],
         errors
@@ -28,9 +28,9 @@ describe GraphQL::Schema::TypeValidator do
     end
   end
 
-  describe 'when a method returns nil' do
+  describe "when a method returns nil" do
     let(:type_defn) { base_type_defn.merge(interfaces: nil)}
-    it 'requires name' do
+    it "requires name" do
       assert_equal(
         ["InvalidType must return a value for #interfaces() to be a OBJECT"],
         errors
@@ -59,18 +59,18 @@ describe GraphQL::Schema::TypeValidator do
     }
     let(:errors) { e = []; GraphQL::Schema::TypeValidator.new.validate(object, e); e;}
 
-    describe 'when non-object types' do
+    describe "when non-object types" do
       let(:types) { [DairyProductInputType] }
-      it 'must be must be only object types' do
+      it "must be must be only object types" do
         expected = [
           "Something.possible_types must be objects, but some aren't: DairyProductInput"
         ]
         assert_equal(expected, errors)
       end
     end
-    describe 'when no types' do
+    describe "when no types" do
       let(:types) { [] }
-      it 'must have a type' do
+      it "must have a type" do
         expected = [
           "Union Something must be defined with 1 or more types, not 0!"
         ]

data/spec/graphql/schema_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::Schema do
   let(:schema) { DummySchema }

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
   let(:query_string) {%|
@@ -21,7 +21,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
   let(:errors) { validator.validate(query) }
 
-  it 'finds undefined or missing-required arguments to fields and directives' do
+  it "finds undefined or missing-required arguments to fields and directives" do
     assert_equal(6, errors.length)
 
     query_root_error = {
@@ -32,7 +32,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
 
     directive_error = {
       "message"=>"Argument 'if' on Directive 'skip' has an invalid value",
-      "locations"=>[{"line"=>4, "column"=>31}]
+      "locations"=>[{"line"=>4, "column"=>30}]
     }
     assert_includes(errors, directive_error)
 
@@ -44,7 +44,7 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
 
     input_object_field_error = {
       "message"=>"Argument 'source' on InputObject 'DairyProductInput' has an invalid value",
-      "locations"=>[{"line"=>6, "column"=>41}]
+      "locations"=>[{"line"=>6, "column"=>40}]
     }
     assert_includes(errors, input_object_field_error)
 

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::ArgumentsAreDefined do
   let(:query_string) {"
@@ -18,7 +18,7 @@ describe GraphQL::StaticValidation::ArgumentsAreDefined do
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
   let(:errors) { validator.validate(query) }
 
-  it 'finds undefined arguments to fields and directives' do
+  it "finds undefined arguments to fields and directives" do
     assert_equal(4, errors.length)
 
     query_root_error = {
@@ -29,7 +29,7 @@ describe GraphQL::StaticValidation::ArgumentsAreDefined do
 
     input_obj_record = {
       "message"=>"InputObject 'DairyProductInput' doesn't accept argument 'wacky'",
-      "locations"=>[{"line"=>5, "column"=>30}]
+      "locations"=>[{"line"=>5, "column"=>29}]
     }
     assert_includes(errors, input_obj_record)
 
@@ -41,7 +41,7 @@ describe GraphQL::StaticValidation::ArgumentsAreDefined do
 
     directive_error = {
       "message"=>"Directive 'skip' doesn't accept argument 'something'",
-      "locations"=>[{"line"=>10, "column"=>11}]
+      "locations"=>[{"line"=>10, "column"=>10}]
     }
     assert_includes(errors, directive_error)
   end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::DirectivesAreDefined do
   let(:query_string) {"
@@ -17,15 +17,15 @@ describe GraphQL::StaticValidation::DirectivesAreDefined do
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
   let(:errors) { validator.validate(query) }
 
-  describe 'non-existent directives' do
-    it 'makes errors for them' do
+  describe "non-existent directives" do
+    it "makes errors for them" do
       expected = [
         {
           "message"=>"Directive @nonsense is not defined",
-          "locations"=>[{"line"=>5, "column"=>17}]
+          "locations"=>[{"line"=>5, "column"=>16}]
         }, {
           "message"=>"Directive @moreNonsense is not defined",
-          "locations"=>[{"line"=>7, "column"=>19}]
+          "locations"=>[{"line"=>7, "column"=>18}]
         }
       ]
       assert_equal(expected, errors)

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

@@ -0,0 +1,39 @@
+require "spec_helper"
+
+describe GraphQL::StaticValidation::DirectivesAreInValidLocations do
+  let(:query_string) {"
+    query getCheese @skip(if: true) {
+      okCheese: cheese(id: 1) {
+        id @skip(if: true),
+        source
+        ... on Cheese @skip(if: true) {
+          flavor
+        }
+      }
+    }
+
+    fragment whatever on Cheese @skip(if: true) {
+      id
+    }
+  "}
+
+  let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [GraphQL::StaticValidation::DirectivesAreInValidLocations]) }
+  let(:query) { GraphQL::Query.new(DummySchema, query_string) }
+  let(:errors) { validator.validate(query) }
+
+  describe "invalid directive locations" do
+    it "makes errors for them" do
+      expected = [
+        {
+          "message"=> "'@skip' can't be applied to queries (allowed: fields, fragment spreads, inline fragments)",
+          "locations"=>[{"line"=>2, "column"=>21}]
+        },
+        {
+          "message"=>"'@skip' can't be applied to fragment definitions (allowed: fields, fragment spreads, inline fragments)",
+          "locations"=>[{"line"=>12, "column"=>33}]
+        },
+      ]
+      assert_equal(expected, errors)
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::FieldsAreDefinedOnType do
   let(:query_string) { "
@@ -26,10 +26,10 @@ describe GraphQL::StaticValidation::FieldsAreDefinedOnType do
     assert_equal(expected_errors, error_messages)
   end
 
-  describe 'on interfaces' do
+  describe "on interfaces" do
     let(:query_string) { "query getStuff { favoriteEdible { amountThatILikeIt } }"}
 
-    it 'finds invalid fields' do
+    it "finds invalid fields" do
       expected_errors = [
         {"message"=>"Field 'amountThatILikeIt' doesn't exist on type 'Edible'", "locations"=>[{"line"=>1, "column"=>18}]}
       ]
@@ -37,7 +37,7 @@ describe GraphQL::StaticValidation::FieldsAreDefinedOnType do
     end
   end
 
-  describe 'on unions' do
+  describe "on unions" do
     let(:query_string) { "
       query notOnUnion { favoriteEdible { ...dpFields } }
       fragment dbFields on DairyProduct { source }
@@ -45,7 +45,7 @@ describe GraphQL::StaticValidation::FieldsAreDefinedOnType do
     "}
 
 
-    it 'doesnt allow selections on unions' do
+    it "doesnt allow selections on unions" do
       expected_errors = [
         {
           "message"=>"Selections can't be made directly on unions (see selections on DairyProduct)",

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::FieldsHaveAppropriateSelections do
   let(:query_string) {"
@@ -13,19 +13,19 @@ describe GraphQL::StaticValidation::FieldsHaveAppropriateSelections do
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
   let(:errors) { validator.validate(query) }
 
-  it 'adds errors for selections on scalars' do
+  it "adds errors for selections on scalars" do
     assert_equal(2, 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}]
     }
-    assert_includes(errors, illegal_selection_error, 'finds illegal selections on scalarss')
+    assert_includes(errors, illegal_selection_error, "finds illegal selections on scalarss")
 
     selection_required_error = {
       "message"=>"Objects must have selections (field 'cheese' returns Cheese but has no selections)",
       "locations"=>[{"line"=>4, "column"=>7}]
     }
-    assert_includes(errors, selection_required_error, 'finds objects without selections')
+    assert_includes(errors, selection_required_error, "finds objects without selections")
   end
 end