1 files changed, 28 insertions, 30 deletions

diff --git a/actionview/test/actionpack/abstract/abstract_controller_test.rb b/actionview/test/actionpack/abstract/abstract_controller_test.rb
index 490932fef0..4d4e2b8ef2 100644
--- a/actionview/test/actionpack/abstract/abstract_controller_test.rb
+++ b/actionview/test/actionpack/abstract/abstract_controller_test.rb
@@ -1,9 +1,10 @@
-require 'abstract_unit'
-require 'set'
+# frozen_string_literal: true
+
+require "abstract_unit"
+require "set"
 
 module AbstractController
   module Testing
-
     # Test basic dispatching.
     # ====
     # * Call process
@@ -38,12 +39,12 @@ module AbstractController
 
       def render(options = {})
         if options.is_a?(String)
-          options = {:_template_name => options}
+          options = { _template_name: options }
         end
         super
       end
 
-      append_view_path File.expand_path(File.join(File.dirname(__FILE__), "views"))
+      append_view_path File.expand_path("views", __dir__)
     end
 
     class Me2 < RenderingController
@@ -65,11 +66,11 @@ module AbstractController
       end
 
       def rendering_to_body
-        self.response_body = render_to_body :template => "naked_render"
+        self.response_body = render_to_body template: "naked_render"
       end
 
       def rendering_to_string
-        self.response_body = render_to_string :template => "naked_render"
+        self.response_body = render_to_string template: "naked_render"
       end
     end
 
@@ -114,13 +115,13 @@ module AbstractController
     # * self._prefix is used when defined
     class PrefixedViews < RenderingController
       private
-      def self.prefix
-        name.underscore
-      end
+        def self.prefix
+          name.underscore
+        end
 
-      def _prefixes
-        [self.class.prefix]
-      end
+        def _prefixes
+          [self.class.prefix]
+        end
     end
 
     class Me3 < PrefixedViews
@@ -153,7 +154,7 @@ module AbstractController
     class OverridingLocalPrefixes < AbstractController::Base
       include AbstractController::Rendering
       include ActionView::Rendering
-      append_view_path File.expand_path(File.join(File.dirname(__FILE__), "views"))
+      append_view_path File.expand_path("views", __dir__)
 
       def index
         render
@@ -189,19 +190,19 @@ module AbstractController
       include ActionView::Layouts
 
       private
-      def self.layout(formats)
-        find_template(name.underscore, {:formats => formats}, :_prefixes => ["layouts"])
-      rescue ActionView::MissingTemplate
-        begin
-          find_template("application", {:formats => formats}, :_prefixes => ["layouts"])
+        def self.layout(formats)
+          find_template(name.underscore, { formats: formats }, { _prefixes: ["layouts"] })
         rescue ActionView::MissingTemplate
+          begin
+            find_template("application", { formats: formats }, { _prefixes: ["layouts"] })
+          rescue ActionView::MissingTemplate
+          end
         end
-      end
 
-      def render_to_body(options = {})
-        options[:_layout] = options[:layout] || _default_layout({})
-        super
-      end
+        def render_to_body(options = {})
+          options[:_layout] = options[:layout] || _default_layout({})
+          super
+        end
     end
 
     class Me4 < WithLayouts
@@ -228,14 +229,14 @@ module AbstractController
     end
 
     class ActionMissingRespondToActionController < AbstractController::Base
-      # No actions
+    # No actions
     private
       def action_missing(action_name)
         self.response_body = "success"
       end
     end
 
-    class RespondToActionController < AbstractController::Base;
+    class RespondToActionController < AbstractController::Base
       def index() self.response_body = "success" end
 
       def fail()  self.response_body = "fail"    end
@@ -248,7 +249,6 @@ module AbstractController
     end
 
     class TestRespondToAction < ActiveSupport::TestCase
-
       def assert_dispatch(klass, body = "success", action = :index)
         controller = klass.new
         controller.process(action)
@@ -277,18 +277,16 @@ module AbstractController
     end
 
     class Me6 < AbstractController::Base
-      self.action_methods
+      action_methods
 
       def index
       end
     end
 
     class TestActionMethodsReloading < ActiveSupport::TestCase
-
       test "action_methods should be reloaded after defining a new method" do
         assert_equal Set.new(["index"]), Me6.action_methods
       end
     end
-
   end
 end