graphql 1.9.0.pre1 → 1.9.0.pre2

data/spec/graphql/schema/build_from_definition_spec.rb

@@ -60,37 +60,114 @@ type Hello {
       build_schema_and_compare_output(schema.chop)
     end
 
-    it 'supports descriptions' do
+    it 'supports descriptions and definition_line' do
       schema = <<-SCHEMA
 schema {
   query: Hello
 }
 
-# This is a directive
+"""
+This is a directive
+"""
 directive @foo(
-  # It has an argument
+  """
+  It has an argument
+  """
   arg: Int
 ) on FIELD
 
-# With an enum
+"""
+With an enum
+"""
 enum Color {
   BLUE
 
-  # Not a creative color
+  """
+  Not a creative color
+  """
   GREEN
   RED
 }
 
-# What a great type
-type Hello {
-  anEnum: Color
+"""
+What a great type
+"""
+type Hello implements I {
+  anEnum(s: S): Color
 
-  # And a field to boot
-  str: String
+  """
+  And a field to boot
+  """
+  str(i: Input): String
+}
+
+"""
+An interface
+"""
+interface I {
+  str(i: Input): String
 }
+
+"""
+And an Input
+"""
+input Input {
+  s: String
+}
+
+"""
+A scalar
+"""
+scalar S
+
+"""
+And a union
+"""
+union U = Hello
       SCHEMA
 
       build_schema_and_compare_output(schema.chop)
+
+      built_schema = GraphQL::Schema.from_definition(schema)
+      # The schema's are the same since there's no description
+      assert_equal 1, built_schema.ast_node.line
+      assert_equal 1, built_schema.ast_node.definition_line
+
+      # These account for description:
+      assert_equal 5, built_schema.directives["foo"].ast_node.line, "The ast_node.line points to the description"
+      assert_equal 8, built_schema.directives["foo"].ast_node.definition_line, "The ast_node.definition_line points to the definition"
+
+      arg = built_schema.directives["foo"].arguments["arg"]
+      assert_equal 9, arg.ast_node.line
+      assert_equal 12, arg.ast_node.definition_line
+
+      enum_type = built_schema.types["Color"]
+      assert_equal 15, enum_type.ast_node.line, "The ast_node.line points to the description"
+      assert_equal 18, enum_type.ast_node.definition_line, "The ast_node.definition_line points to the definition"
+
+      enum_value = enum_type.values["GREEN"]
+      assert_equal 21, enum_value.ast_node.line
+      assert_equal 24, enum_value.ast_node.definition_line
+
+      obj_type = built_schema.types["Hello"]
+      assert_equal 28, obj_type.ast_node.line, "The ast_node.line points to the description"
+      assert_equal 31, obj_type.ast_node.definition_line, "The ast_node.definition_line points to the definition"
+
+      field = obj_type.fields["str"]
+      assert_equal 34, field.ast_node.line
+      assert_equal 37, field.ast_node.definition_line
+
+      assert_equal 40, built_schema.types["I"].ast_node.line
+      assert_equal 43, built_schema.types["I"].ast_node.definition_line
+
+      assert_equal 47, built_schema.types["Input"].ast_node.line
+      assert_equal 50, built_schema.types["Input"].ast_node.definition_line
+
+      assert_equal 54, built_schema.types["S"].ast_node.line
+      assert_equal 57, built_schema.types["S"].ast_node.definition_line
+
+      assert_equal 59, built_schema.types["U"].ast_node.line
+      assert_equal 62, built_schema.types["U"].ast_node.definition_line
     end
 
     it 'maintains built-in directives' do
@@ -233,64 +310,102 @@ type Organization {
   email: String
 }
 
-# The connection type for Organization.
+"""
+The connection type for Organization.
+"""
 type OrganizationConnection {
-  # A list of edges.
+  """
+  A list of edges.
+  """
   edges: [OrganizationEdge]
 
-  # A list of nodes.
+  """
+  A list of nodes.
+  """
   nodes: [Organization]
 
-  # Information to aid in pagination.
+  """
+  Information to aid in pagination.
+  """
   pageInfo: PageInfo!
 
-  # Identifies the total count of items in the connection.
+  """
+  Identifies the total count of items in the connection.
+  """
   totalCount: Int!
 }
 
-# An edge in a connection.
+"""
+An edge in a connection.
+"""
 type OrganizationEdge {
-  # A cursor for use in pagination.
+  """
+  A cursor for use in pagination.
+  """
   cursor: String!
 
-  # The item at the end of the edge.
+  """
+  The item at the end of the edge.
+  """
   node: Organization
 }
 
-# Information about pagination in a connection.
+"""
+Information about pagination in a connection.
+"""
 type PageInfo {
-  # When paginating forwards, the cursor to continue.
+  """
+  When paginating forwards, the cursor to continue.
+  """
   endCursor: String
 
-  # When paginating forwards, are there more items?
+  """
+  When paginating forwards, are there more items?
+  """
   hasNextPage: Boolean!
 
-  # When paginating backwards, are there more items?
+  """
+  When paginating backwards, are there more items?
+  """
   hasPreviousPage: Boolean!
 
-  # When paginating backwards, the cursor to continue.
+  """
+  When paginating backwards, the cursor to continue.
+  """
   startCursor: String
 }
 
 type Type {
   name: String
   organization(
-    # The login of the organization to find.
+    """
+    The login of the organization to find.
+    """
     login: String!
   ): Organization
 
-  # A list of organizations the user belongs to.
+  """
+  A list of organizations the user belongs to.
+  """
   organizations(
-    # Returns the elements in the list that come after the specified cursor.
+    """
+    Returns the elements in the list that come after the specified cursor.
+    """
     after: String
 
-    # Returns the elements in the list that come before the specified cursor.
+    """
+    Returns the elements in the list that come before the specified cursor.
+    """
     before: String
 
-    # Returns the first _n_ elements from the list.
+    """
+    Returns the first _n_ elements from the list.
+    """
     first: Int
 
-    # Returns the last _n_ elements from the list.
+    """
+    Returns the last _n_ elements from the list.
+    """
     last: Int
   ): OrganizationConnection!
 }

data/spec/graphql/schema/directive/feature_spec.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::Schema::Directive::Feature do
+  class FeatureSchema < GraphQL::Schema
+    class Feature < GraphQL::Schema::Directive::Feature
+      def self.enabled?(flag_name, obj, ctx)
+        !!ctx[flag_name.to_sym]
+      end
+    end
+
+    class Query < GraphQL::Schema::Object
+      field :int, Integer, null: false
+
+      def int
+        context[:int] ||= 0
+        context[:int] += 1
+      end
+    end
+
+    directive(Feature)
+    query(Query)
+    # only supported by the interpreter
+    use GraphQL::Execution::Interpreter
+    use GraphQL::Analysis::AST
+  end
+
+
+  it "skips or runs fields" do
+    str = '{
+      int1: int
+      int2: int @feature(flag: "flag1")
+      int3: int @feature(flag: "flag2")
+    }'
+
+    res = FeatureSchema.execute(str, context: { flag2: true })
+    # Int2 was not called, so `int3` is actually 2
+    assert_equal({"int1" => 1, "int3" => 2}, res["data"])
+  end
+
+  it "skips or runs fragment spreads" do
+    str = '{
+      ...F1
+      ...F2 @feature(flag: "flag1")
+      ...F3 @feature(flag: "flag2")
+      int4: int
+    }
+
+    fragment F1 on Query { int1: int }
+    fragment F2 on Query { int2: int }
+    fragment F3 on Query { int3: int }
+    '
+
+    res = FeatureSchema.execute(str, context: { flag1: true })
+    # `int3` was skipped
+    assert_equal({"int1" => 1, "int2" => 2, "int4" => 3}, res["data"])
+  end
+  it "skips or runs inline fragments" do
+    str = '{
+      ... { int1: int }
+      ... @feature(flag: "flag1") { int2: int }
+      ... @feature(flag: "flag2") { int3: int }
+      int4: int
+    }
+    '
+
+    res = FeatureSchema.execute(str, context: { flag2: true })
+    # `int2` was skipped
+    assert_equal({"int1" => 1, "int3" => 2, "int4" => 3}, res["data"])
+  end
+
+  it "returns an error if it's in the wrong place" do
+    str = '
+    query @feature(flag: "x") {
+      int
+    }
+    '
+    res = FeatureSchema.execute(str)
+    assert_equal ["'@feature' can't be applied to queries (allowed: fields, fragment spreads, inline fragments)"], res["errors"].map { |e| e["message"] }
+  end
+end

data/spec/graphql/schema/directive/transform_spec.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::Schema::Directive::Transform do
+  class TransformSchema < GraphQL::Schema
+    class Query < GraphQL::Schema::Object
+      field :echo, String, null: false do
+        argument :input, String, required: true
+      end
+
+      def echo(input:)
+        input
+      end
+    end
+
+    directive(GraphQL::Schema::Directive::Transform)
+
+    query(Query)
+    # only supported by the interpreter
+    use GraphQL::Execution::Interpreter
+    use GraphQL::Analysis::AST
+  end
+
+  it "transforms when applicable" do
+    str = '{
+      normal: echo(input: "Hello")
+      upcased: echo(input: "Hello") @transform(by: "upcase")
+      downcased: echo(input: "Hello") @transform(by: "downcase")
+      nonsense: echo(input: "Hello") @transform(by: "nonsense")
+    }'
+
+    res = TransformSchema.execute(str)
+
+    assert_equal "Hello", res["data"]["normal"]
+    assert_equal "HELLO", res["data"]["upcased"]
+    assert_equal "hello", res["data"]["downcased"]
+    assert_equal "Hello", res["data"]["nonsense"]
+  end
+end

data/spec/graphql/schema/enum_spec.rb

@@ -14,7 +14,7 @@ describe GraphQL::Schema::Enum do
     it "tells about the definition" do
       assert_equal "Family", enum.graphql_name
       assert_equal 29, enum.description.length
-      assert_equal 6, enum.values.size
+      assert_equal 7, enum.values.size
     end
 
     it "inherits values and description" do
@@ -26,8 +26,8 @@ describe GraphQL::Schema::Enum do
       # Description was inherited
       assert_equal 29, new_enum.description.length
       # values were inherited without modifying the parent
-      assert_equal 6, enum.values.size
-      assert_equal 7, new_enum.values.size
+      assert_equal 7, enum.values.size
+      assert_equal 8, new_enum.values.size
       perc_value = new_enum.values["PERCUSSION"]
       assert_equal "new description", perc_value.description
     end
@@ -56,8 +56,10 @@ describe GraphQL::Schema::Enum do
 
       string_val = enum_type.values["STRING"]
       didg_val = enum_type.values["DIDGERIDOO"]
+      silence_val = enum_type.values["SILENCE"]
       assert_equal "STRING", string_val.name
       assert_equal :str, string_val.value
+      assert_equal false, silence_val.value
       assert_equal "DIDGERIDOO", didg_val.name
       assert_equal "Merged into BRASS", didg_val.deprecation_reason
     end

data/spec/graphql/schema/field_extension_spec.rb

@@ -34,7 +34,7 @@ describe GraphQL::Schema::FieldExtension do
     end
 
     class Query < BaseObject
-      field :doubled, Integer, null: false, method: :pass_thru do
+      field :doubled, Integer, null: false, resolver_method: :pass_thru do
         extension(DoubleFilter)
         argument :input, Integer, required: true
       end
@@ -43,12 +43,12 @@ describe GraphQL::Schema::FieldExtension do
         input # return it as-is, it will be modified by extensions
       end
 
-      field :trippled_by_option, Integer, null: false, method: :pass_thru do
+      field :trippled_by_option, Integer, null: false, resolver_method: :pass_thru do
         extension(MultiplyByOption, factor: 3)
         argument :input, Integer, required: true
       end
 
-      field :multiply_input, Integer, null: false, method: :pass_thru, extensions: [MultiplyByArgument] do
+      field :multiply_input, Integer, null: false, resolver_method: :pass_thru, extensions: [MultiplyByArgument] do
         argument :input, Integer, required: true
       end
     end

data/spec/graphql/schema/field_spec.rb

@@ -45,6 +45,12 @@ describe GraphQL::Schema::Field do
       assert_equal 'underscored_arg', arg_defn.name
     end
 
+    it "works with arbitrary hash keys" do
+      result = Jazz::Schema.execute "{ complexHashKey }", root_value: { :'foo bar/fizz-buzz' => "OK!"}
+      hash_val = result["data"]["complexHashKey"]
+      assert_equal "OK!", hash_val, "It looked up the hash key"
+    end
+
     it "exposes the method override" do
       object = Class.new(Jazz::BaseObject) do
         field :t, String, method: :tt, null: true
@@ -279,4 +285,17 @@ describe GraphQL::Schema::Field do
       assert_equal "Broken!!", field.deprecation_reason
     end
   end
+
+  describe "#original_name" do
+    it "is exactly the same as the passed in name" do
+      field = GraphQL::Schema::Field.from_options(
+        :my_field,
+        String,
+        null: false,
+        camelize: true
+      )
+
+      assert_equal :my_field, field.original_name
+    end
+  end
 end