graphql 1.7.3 → 1.7.4

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/tF/tFofktc3WRxmXDS1NTWdUstzycUbsShJBMHatxLvxqQ.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash}I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"8file-digest://app/assets/javascripts/application.js;TTI"$file-digest://app/assets/config;TTI".file-digest://app/assets/config/rails-ujs;TTI")file-digest://app/assets/javascripts;TTI"3file-digest://app/assets/javascripts/rails-ujs;TTI")file-digest://app/assets/stylesheets;TTI"3file-digest://app/assets/stylesheets/rails-ujs;TTI"wfile-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled;TTI"
|file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/rails-ujs;TTI"vfile-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled;TTI"
{file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs;TTI"
~file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs.js;TTI"1file-digest://app/assets/config/action_cable;TTI"6file-digest://app/assets/javascripts/action_cable;TTI"6file-digest://app/assets/stylesheets/action_cable;TTI"
file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/action_cable;TTI"
�file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/action_cable.js;TTF

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/tL/tLQy_cVJ8R8R35MKxmAuxHklAoaJTyXFO-eL8dXcMKY.cache

@@ -0,0 +1 @@
+I"
�/Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs.js?type=application/javascript&pipeline=self&id=22e6aab4046537fff84044d874e2c71f779b2ca390ec3a22eccd7613f26633b7:ET

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/vK/vk4eyljHSm11GcRNbA0QEqn13Y4bEfxOcBwiesL-XvQ.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=1b05a45e1298fec0ff22490b83f41addd64c519f14fb065a24d7affea6cb08ed:ET

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/wc/wcSdAX-yztEvzKx_xYHtqxT47ZyaLoLal_vKwPxEP08.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash}I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"8file-digest://app/assets/javascripts/application.js;TTI"$file-digest://app/assets/config;TTI".file-digest://app/assets/config/rails-ujs;TTI")file-digest://app/assets/javascripts;TTI"3file-digest://app/assets/javascripts/rails-ujs;TTI"wfile-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled;TTI"
|file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/rails-ujs;TTI"vfile-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled;TTI"
{file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs;TTI"
~file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs.js;TTI"1file-digest://app/assets/config/action_cable;TTI"6file-digest://app/assets/javascripts/action_cable;TTI"
file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/action_cable;TTI"
�file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/action_cable.js;TTF

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/wh/whuY0tTNf66sTcgILzLfelCAHIBpDZZIiOIuI12HNQw.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash}I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"8file-digest://app/assets/javascripts/application.js;TTI"$file-digest://app/assets/config;TTI".file-digest://app/assets/config/rails-ujs;TTI")file-digest://app/assets/javascripts;TTI"3file-digest://app/assets/javascripts/rails-ujs;TTI")file-digest://app/assets/stylesheets;TTI"3file-digest://app/assets/stylesheets/rails-ujs;TTI"wfile-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled;TTI"
|file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/rails-ujs;TTI"vfile-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled;TTI"
{file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs;TTI"
~file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs.js;TTI"1file-digest://app/assets/config/action_cable;TTI"6file-digest://app/assets/javascripts/action_cable;TTI"6file-digest://app/assets/stylesheets/action_cable;TTI"
file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/action_cable;TTI"
�file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/action_cable.js;TTF

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/wi/wiKqSHxw-MJpM466KPFAcPyzBHxbpGGYW578TqFEJeg.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&id=4183029bcd199a612ca3f502301dc634a4a5e420380cd9a771d7e2e33c849a73:ET

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/wi/wixK89IvA4Xk2MyJxkyLg-2xRs2vRPzY_OIs37bi8XA.cache

@@ -0,0 +1 @@
+"%ڢ�0��A�2k���B�

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/x3/x3jUhlqTEK-rA6zTC8_MWGyKD8tZRhz2nPu0nCBgEGI.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&id=8f7125b8eabcf1163ca9ef4b7baf97a79f07bd48ec6f5948d5beae488fcdd736:ET

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/xL/xLktzniI5dkWKAifTMHzZvRHyRHOexsqV-ZRsdLXx0g.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash}I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"8file-digest://app/assets/javascripts/application.js;TTI"$file-digest://app/assets/config;TTI".file-digest://app/assets/config/rails-ujs;TTI")file-digest://app/assets/javascripts;TTI"3file-digest://app/assets/javascripts/rails-ujs;TTI")file-digest://app/assets/stylesheets;TTI"3file-digest://app/assets/stylesheets/rails-ujs;TTI"wfile-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled;TTI"
|file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/rails-ujs;TTI"vfile-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled;TTI"
{file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs;TTI"
~file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs.js;TTI"1file-digest://app/assets/config/action_cable;TTI"6file-digest://app/assets/javascripts/action_cable;TTI"6file-digest://app/assets/stylesheets/action_cable;TTI"
file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/action_cable;TTI"
�file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/action_cable.js;TTF

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/yH/yHfd9J_SJGssjygyWK8-uLlvE6IlN6DIda7947QWVsI.cache

@@ -0,0 +1 @@
+"%
�#��2A�R�*�G����7�ׯ،�g��

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/yQ/yQP_20gvJZ1MfkfWE7nU-EFpqbMzANYy8OWuQuaDyLM.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash}I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"Lprocessors:type=application/javascript&file_type=application/javascript;TTI"8file-digest://app/assets/javascripts/application.js;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"
~file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs.js;TTI"
�file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/action_cable.js;TTI"$file-digest://app/assets/config;TTI".file-digest://app/assets/config/rails-ujs;TTI")file-digest://app/assets/javascripts;TTI"3file-digest://app/assets/javascripts/rails-ujs;TTI")file-digest://app/assets/stylesheets;TTI"3file-digest://app/assets/stylesheets/rails-ujs;TTI"wfile-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled;TTI"
|file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/rails-ujs;TTI"vfile-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled;TTI"
{file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs;TTI"1file-digest://app/assets/config/action_cable;TTI"6file-digest://app/assets/javascripts/action_cable;TTI"6file-digest://app/assets/stylesheets/action_cable;TTI"
file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/action_cable;TTF

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/zP/zPBLf0GnkvCm86BY_8PtGJRyawPWy-JxWZp25_yNRfk.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash}I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"8file-digest://app/assets/javascripts/application.js;TTI"$file-digest://app/assets/config;TTI".file-digest://app/assets/config/rails-ujs;TTI")file-digest://app/assets/javascripts;TTI"3file-digest://app/assets/javascripts/rails-ujs;TTI")file-digest://app/assets/stylesheets;TTI"3file-digest://app/assets/stylesheets/rails-ujs;TTI"wfile-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled;TTI"
|file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/rails-ujs;TTI"vfile-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled;TTI"
{file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs;TTI"
~file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actionview-5.1.4/lib/assets/compiled/rails-ujs.js;TTI"1file-digest://app/assets/config/action_cable;TTI"6file-digest://app/assets/javascripts/action_cable;TTI"6file-digest://app/assets/stylesheets/action_cable;TTI"
file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/action_cable;TTI"
�file-digest:///Users/rmosolgo/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/actioncable-5.1.4/lib/assets/compiled/action_cable.js;TTF

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/zm/zmEmiHcLam0fJ2odLUV8n4hg9GN2gBDrJo7JCkkg8f4.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/application.css?type=text/css&pipeline=self&id=28494fbc91fae7922fc20667e1b30258d8dfe018bc5136ce26e0fb000a2636b5:ET

data/spec/dummy/tmp/cache/assets/sprockets/v3.0/zy/zywotY5ANjNyE78CLDqC1eYRFwL1ZFzkT9J5LzNlI4M.cache

@@ -0,0 +1 @@
+"%z$�6�ΑV��	�J�e�A����@2?�

data/spec/graphql/analysis/analyze_query_spec.rb

@@ -54,7 +54,8 @@ describe GraphQL::Analysis do
 
       it "emits traces" do
         traces = TestTracing.with_trace do
-          Dummy::Schema.execute(document: GraphQL.parse(query_string))
+          ctx = { tracers: [TestTracing] }
+          Dummy::Schema.execute(query_string, context: ctx)
         end
 
         # The query_trace is on the list _first_ because it finished first

data/spec/graphql/backtrace_spec.rb

@@ -2,14 +2,6 @@
 require "spec_helper"
 
 describe GraphQL::Backtrace do
-  before {
-    GraphQL::Backtrace.enable
-  }
-
-  after {
-    GraphQL::Backtrace.disable
-  }
-
   class LazyError
     def raise_err
       raise "Lazy Boom"
@@ -68,14 +60,16 @@ describe GraphQL::Backtrace do
     }
   }
 
+  let(:backtrace_schema) {
+    schema.redefine(use: GraphQL::Backtrace)
+  }
+
   describe "GraphQL backtrace helpers" do
     it "raises a TracedError when enabled" do
       assert_raises(GraphQL::Backtrace::TracedError) {
-        schema.execute("query BrokenList { field1 { listField { strField } } }")
+        backtrace_schema.execute("query BrokenList { field1 { listField { strField } } }")
       }
 
-      GraphQL::Backtrace.disable
-
       assert_raises(NoMethodError) {
         schema.execute("query BrokenList { field1 { listField { strField } } }")
       }
@@ -83,7 +77,7 @@ describe GraphQL::Backtrace do
 
     it "annotates crashes from user code" do
       err = assert_raises(GraphQL::Backtrace::TracedError) {
-        schema.execute <<-GRAPHQL, root_value: "Root"
+        backtrace_schema.execute <<-GRAPHQL, root_value: "Root"
         query($msg: String = \"Boom\") {
           field1 {
             boomError: raiseField(message: $msg)
@@ -119,13 +113,14 @@ describe GraphQL::Backtrace do
       assert_includes err.message, rendered_table
       # The message includes the original error message
       assert_includes err.message, "This is broken: Boom"
-      assert_includes err.message, "spec/graphql/backtrace_spec.rb:41", "It includes the original backtrace"
+      assert_includes err.message, "spec/graphql/backtrace_spec.rb:33", "It includes the original backtrace"
       assert_includes err.message, "more lines"
     end
 
     it "annotates errors inside lazy resolution" do
+      # Test context-based flag
       err = assert_raises(GraphQL::Backtrace::TracedError) {
-        schema.execute("query StrField { field2 { strField } __typename }")
+        schema.execute("query StrField { field2 { strField } __typename }", context: { backtrace: true })
       }
       assert_instance_of RuntimeError, err.cause
       b = err.cause.backtrace
@@ -151,13 +146,14 @@ describe GraphQL::Backtrace do
     end
 
     it "returns analysis errors to the client" do
-      res = schema.execute("query raiseError { __typename }")
+      res = backtrace_schema.execute("query raiseError { __typename }")
       assert_equal "this should not be wrapped by a backtrace, but instead, returned to the client", res["errors"].first["message"]
     end
 
     it "always stringifies the #inspect response" do
+      # test the schema plugin
       err = assert_raises(GraphQL::Backtrace::TracedError) {
-        schema.execute("query { nilInspect { raiseField(message: \"pop!\") } }")
+        backtrace_schema.execute("query { nilInspect { raiseField(message: \"pop!\") } }")
       }
 
       rendered_table = [

data/spec/graphql/execution/execute_spec.rb

@@ -154,7 +154,7 @@ describe GraphQL::Execution::Execute do
           star_wars_query(query_string, {
             "id1" => first_id,
             "id2" => last_id,
-          })
+          }, context: {tracers: [TestTracing]})
         end
 
         exec_traces = traces[5..-1]

data/spec/graphql/execution_error_spec.rb

@@ -252,4 +252,23 @@ describe GraphQL::ExecutionError do
       assert_equal(expected_result, result)
     end
   end
+
+  describe "options in ExecutionError" do
+    let(:query_string) {%|
+    {
+      executionErrorWithOptions
+    }
+    |}
+    it "the error is inserted into the errors key and the rest of the query is fulfilled" do
+      expected_result = {
+        "data"=>{"executionErrorWithOptions"=>nil},
+        "errors"=>
+            [{"message"=>"Permission Denied!",
+              "locations"=>[{"line"=>3, "column"=>7}],
+              "path"=>["executionErrorWithOptions"],
+              "code"=>"permission_denied"}]
+      }
+      assert_equal(expected_result, result)
+    end
+  end
 end

data/spec/graphql/introspection/schema_type_spec.rb

@@ -30,6 +30,7 @@ describe GraphQL::Introspection::SchemaType do
             {"name"=>"deepNonNull"},
             {"name"=>"error"},
             {"name"=>"executionError"},
+            {"name"=>"executionErrorWithOptions"},
             {"name"=>"favoriteEdible"},
             {"name"=>"fromSource"},
             {"name"=>"maybeNull"},

data/spec/graphql/language/parser_spec.rb

@@ -73,9 +73,9 @@ describe GraphQL::Language::Parser do
   end
 
   it "serves traces" do
-    traces = TestTracing.with_trace do
-      GraphQL.parse("{ t: __typename }")
-    end
+    TestTracing.clear
+    GraphQL.parse("{ t: __typename }", tracer: TestTracing)
+    traces = TestTracing.traces
     assert_equal 2, traces.length
     lex_trace, parse_trace = traces
 

data/spec/graphql/query/variables_spec.rb

@@ -73,7 +73,7 @@ describe GraphQL::Query::Variables do
 
     describe "nullable variables" do
       module ObjectWithThingsCount
-        def self.thingsCount(args, ctx) # rubocop:disable Style/MethodName
+        def self.thingsCount(args, ctx) # rubocop:disable Naming/MethodName
           1
         end
       end

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

@@ -219,4 +219,54 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
       })
     end
   end
+
+  describe "custom error messages" do
+    let(:schema) {
+      TimeType = GraphQL::ScalarType.define do
+        name "Time"
+        description "Time since epoch in seconds"
+
+        coerce_input ->(value, ctx) do
+          begin
+            Time.at(Float(value))
+          rescue ArgumentError
+            raise GraphQL::CoercionError, 'cannot coerce to Float'
+          end
+        end
+
+        coerce_result ->(value, ctx) { value.to_f }
+      end
+
+      QueryType = GraphQL::ObjectType.define do
+        name "Query"
+        description "The query root of this schema"
+
+        field :time do
+          type TimeType
+          argument :value, !TimeType
+          resolve ->(obj, args, ctx) { args[:value] }
+        end
+      end
+
+      GraphQL::Schema.define do
+        query QueryType
+      end
+    }
+
+    let(:query_string) {%|
+      query {
+        time(value: "a")
+      }
+    |}
+
+    it "sets error message from a CoercionError if raised" do
+      assert_equal 1, errors.length
+
+      assert_includes errors, {
+        "message"=> "cannot coerce to Float",
+        "locations"=>[{"line"=>3, "column"=>9}],
+        "fields"=>["query", "time", "value"]
+      }
+    end
+  end
 end

data/spec/graphql/static_validation/validator_spec.rb

@@ -9,6 +9,7 @@ describe GraphQL::StaticValidation::Validator do
 
   describe "tracing" do
     let(:query_string) { "{ t: __typename }"}
+    let(:query) { GraphQL::Query.new(Dummy::Schema, query_string, context: {tracers: [TestTracing]}) }
 
     it "emits a trace" do
       traces = TestTracing.with_trace do

data/spec/graphql/subscriptions_spec.rb

@@ -133,6 +133,30 @@ class InMemoryBackend
   Schema.get_field("Subscription", "myEvent").subscription_scope = :me
 end
 
+if rails_should_be_installed? && defined?(GlobalID)
+  GlobalID.app = "graphql-ruby-test"
+
+  class GlobalIDUser
+    include GlobalID::Identification
+
+    attr_reader :id
+
+    def initialize(id)
+      @id = id
+    end
+  end
+
+  class ToParamUser
+    def initialize(id)
+      @id = id
+    end
+
+    def to_param
+      @id
+    end
+  end
+end
+
 describe GraphQL::Subscriptions do
   before do
     schema.subscriptions.reset
@@ -170,7 +194,8 @@ describe GraphQL::Subscriptions do
       # The application signals graphql via `subscriptions.trigger`:
       schema.subscriptions.trigger("payload", {"id" => "100"}, root_object.payload)
       schema.subscriptions.trigger("payload", {"id" => "200"}, root_object.payload)
-      schema.subscriptions.trigger("payload", {"id" => "100"}, root_object.payload)
+      # Symobls are OK too
+      schema.subscriptions.trigger("payload", {:id => "100"}, root_object.payload)
       schema.subscriptions.trigger("payload", {"id" => "300"}, nil)
 
       # Let's see what GraphQL sent over the wire:
@@ -283,6 +308,37 @@ describe GraphQL::Subscriptions do
       assert_equal [3], deliveries["3"].map { |d| d["data"]["myEvent"]["int"] }
     end
 
+    if rails_should_be_installed? && defined?(GlobalID)
+      it "allows complex object subscription scopes" do
+        query_str = <<-GRAPHQL
+          subscription($type: PayloadType) {
+            myEvent(type: $type) { int }
+          }
+        GRAPHQL
+
+        # Global ID Backed User
+        schema.execute(query_str, context: { socket: "1", me: GlobalIDUser.new(1) }, variables: { "type" => "ONE" }, root_value: root_object)
+        schema.execute(query_str, context: { socket: "2", me: GlobalIDUser.new(1) }, variables: { "type" => "TWO" }, root_value: root_object)
+        # ToParam Backed User
+        schema.execute(query_str, context: { socket: "3", me: ToParamUser.new(2) }, variables: { "type" => "ONE" }, root_value: root_object)
+        # Array of Objects
+        schema.execute(query_str, context: { socket: "4", me: [GlobalIDUser.new(4), ToParamUser.new(5)] }, variables: { "type" => "ONE" }, root_value: root_object)
+
+        schema.subscriptions.trigger("myEvent", { "type" => "ONE" }, OpenStruct.new(str: "", int: 1), scope: GlobalIDUser.new(1))
+        schema.subscriptions.trigger("myEvent", { "type" => "TWO" }, OpenStruct.new(str: "", int: 2), scope: GlobalIDUser.new(1))
+        schema.subscriptions.trigger("myEvent", { "type" => "ONE" }, OpenStruct.new(str: "", int: 3), scope: ToParamUser.new(2))
+        schema.subscriptions.trigger("myEvent", { "type" => "ONE" }, OpenStruct.new(str: "", int: 4), scope: [GlobalIDUser.new(4), ToParamUser.new(5)])
+
+        # Delivered to GlobalIDUser
+        assert_equal [1], deliveries["1"].map { |d| d["data"]["myEvent"]["int"] }
+        assert_equal [2], deliveries["2"].map { |d| d["data"]["myEvent"]["int"] }
+        # Delivered to ToParamUser
+        assert_equal [3], deliveries["3"].map { |d| d["data"]["myEvent"]["int"] }
+        # Delivered to Array of GlobalIDUser and ToParamUser
+        assert_equal [4], deliveries["4"].map { |d| d["data"]["myEvent"]["int"] }
+      end
+    end
+
     describe "errors" do
       class ErrorPayload
         def int

data/spec/graphql/tracing/active_support_notifications_tracing_spec.rb

@@ -2,13 +2,11 @@
 require "spec_helper"
 
 describe GraphQL::Tracing::ActiveSupportNotificationsTracing do
-  before do
-    GraphQL::Tracing.install(GraphQL::Tracing::ActiveSupportNotificationsTracing)
-  end
-
-  after do
-    GraphQL::Tracing.uninstall(GraphQL::Tracing::ActiveSupportNotificationsTracing)
-  end
+  let(:schema) {
+    StarWars::Schema.redefine {
+      tracer GraphQL::Tracing::ActiveSupportNotificationsTracing
+    }
+  }
 
   it "pushes through AS::N" do
     traces = []
@@ -27,7 +25,7 @@ describe GraphQL::Tracing::ActiveSupportNotificationsTracing do
     last_id = StarWars::Base.last.id
 
     ActiveSupport::Notifications.subscribed(callback, /^graphql/) do
-      star_wars_query(query_string, {
+      schema.execute(query_string, variables: {
         "id1" => first_id,
         "id2" => last_id,
       })

data/spec/graphql/tracing/platform_tracing_spec.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::Tracing::PlatformTracing do
+  class CustomPlatformTracer < GraphQL::Tracing::PlatformTracing
+    TRACE = []
+
+    self.platform_keys = {
+      "lex" => "l",
+      "parse" => "p",
+      "validate" => "v",
+      "analyze_query" => "aq",
+      "analyze_multiplex" => "am",
+      "execute_multiplex" => "em",
+      "execute_query" => "eq",
+      "execute_query_lazy" => "eql",
+    }
+
+    def platform_field_key(type, field)
+      "#{type.name[0]}.#{field.name[0]}"
+    end
+
+    def platform_trace(platform_key, key, data)
+      TRACE << platform_key
+      yield
+    end
+  end
+
+  describe "calling a platform tracer" do
+    let(:schema) {
+      Dummy::Schema.redefine {
+        use(CustomPlatformTracer)
+      }
+    }
+
+    before do
+      CustomPlatformTracer::TRACE.clear
+    end
+
+    it "calls the platform's own method with its own keys" do
+      schema.execute(" { cheese(id: 1) { flavor } }")
+      expected_trace = [
+        "em",
+        "am",
+        "l",
+        "p",
+        "v",
+        "aq",
+        "eq",
+        "Q.c", # notice that the flavor is skipped
+        "eql",
+      ]
+      assert_equal expected_trace, CustomPlatformTracer::TRACE
+    end
+  end
+end