graphql 1.7.13 → 1.7.14

data/spec/graphql/query_spec.rb

@@ -253,6 +253,32 @@ describe GraphQL::Query do
         assert_equal [nil], Instrumenter::ERROR_LOG
       end
     end
+
+    describe "when an error propagated through execution" do
+      module ExtensionsInstrumenter
+        LOG = []
+        def self.before_query(q); end;
+
+        def self.after_query(q)
+          q.result["extensions"] = { "a" => 1 }
+          LOG << :ok
+        end
+      end
+
+      let(:schema) {
+        Dummy::Schema.redefine {
+          instrument(:query, ExtensionsInstrumenter)
+        }
+      }
+
+      it "can add to extensions" do
+        ExtensionsInstrumenter::LOG.clear
+        assert_raises(RuntimeError) do
+          schema.execute "{ error }"
+        end
+        assert_equal [:ok], ExtensionsInstrumenter::LOG
+      end
+    end
   end
 
   it "uses root_value as the object for the root type" do

data/spec/graphql/relay/relation_connection_spec.rb

@@ -117,6 +117,13 @@ describe GraphQL::Relay::RelationConnection do
       assert_equal true, get_page_info(result)["hasNextPage"]
       assert_equal true, get_page_info(result)["hasPreviousPage"]
 
+      last_cursor = get_last_cursor(result)
+      result = with_bidirectional_pagination {
+        star_wars_query(query_string, "last" => 1, "before" => last_cursor)
+      }
+      assert_equal true, get_page_info(result)["hasNextPage"]
+      assert_equal false, get_page_info(result)["hasPreviousPage"]
+
       result = star_wars_query(query_string, "first" => 100)
       last_cursor = get_last_cursor(result)
 
@@ -129,7 +136,6 @@ describe GraphQL::Relay::RelationConnection do
       }
       assert_equal true, get_page_info(result)["hasNextPage"]
       assert_equal true, get_page_info(result)["hasPreviousPage"]
-
     end
 
     it 'slices the result' do

data/spec/graphql/schema/build_from_definition_spec.rb

@@ -612,6 +612,65 @@ type Query {
 
       build_schema_and_compare_output(schema.chop)
     end
+
+    it "tracks original AST node" do
+      schema_definition = <<-GRAPHQL
+schema {
+  query: Query
+}
+
+enum Enum {
+  VALUE
+}
+
+type Query {
+  field(argument: String): String
+  deprecatedField(argument: String): String @deprecated(reason: "Test")
+}
+
+interface Interface {
+  field(argument: String): String
+}
+
+union Union = Query
+
+scalar Scalar
+
+input Input {
+  argument: String
+}
+
+directive @Directive (
+  # Argument
+  argument: String
+) on SCHEMA
+
+type Type implements Interface {
+  field(argument: String): String
+}
+      GRAPHQL
+
+      schema = GraphQL::Schema.from_definition(schema_definition)
+
+      assert_equal [1, 1], schema.ast_node.position
+      assert_equal [5, 1], schema.types["Enum"].ast_node.position
+      assert_equal [6, 3], schema.types["Enum"].values["VALUE"].ast_node.position
+      assert_equal [9, 1], schema.types["Query"].ast_node.position
+      assert_equal [10, 3], schema.types["Query"].fields["field"].ast_node.position
+      assert_equal [10, 9], schema.types["Query"].fields["field"].arguments["argument"].ast_node.position
+      assert_equal [11, 45], schema.types["Query"].fields["deprecatedField"].ast_node.directives[0].position
+      assert_equal [11, 57], schema.types["Query"].fields["deprecatedField"].ast_node.directives[0].arguments[0].position
+      assert_equal [14, 1], schema.types["Interface"].ast_node.position
+      assert_equal [15, 3], schema.types["Interface"].fields["field"].ast_node.position
+      assert_equal [15, 9], schema.types["Interface"].fields["field"].arguments["argument"].ast_node.position
+      assert_equal [18, 1], schema.types["Union"].ast_node.position
+      assert_equal [20, 1], schema.types["Scalar"].ast_node.position
+      assert_equal [22, 1], schema.types["Input"].ast_node.position
+      assert_equal [22, 1], schema.types["Input"].arguments["argument"].ast_node.position
+      assert_equal [26, 1], schema.directives["Directive"].ast_node.position
+      assert_equal [28, 3], schema.directives["Directive"].arguments["argument"].ast_node.position
+      assert_equal [31, 22], schema.types["Type"].ast_node.interfaces[0].position
+    end
   end
 
   describe 'Failures' do

data/spec/graphql/schema/printer_spec.rb

@@ -610,6 +610,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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.7.13
+  version: 1.7.14
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips