4 files changed, 5 insertions, 60 deletions
diff --git a/actionpack/test/controller/new_base/render_context_test.rb b/actionpack/test/controller/new_base/render_context_test.rb
deleted file mode 100644
index 5e570a1d79..0000000000
--- a/actionpack/test/controller/new_base/render_context_test.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require "abstract_unit"
-
-# This is testing the decoupling of view renderer and view context
-# by allowing the controller to be used as view context. This is
-# similar to the way sinatra renders templates.
-module RenderContext
-  class BasicController < ActionController::Base
-    self.view_paths = [ActionView::FixtureResolver.new(
-      "render_context/basic/hello_world.html.erb" => "<%= @value %> from <%= self.__controller_method__ %>",
-      "layouts/basic.html.erb" => "?<%= yield %>?"
-    )]
-
-    # 1) Include ActionView::Context to bring the required dependencies
-    include ActionView::Context
-
-    # 2) Call _prepare_context that will do the required initialization
-    before_action :_prepare_context
-
-    def hello_world
-      @value = "Hello"
-      render action: "hello_world", layout: false
-    end
-
-    def with_layout
-      @value = "Hello"
-      render action: "hello_world", layout: "basic"
-    end
-
-    protected def __controller_method__
-      "controller context!"
-    end
-
-    private
-      # 3) Set view_context to self
-      def view_context
-        self
-      end
-  end
-
-  class RenderContextTest < Rack::TestCase
-    test "rendering using the controller as context" do
-      get "/render_context/basic/hello_world"
-      assert_body "Hello from controller context!"
-      assert_status 200
-    end
-
-    test "rendering using the controller as context with layout" do
-      get "/render_context/basic/with_layout"
-      assert_body "?Hello from controller context!?"
-      assert_status 200
-    end
-  end
-end
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index c326f276bf..aadc6be077 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -8,7 +8,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
   class Boomer
     attr_accessor :closed
 
-    def initialize(detailed  = false)
+    def initialize(detailed = false)
       @detailed = detailed
       @closed = false
     end
diff --git a/actionpack/test/dispatch/live_response_test.rb b/actionpack/test/dispatch/live_response_test.rb
index a9a56f205f..b673fd3805 100644
--- a/actionpack/test/dispatch/live_response_test.rb
+++ b/actionpack/test/dispatch/live_response_test.rb
@@ -62,7 +62,7 @@ module ActionController
         assert_nil @response.headers["Content-Length"]
       end
 
-      def test_headers_cannot_be_written_after_webserver_reads
+      def test_headers_cannot_be_written_after_web_server_reads
         @response.stream.write "omg"
         latch = Concurrent::CountDownLatch.new
 
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index 1f4e14aef6..f8d89def6a 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -284,7 +284,7 @@ module ActionDispatch
 
       def test_generate_missing_keys_no_matches_different_format_keys
         get "/:controller/:action/:name", to: "foo#bar"
-        primarty_parameters = {
+        primary_parameters = {
           id: 1,
           controller: "tasks",
           action: "show",
@@ -297,9 +297,9 @@ module ActionDispatch
         missing_parameters = {
           missing_key => "task_1"
         }
-        request_parameters = primarty_parameters.merge(redirection_parameters).merge(missing_parameters)
+        request_parameters = primary_parameters.merge(redirection_parameters).merge(missing_parameters)
 
-        message = "No route matches #{Hash[request_parameters.sort_by { |k, v|k.to_s }].inspect}, missing required keys: #{[missing_key.to_sym].inspect}"
+        message = "No route matches #{Hash[request_parameters.sort_by { |k, _|k.to_s }].inspect}, missing required keys: #{[missing_key.to_sym].inspect}"
 
         error = assert_raises(ActionController::UrlGenerationError) do
           @formatter.generate(