Merge branch 'master' into allow-loading-schema-from-sdl-definition

jmeridth · web-flow · commit 72a2eeceb1f7 · 2025-05-29T10:56:49.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,9 +24,9 @@ jobs:
           - "~> 7.0.0"
           - "~> 7.1.0"
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Set up Ruby ${{ matrix.ruby_version }}
-        uses: ruby/setup-ruby@52753b7da854d5c07df37391a986c76ab4615999 # v1
+        uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
       - name: Build and test
@@ -40,9 +40,9 @@ jobs:
     name: Rubocop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Set up Ruby
-        uses: ruby/setup-ruby@52753b7da854d5c07df37391a986c76ab4615999 # v1
+        uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1
         with:
           ruby-version: 3.2
       - name: Build and test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,8 +11,8 @@ jobs:
       id-token: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
-      - uses: ruby/setup-ruby@52753b7da854d5c07df37391a986c76ab4615999 # v1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1
         with:
           bundler-cache: true
           ruby-version: ruby
diff --git a/Gemfile b/Gemfile
@@ -5,6 +5,7 @@ gemspec
 rails_version = ENV["RAILS_VERSION"] == "edge" ? { github: "rails/rails" } : ENV["RAILS_VERSION"]
 gem "actionpack", rails_version
 gem "activesupport", rails_version
+gem "concurrent-ruby", "1.3.4"
 
 graphql_version = ENV["GRAPHQL_VERSION"] == "edge" ? { github: "rmosolgo/graphql-ruby", ref: "interpreter-without-legacy" } : ENV["GRAPHQL_VERSION"]
 gem "graphql", graphql_version
diff --git a/graphql-client.gemspec b/graphql-client.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "minitest", "~> 5.9"
   s.add_development_dependency "rake", "~> 13.2.1"
   s.add_development_dependency "rubocop-github"
-  s.add_development_dependency "rubocop", "~> 1.66.1"
+  s.add_development_dependency "rubocop", "~> 1.75.8"
 
   s.required_ruby_version = ">= 2.1.0"
 
diff --git a/lib/graphql/client/erb.rb b/lib/graphql/client/erb.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "action_view"
+require "logger"
 
 module GraphQL
   class Client
diff --git a/lib/rubocop/cop/graphql/heredoc.rb b/lib/rubocop/cop/graphql/heredoc.rb
@@ -5,7 +5,7 @@ module RuboCop
   module Cop
     module GraphQL
       # Public: Cop for enforcing non-interpolated GRAPHQL heredocs.
-      class Heredoc < Cop
+      class Heredoc < Base
         def on_dstr(node)
           check_str(node)
         end
@@ -19,11 +19,11 @@ def check_str(node)
           return unless node.location.expression.source =~ /^<<(-|~)?GRAPHQL/
 
           node.each_child_node(:begin) do |begin_node|
-            add_offense(begin_node, location: :expression, message: "Do not interpolate variables into GraphQL queries, " \
+            add_offense(begin_node, message: "Do not interpolate variables into GraphQL queries, " \
               "used variables instead.")
           end
 
-          add_offense(node, location: :expression, message: "GraphQL heredocs should be quoted. <<-'GRAPHQL'")
+          add_offense(node, message: "GraphQL heredocs should be quoted. <<-'GRAPHQL'")
         end
 
         def autocorrect(node)
diff --git a/lib/rubocop/cop/graphql/overfetch.rb b/lib/rubocop/cop/graphql/overfetch.rb
@@ -8,7 +8,7 @@ module RuboCop
   module Cop
     module GraphQL
       # Public: Rubocop for catching overfetched fields in ERB templates.
-      class Overfetch < Cop
+      class Overfetch < Base
         if defined?(RangeHelp)
           # rubocop 0.53 moved the #source_range method into this module
           include RangeHelp
@@ -42,7 +42,7 @@ def investigate(processed_source)
 
           visitor.fields.each do |field, count|
             next if count > 0
-            add_offense(nil, location: visitor.ranges[field], message: "GraphQL field '#{field}' query but was not used in template.")
+            add_offense(visitor.ranges[field], message: "GraphQL field '#{field}' query but was not used in template.")
           end
         end
 
diff --git a/test/test_client_errors.rb b/test/test_client_errors.rb
@@ -310,7 +310,7 @@ def test_errors_collection
       "errors" => [
         {
           "message" => "b00m",
-          "locations" => [{"line" => 1, "column" => 3}],
+          "locations" => [{ "line" => 1, "column" => 3 }],
           "path" => ["nullableError"]
         }
       ]
diff --git a/test/test_client_fetch.rb b/test/test_client_fetch.rb
@@ -79,10 +79,10 @@ def self.resolve_type(_type, _obj, _ctx)
     refute response.data
 
     refute_empty response.errors
-    assert_equal "Field 'err' doesn't exist on type 'Query'", response.errors[:data][0]
+    assert_includes response.errors[:data][0], "Field 'err' doesn't exist on type 'Query'"
 
     refute_empty response.errors.all
-    assert_equal "Field 'err' doesn't exist on type 'Query'", response.errors[:data][0]
+    assert_includes response.errors[:data][0], "Field 'err' doesn't exist on type 'Query'"
   end
 
   def test_failed_response
diff --git a/test/test_client_schema.rb b/test/test_client_schema.rb
@@ -67,7 +67,7 @@ def test_dump_schema_io
 
   def test_dump_schema_context
     conn = FakeConn.new
-    GraphQL::Client.dump_schema(conn, StringIO.new, context: { user_id: 1})
+    GraphQL::Client.dump_schema(conn, StringIO.new, context: { user_id: 1 })
     assert_equal({ user_id: 1 }, conn.context)
   end
 end
diff --git a/test/test_query_result.rb b/test/test_query_result.rb
@@ -270,7 +270,7 @@ def test_snakecase_field_aliases
     GRAPHQL
 
     person = Temp::Person.new(@client.query(Temp::Query).data.me)
-    raw_result = {"firstName"=>"Joshua", "lastName"=>"Peek"}
+    raw_result = { "firstName" => "Joshua", "lastName" => "Peek" }
     assert_equal raw_result, person.to_h
     assert_equal raw_result, person.to_hash
 
diff --git a/test/test_rubocop_heredoc.rb b/test/test_rubocop_heredoc.rb
@@ -9,126 +9,126 @@ def setup
   end
 
   def test_good_graphql_heredoc
-    investigate(@cop, <<-RUBY)
+    result = investigate(@cop, <<-RUBY)
       Query = Client.parse <<'GRAPHQL'
         { version }
 GRAPHQL
     RUBY
 
-    assert_empty @cop.offenses.map(&:message)
+    assert_empty result.offenses.map(&:message)
   end
 
   def test_good_graphql_dash_heredoc
-    investigate(@cop, <<-RUBY)
+    result = investigate(@cop, <<-RUBY)
       Query = Client.parse <<-'GRAPHQL'
         { version }
       GRAPHQL
     RUBY
 
-    assert_empty @cop.offenses.map(&:message)
+    assert_empty result.offenses.map(&:message)
   end
 
   def test_good_graphql_squiggly_heredoc
-    investigate(@cop, <<-RUBY)
+    result = investigate(@cop, <<-RUBY)
       Query = Client.parse <<~'GRAPHQL'
         { version }
       GRAPHQL
     RUBY
 
-    assert_empty @cop.offenses.map(&:message)
+    assert_empty result.offenses.map(&:message)
   end
 
   def test_bad_graphql_heredoc
-    investigate(@cop, <<-RUBY)
+    result = investigate(@cop, <<-RUBY)
       Query = Client.parse <<GRAPHQL
         { version }
 GRAPHQL
     RUBY
 
-    assert_equal 1, @cop.offenses.count
-    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", @cop.offenses.first.message
+    assert_equal 1, result.offenses.count
+    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", result.offenses.first.message
   end
 
   def test_bad_graphql_dash_heredoc
-    investigate(@cop, <<-RUBY)
+    result = investigate(@cop, <<-RUBY)
       Query = Client.parse <<-GRAPHQL
         { version }
       GRAPHQL
     RUBY
 
-    assert_equal 1, @cop.offenses.count
-    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", @cop.offenses.first.message
+    assert_equal 1, result.offenses.count
+    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", result.offenses.first.message
   end
 
   def test_bad_graphql_squiggly_heredoc
     skip if RUBY_VERSION < "2.3"
 
-    investigate(@cop, <<-RUBY)
+    result = investigate(@cop, <<-RUBY)
       Query = Client.parse <<~GRAPHQL
         { version }
       GRAPHQL
     RUBY
 
-    assert_equal 1, @cop.offenses.count
-    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", @cop.offenses.first.message
+    assert_equal 1, result.offenses.count
+    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", result.offenses.first.message
   end
 
   def test_bad_graphql_heredoc_with_interpolation
-    investigate(@cop, <<-RUBY)
+    result = investigate(@cop, <<-RUBY)
       field = "version"
       Query = Client.parse <<-GRAPHQL
         { \#{field} }
       GRAPHQL
     RUBY
 
-    assert_equal 2, @cop.offenses.count
-    assert_equal "GraphQL/Heredoc: Do not interpolate variables into GraphQL queries, used variables instead.", @cop.offenses[0].message
-    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", @cop.offenses[1].message
+    assert_equal 2, result.offenses.count
+    assert_equal "GraphQL/Heredoc: Do not interpolate variables into GraphQL queries, used variables instead.", result.offenses[0].message
+    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", result.offenses[1].message
   end
 
   def test_bad_graphql_multiline_heredoc
-    investigate(@cop, <<-RUBY)
+    result = investigate(@cop, <<-RUBY)
       Query = Client.parse <<GRAPHQL
         {
           version
         }
 GRAPHQL
     RUBY
 
-    assert_equal 1, @cop.offenses.count
-    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", @cop.offenses[0].message
+    assert_equal 1, result.offenses.count
+    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", result.offenses[0].message
   end
 
   def test_bad_graphql_multiline_dash_heredoc
-    investigate(@cop, <<-RUBY)
+    result = investigate(@cop, <<-RUBY)
       Query = Client.parse <<-GRAPHQL
         {
           version
         }
       GRAPHQL
     RUBY
 
-    assert_equal 1, @cop.offenses.count
-    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", @cop.offenses[0].message
+    assert_equal 1, result.offenses.count
+    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", result.offenses[0].message
   end
 
   def test_bad_graphql_multiline_squiggly_heredoc
     skip if RUBY_VERSION < "2.3"
 
-    investigate(@cop, <<-RUBY)
+    result = investigate(@cop, <<-RUBY)
       Query = Client.parse <<~GRAPHQL
         {
           version
         }
       GRAPHQL
     RUBY
 
-    assert_equal 1, @cop.offenses.count
-    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", @cop.offenses[0].message
+    assert_equal 1, result.offenses.count
+    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", result.offenses[0].message
   end
 
   def test_bad_graphql_multiline_heredoc_with_interpolation
-    investigate(@cop, <<-RUBY)
+    result = investigate(@cop, <<-RUBY)
       field = "version"
       Query = Client.parse <<-GRAPHQL
         {
@@ -137,9 +137,9 @@ def test_bad_graphql_multiline_heredoc_with_interpolation
       GRAPHQL
     RUBY
 
-    assert_equal 2, @cop.offenses.count
-    assert_equal "GraphQL/Heredoc: Do not interpolate variables into GraphQL queries, used variables instead.", @cop.offenses[0].message
-    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", @cop.offenses[1].message
+    assert_equal 2, result.offenses.count
+    assert_equal "GraphQL/Heredoc: Do not interpolate variables into GraphQL queries, used variables instead.", result.offenses[0].message
+    assert_equal "GraphQL/Heredoc: GraphQL heredocs should be quoted. <<-'GRAPHQL'", result.offenses[1].message
   end
 
   private
@@ -148,6 +148,5 @@ def investigate(cop, src)
     processed_source = RuboCop::ProcessedSource.new(src, RUBY_VERSION.to_f)
     commissioner = RuboCop::Cop::Commissioner.new([cop], [], raise_error: true)
     commissioner.investigate(processed_source)
-    commissioner
   end
 end
diff --git a/test/test_rubocop_overfetch.rb b/test/test_rubocop_overfetch.rb
@@ -12,33 +12,32 @@ def setup
   end
 
   def test_all_fields_used
-    investigate(@cop, "#{Root}/views/users/show.html.erb")
+    result = investigate(@cop, "#{Root}/views/users/show.html.erb")
 
-    assert_empty @cop.offenses.map(&:message)
+    assert_empty result.offenses.map(&:message)
   end
 
   def test_all_fields_used_with_safe_navigation_operator
     skip if RUBY_VERSION < "2.3"
 
-    investigate(@cop, "#{Root}/views/users/show-2-3.html.erb")
+    result = investigate(@cop, "#{Root}/views/users/show-2-3.html.erb")
 
-    assert_empty @cop.offenses.map(&:message)
+    assert_empty result.offenses.map(&:message)
   end
 
   def test_field_unused
-    investigate(@cop, "#{Root}/views/users/overfetch.html.erb")
+    result = investigate(@cop, "#{Root}/views/users/overfetch.html.erb")
 
-    assert_equal 1, @cop.offenses.count
-    assert_equal "GraphQL/Overfetch: GraphQL field 'birthday' query but was not used in template.", @cop.offenses.first.message
+    assert_equal 1, result.offenses.count
+    assert_equal "GraphQL/Overfetch: GraphQL field 'birthday' query but was not used in template.", result.offenses.first.message
   end
 
   private
 
   def investigate(cop, path)
     engine = GraphQL::Client::ERB.new(File.read(path))
     processed_source = RuboCop::ProcessedSource.new(engine.src.dup, RUBY_VERSION.to_f, path)
-    commissioner = RuboCop::Cop::Commissioner.new([cop], [], raise_error: true)
+    commissioner = RuboCop::Cop::Commissioner.new([cop], [cop], raise_error: true)
     commissioner.investigate(processed_source)
-    commissioner
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ def test_errors_collection`
`310`	`310`	`"errors" => [`
`311`	`311`	`{`
`312`	`312`	`"message" => "b00m",`
`313`		`- "locations" => [{"line" => 1, "column" => 3}],`
	`313`	`+ "locations" => [{ "line" => 1, "column" => 3 }],`
`314`	`314`	`"path" => ["nullableError"]`
`315`	`315`	`}`
`316`	`316`	`]`