Merge branch 'master' into patch-1

composerinteralia · web-flow · commit d4df4e2217f7 · 2022-01-07T20:49:27.000-05:00
diff --git a/lib/rubocop/cop/github/render_literal_helpers.rb b/lib/rubocop/cop/github/render_literal_helpers.rb
@@ -20,10 +20,6 @@ module RenderLiteralHelpers
           (send nil? {:render :render_to_string} ({str sym} $_) $...)
         PATTERN
 
-        def_node_matcher :render_inst?, <<-PATTERN
-          (send nil? {:render :render_to_string} (send _ :new ...) ...)
-        PATTERN
-
         def_node_matcher :render_with_options?, <<-PATTERN
           (send nil? {:render :render_to_string} (hash $...) ...)
         PATTERN
@@ -32,6 +28,10 @@ module RenderLiteralHelpers
           (send nil? {:render :render_to_string} (send _ :new ...) ...)
         PATTERN
 
+        def_node_matcher :render_view_component_instance_with_content?, <<-PATTERN
+          (send nil? {:render :render_to_string} (send (send _ :new ...) `:with_content ...))
+        PATTERN
+
         def_node_matcher :render_view_component_collection?, <<-PATTERN
           (send nil? {:render :render_to_string} (send _ :with_collection ...) ...)
         PATTERN
@@ -45,7 +45,8 @@ def hash_with_literal_keys?(hash)
         end
 
         def render_view_component?(node)
-          render_view_component_instance?(node) ||
+          render_view_component_instance_with_content?(node) ||
+            render_view_component_instance?(node) ||
             render_view_component_collection?(node)
         end
       end
diff --git a/rubocop-github.gemspec b/rubocop-github.gemspec
@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "rubocop-github"
-  s.version = "0.16.1"
+  s.version = "0.16.2"
   s.summary = "RuboCop GitHub"
   s.description = "Code style checking for GitHub Ruby repositories "
   s.homepage = "https://github.com/github/rubocop-github"
   s.license = "MIT"
 
   s.files = Dir["README.md", "STYLEGUIDE.md", "LICENSE", "config/*.yml", "lib/**/*.rb", "guides/*.md"]
 
-  s.add_dependency "rubocop", "<= 1.6.1"
-  s.add_dependency "rubocop-performance", "<= 1.7.1"
+  s.add_dependency "rubocop", "<= 1.13.0"
+  s.add_dependency "rubocop-performance", "<= 1.11.0"
   s.add_dependency "rubocop-rails", "<= 2.7.1"
 
   s.add_development_dependency "actionview", "~> 5.0"
diff --git a/test/test_rails_view_render_literal.rb b/test/test_rails_view_render_literal.rb
@@ -62,6 +62,14 @@ def test_render_component_instance_no_offense
     assert_equal 0, cop.offenses.count
   end
 
+  def test_render_component_instance_with_content_no_offense
+    erb_investigate cop, <<-ERB, "app/views/foo/index.html.erb"
+      <%= render MyClass.new(title: "foo", bar: "baz").with_content("foo") %>
+    ERB
+
+    assert_equal 0, cop.offenses.count
+  end
+
   def test_render_component_instance_block_no_offense
     erb_investigate cop, <<-ERB, "app/views/foo/index.html.erb"
       <%= render Module::MyClass.new(title: "foo", bar: "baz") do %>Content<% end %>
