graphql 0.12.1 → 0.13.0

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::FieldsWillMerge do
   let(:query_string) {"
@@ -34,7 +34,7 @@ describe GraphQL::StaticValidation::FieldsWillMerge do
   let(:errors) { validator.validate(query) }
   let(:error_messages) { errors.map { |e| e["message" ] }}
 
-  it 'finds field naming conflicts' do
+  it "finds field naming conflicts" do
     expected_errors = [
       "Field 'id' has a directive conflict: [] or [someFlag]?",                 # different directives
       "Field 'id' has a directive argument conflict: [] or [{}]?",              # not sure this is a great way to handle it but here we are!

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::FragmentSpreadsArePossible do
   let(:query_string) {%|

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::FragmentTypesExist do
   let(:query_string) {"
@@ -23,7 +23,7 @@ describe GraphQL::StaticValidation::FragmentTypesExist do
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
   let(:errors) { validator.validate(query) }
 
-  it 'finds non-existent types on fragments' do
+  it "finds non-existent types on fragments" do
     assert_equal(2, errors.length)
     inline_fragment_error =  {
       "message"=>"No such type Something, so it can't be a fragment condition",

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::FragmentsAreFinite do
   let(:query_string) {%|
@@ -28,7 +28,7 @@ describe GraphQL::StaticValidation::FragmentsAreFinite do
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
   let(:errors) { validator.validate(query) }
 
-  it 'doesnt allow infinite loops' do
+  it "doesnt allow infinite loops" do
     expected = [
       {
         "message"=>"Fragment sourceField contains an infinite loop",

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::FragmentsAreOnCompositeTypes do
   let(:query_string) {%|
@@ -29,7 +29,7 @@ describe GraphQL::StaticValidation::FragmentsAreOnCompositeTypes do
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
   let(:errors) { validator.validate(query) }
 
-  it 'requires Object/Union/Interface fragment types' do
+  it "requires Object/Union/Interface fragment types" do
     expected = [
       {
         "message"=>"Invalid fragment on type Boolean (must be Union, Interface or Object)",

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::FragmentsAreUsed do
   let(:query_string) {"
@@ -15,11 +15,11 @@ describe GraphQL::StaticValidation::FragmentsAreUsed do
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
   let(:errors) { validator.validate(query) }
 
-  it 'adds errors for unused fragment definitions' do
+  it "adds errors for unused fragment definitions" do
     assert_includes(errors, {"message"=>"Fragment unusedFields was defined, but not used", "locations"=>[{"line"=>8, "column"=>5}]})
   end
 
-  it 'adds errors for undefined fragment spreads' do
+  it "adds errors for undefined fragment spreads" do
     assert_includes(errors, {"message"=>"Fragment undefinedFields was used, but not defined", "locations"=>[{"line"=>5, "column"=>7}]})
   end
 end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::RequiredArgumentsArePresent do
   let(:query_string) {"
@@ -18,7 +18,7 @@ describe GraphQL::StaticValidation::RequiredArgumentsArePresent 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(3, errors.length)
 
     query_root_error = {
@@ -35,7 +35,7 @@ describe GraphQL::StaticValidation::RequiredArgumentsArePresent do
 
     directive_error = {
       "message"=>"Directive 'skip' is missing required arguments: if",
-      "locations"=>[{"line"=>10, "column"=>11}]
+      "locations"=>[{"line"=>10, "column"=>10}]
     }
     assert_includes(errors, directive_error)
   end

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::VariableDefaultValuesAreCorrectlyTyped do
   let(:query_string) {%|
@@ -24,19 +24,19 @@ describe GraphQL::StaticValidation::VariableDefaultValuesAreCorrectlyTyped do
     expected = [
       {
         "message"=>"Default value for $badFloat doesn't match type Float",
-        "locations"=>[{"line"=>6, "column"=>8}]
+        "locations"=>[{"line"=>6, "column"=>7}]
       },
       {
         "message"=>"Default value for $badInt doesn't match type Int",
-        "locations"=>[{"line"=>7, "column"=>8}]
+        "locations"=>[{"line"=>7, "column"=>7}]
       },
       {
         "message"=>"Default value for $badInput doesn't match type DairyProductInput",
-        "locations"=>[{"line"=>9, "column"=>8}]
+        "locations"=>[{"line"=>9, "column"=>7}]
       },
       {
         "message"=>"Non-null variable $nonNull can't have a default value",
-        "locations"=>[{"line"=>10, "column"=>8}]
+        "locations"=>[{"line"=>10, "column"=>7}]
       }
     ]
     assert_equal(expected, errors)

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::VariableUsagesAreAllowed do
   let(:query_string) {'
@@ -20,6 +20,8 @@ describe GraphQL::StaticValidation::VariableUsagesAreAllowed do
         similarCheese(source: $goodAnimals)
         other: similarCheese(source: $badAnimals)
         tooDeep: similarCheese(source: $deepAnimals)
+        nullableCheese(source: $goodAnimals)
+        deeplyNullableCheese(source: $deepAnimals)
       }
 
       milk(id: 1) {

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::VariablesAreInputTypes do
   let(:query_string) {'
@@ -21,15 +21,15 @@ describe GraphQL::StaticValidation::VariablesAreInputTypes do
     expected = [
       {
         "message"=>"AnimalProduct isn't a valid input type (on $interface)",
-        "locations"=>[{"line"=>5, "column"=>8}]
+        "locations"=>[{"line"=>5, "column"=>7}]
       },
       {
         "message"=>"Milk isn't a valid input type (on $object)",
-        "locations"=>[{"line"=>6, "column"=>8}]
+        "locations"=>[{"line"=>6, "column"=>7}]
       },
       {
         "message"=>"Cheese isn't a valid input type (on $objects)",
-        "locations"=>[{"line"=>7, "column"=>8}]
+        "locations"=>[{"line"=>7, "column"=>7}]
       }
     ]
     assert_equal(expected, errors)

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::VariablesAreUsedAndDefined do
   let(:query_string) {'
@@ -41,11 +41,11 @@ describe GraphQL::StaticValidation::VariablesAreUsedAndDefined do
       },
       {
         "message"=>"Variable $undefinedVar is used by getCheese but not declared",
-        "locations"=>[{"line"=>11, "column"=>30}]
+        "locations"=>[{"line"=>11, "column"=>29}]
       },
       {
         "message"=>"Variable $undefinedFragmentVar is used by innerCheeseFields but not declared",
-        "locations"=>[{"line"=>24, "column"=>27}]
+        "locations"=>[{"line"=>24, "column"=>26}]
       },
     ]
     assert_equal(expected, errors)

data/spec/graphql/static_validation/type_stack_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 class TypeCheckValidator
   def self.checks
@@ -24,7 +24,8 @@ describe GraphQL::StaticValidation::TypeStack do
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema, rules: [TypeCheckValidator]) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
 
-  it 'stores up types' do
+
+  it "stores up types" do
     validator.validate(query)
     expected = [
       ["Query", "Cheese"],

data/spec/graphql/static_validation/validator_spec.rb

@@ -1,13 +1,15 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::StaticValidation::Validator do
   let(:validator) { GraphQL::StaticValidation::Validator.new(schema: DummySchema) }
   let(:query) { GraphQL::Query.new(DummySchema, query_string) }
   let(:errors) { validator.validate(query) }
 
-  describe 'validation order' do
 
-    describe 'fields & arguments' do
+  describe "validation order" do
+    let(:document) { GraphQL.parse(query_string)}
+
+    describe "fields & arguments" do
       let(:query_string) { %|
         query getCheese($id: Int!) {
           cheese(id: $undefinedVar, bogusArg: true) {
@@ -23,13 +25,13 @@ describe GraphQL::StaticValidation::Validator do
         }
       |}
 
-      it 'handles args on invalid fields' do
+      it "handles args on invalid fields" do
         # nonsenseField, nonsenseArg, bogusField, bogusArg, undefinedVar
         assert_equal(5, errors.length)
       end
     end
 
-    describe 'infinite fragments' do
+    describe "infinite fragments" do
       let(:query_string) { %|
         query getCheese {
           cheese(id: 1) {
@@ -41,7 +43,25 @@ describe GraphQL::StaticValidation::Validator do
         }
       |}
 
-      it 'handles infinite fragment spreads' do
+      it "handles infinite fragment spreads" do
+        assert_equal(1, errors.length)
+      end
+    end
+
+    describe "fragment spreads with no selections" do
+      let(:query_string) {%|
+        query SimpleQuery {
+          cheese(id: 1) {
+            # OK:
+            ... {
+              id
+            }
+            # NOT OK:
+            ...cheeseFields
+          }
+        }
+      |}
+      it "marks an error" do
         assert_equal(1, errors.length)
       end
     end

data/spec/graphql/union_type_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe GraphQL::UnionType do
   let(:type_1) { OpenStruct.new(kind: GraphQL::TypeKinds::OBJECT)}
@@ -12,12 +12,13 @@ describe GraphQL::UnionType do
       possible_types(types)
     }
   }
-  it 'has a name' do
+  it "has a name" do
     assert_equal("MyUnion", union.name)
   end
 
-  it 'infers type from an object' do
-    assert_equal(CheeseType, DairyProductUnion.resolve_type(CHEESES[1]))
+
+  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

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
-require 'graphql'
+require "graphql"
 require "benchmark"
 require "minitest/autorun"
 require "minitest/focus"
 require "minitest/reporters"
-require 'pry'
+require "pry"
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
 Minitest::Spec.make_my_diffs_pretty!
@@ -16,6 +16,3 @@ Minitest.backtrace_filter = Minitest::BacktraceFilter.new
 
 # # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-require 'parslet'
-require 'parslet/convenience'

data/spec/support/dairy_app.rb

@@ -1,4 +1,4 @@
-require_relative './dairy_data'
+require_relative "./dairy_data"
 
 class NoSuchDairyError < StandardError; end
 
@@ -51,6 +51,16 @@ CheeseType = GraphQL::ObjectType.define do
     }
   end
 
+  field :nullableCheese, -> { CheeseType }, "Cheeses like this one" do
+    argument :source, types[!DairyAnimalEnum]
+    resolve -> (t, a, c) { raise("NotImplemented") }
+  end
+
+  field :deeplyNullableCheese, -> { CheeseType }, "Cheeses like this one" do
+    argument :source, types[types[DairyAnimalEnum]]
+    resolve -> (t, a, c) { raise("NotImplemented") }
+  end
+
   field :fatContent, property: :fat_content do
     type(!GraphQL::FLOAT_TYPE)
     description("Percentage which is milkfat")
@@ -59,7 +69,7 @@ CheeseType = GraphQL::ObjectType.define do
 end
 
 MilkType = GraphQL::ObjectType.define do
-  name 'Milk'
+  name "Milk"
   description "Dairy beverage"
   interfaces [EdibleInterface, AnimalProductInterface]
   field :id, !types.ID
@@ -75,14 +85,14 @@ end
 
 # No actual data; This type is an "orphan", only accessible through Interfaces
 HoneyType = GraphQL::ObjectType.define do
-  name 'Honey'
+  name "Honey"
   description "Sweet, dehydrated bee barf"
   interfaces [EdibleInterface, AnimalProductInterface]
 end
 
 DairyType = GraphQL::ObjectType.define do
-  name 'Dairy'
-  description 'A farm where milk is harvested and cheese is produced'
+  name "Dairy"
+  description "A farm where milk is harvested and cheese is produced"
   field :id, !types.ID
   field :cheese, CheeseType
   field :milks, types[MilkType]
@@ -101,8 +111,8 @@ DairyProductUnion = GraphQL::UnionType.define do
 end
 
 CowType = GraphQL::ObjectType.define do
-  name 'Cow'
-  description 'A farm where milk is harvested and cheese is produced'
+  name "Cow"
+  description "A farm where milk is harvested and cheese is produced"
   field :id, !types.ID
   field :name, types.String
   field :last_produced_dairy, DairyProductUnion
@@ -122,12 +132,22 @@ DairyProductInputType = GraphQL::InputObjectType.define {
   name "DairyProductInput"
   description "Properties for finding a dairy product"
   input_field :source, !DairyAnimalEnum do
+    # ensure we can define description in block
     description "Where it came from"
   end
 
-  input_field :originDairy, types.String, "Dairy which produced it", default_value: "Sugar Hollow Dairy"
+  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 :fatContent, types.Float, "How much fat it has" do
+    # ensure we can define default in block
+    default_value 0.3
+  end
 
-  input_field :fatContent, types.Float, "How much fat it has"
+  # ensure default can be false
+  input_field :organic, types.Boolean, default_value: false
 }
 
 
@@ -260,5 +280,6 @@ DummySchema = GraphQL::Schema.new(
   mutation: MutationType,
   subscription: SubscriptionType,
   max_depth: 5,
+  types: [HoneyType],
 )
 DummySchema.rescue_from(NoSuchDairyError) { |err| err.message  }

data/spec/support/dairy_data.rb

@@ -18,6 +18,6 @@ DAIRY = OpenStruct.new(
 
 COW = OpenStruct.new(
   id: 1,
-  name: 'Billy',
+  name: "Billy",
   last_produced_dairy: MILKS[1]
 )

data/spec/support/star_wars_data.rb

@@ -1,38 +1,38 @@
 luke = OpenStruct.new({
-  id: '1000',
-  name: 'Luke Skywalker',
-  friends: ['1002', '1003', '2000', '2001'],
+  id: "1000",
+  name: "Luke Skywalker",
+  friends: ["1002", "1003", "2000", "2001"],
   appearsIn: [4, 5, 6],
-  homePlanet: 'Tatooine',
+  homePlanet: "Tatooine",
 })
 
 vader = OpenStruct.new({
-  id: '1001',
-  name: 'Darth Vader',
-  friends: ['1004'],
+  id: "1001",
+  name: "Darth Vader",
+  friends: ["1004"],
   appearsIn: [4, 5, 6],
-  homePlanet: 'Tatooine',
+  homePlanet: "Tatooine",
 })
 
 han = OpenStruct.new({
-  id: '1002',
-  name: 'Han Solo',
-  friends: ['1000', '1003', '2001'],
+  id: "1002",
+  name: "Han Solo",
+  friends: ["1000", "1003", "2001"],
   appearsIn: [4, 5, 6],
 })
 
 leia = OpenStruct.new({
-  id: '1003',
-  name: 'Leia Organa',
-  friends: ['1000', '1002', '2000', '2001'],
+  id: "1003",
+  name: "Leia Organa",
+  friends: ["1000", "1002", "2000", "2001"],
   appearsIn: [4, 5, 6],
-  homePlanet: 'Alderaan',
+  homePlanet: "Alderaan",
 })
 
 tarkin = OpenStruct.new({
-  id: '1004',
-  name: 'Wilhuff Tarkin',
-  friends: ['1001'],
+  id: "1004",
+  name: "Wilhuff Tarkin",
+  friends: ["1001"],
   appearsIn: [4],
 })
 
@@ -45,19 +45,19 @@ HUMAN_DATA = {
 }
 
 threepio = OpenStruct.new({
-  id: '2000',
-  name: 'C-3PO',
-  friends: ['1000', '1002', '1003', '2001'],
+  id: "2000",
+  name: "C-3PO",
+  friends: ["1000", "1002", "1003", "2001"],
   appearsIn: [4, 5, 6],
-  primaryFunction: 'Protocol',
+  primaryFunction: "Protocol",
 })
 
 artoo = OpenStruct.new({
-  id: '2001',
-  name: 'R2-D2',
-  friends: ['1000', '1002', '1003'],
+  id: "2001",
+  name: "R2-D2",
+  friends: ["1000", "1002", "1003"],
   appearsIn: [4, 5, 6],
-  primaryFunction: 'Astromech',
+  primaryFunction: "Astromech",
 })
 
 DROID_DATA = {