From 5473e390d362755125d2f47b64ef0a135f2fe111 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Thu, 5 Jan 2017 17:20:57 +0900
Subject: `self.` is not needed when calling its own instance method

Actually, private methods cannot be called with `self.`, so it's not just redundant, it's a bad habit in Ruby
---
 actionview/lib/action_view/helpers/tags/date_select.rb  | 2 +-
 actionview/lib/action_view/helpers/tags/text_field.rb   | 2 +-
 actionview/lib/action_view/layouts.rb                   | 2 +-
 actionview/lib/action_view/test_case.rb                 | 4 ++--
 actionview/lib/action_view/view_paths.rb                | 2 +-
 actionview/test/activerecord/polymorphic_routes_test.rb | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'actionview')

diff --git a/actionview/lib/action_view/helpers/tags/date_select.rb b/actionview/lib/action_view/helpers/tags/date_select.rb
index 006605885a..638c134deb 100644
--- a/actionview/lib/action_view/helpers/tags/date_select.rb
+++ b/actionview/lib/action_view/helpers/tags/date_select.rb
@@ -16,7 +16,7 @@ module ActionView
 
         class << self
           def select_type
-            @select_type ||= self.name.split("::").last.sub("Select", "").downcase
+            @select_type ||= name.split("::").last.sub("Select", "").downcase
           end
         end
 
diff --git a/actionview/lib/action_view/helpers/tags/text_field.rb b/actionview/lib/action_view/helpers/tags/text_field.rb
index 4306c3543d..613cade7b3 100644
--- a/actionview/lib/action_view/helpers/tags/text_field.rb
+++ b/actionview/lib/action_view/helpers/tags/text_field.rb
@@ -17,7 +17,7 @@ module ActionView
 
         class << self
           def field_type
-            @field_type ||= self.name.split("::").last.sub("Field", "").downcase
+            @field_type ||= name.split("::").last.sub("Field", "").downcase
           end
         end
 
diff --git a/actionview/lib/action_view/layouts.rb b/actionview/lib/action_view/layouts.rb
index 18e395a67f..81feb90486 100644
--- a/actionview/lib/action_view/layouts.rb
+++ b/actionview/lib/action_view/layouts.rb
@@ -319,7 +319,7 @@ module ActionView
             name_clause
           end
 
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def _layout(formats)
             if _conditional_layout?
               #{layout_definition}
diff --git a/actionview/lib/action_view/test_case.rb b/actionview/lib/action_view/test_case.rb
index 5fb7bb54b5..2b981caa65 100644
--- a/actionview/lib/action_view/test_case.rb
+++ b/actionview/lib/action_view/test_case.rb
@@ -206,8 +206,8 @@ module ActionView
           view = @controller.view_context
           view.singleton_class.include(_helpers)
           view.extend(Locals)
-          view.rendered_views = self.rendered_views
-          view.output_buffer = self.output_buffer
+          view.rendered_views = rendered_views
+          view.output_buffer = output_buffer
           view
         end
       end
diff --git a/actionview/lib/action_view/view_paths.rb b/actionview/lib/action_view/view_paths.rb
index a9638d1e6d..f0fe6831fa 100644
--- a/actionview/lib/action_view/view_paths.rb
+++ b/actionview/lib/action_view/view_paths.rb
@@ -5,7 +5,7 @@ module ActionView
     included do
       class_attribute :_view_paths
       self._view_paths = ActionView::PathSet.new
-      self._view_paths.freeze
+      _view_paths.freeze
     end
 
     delegate :template_exists?, :any_templates?, :view_paths, :formats, :formats=,
diff --git a/actionview/test/activerecord/polymorphic_routes_test.rb b/actionview/test/activerecord/polymorphic_routes_test.rb
index 8495949975..fb670e5dbe 100644
--- a/actionview/test/activerecord/polymorphic_routes_test.rb
+++ b/actionview/test/activerecord/polymorphic_routes_test.rb
@@ -61,7 +61,7 @@ end
 
 class PolymorphicRoutesTest < ActionController::TestCase
   include SharedTestRoutes.url_helpers
-  self.default_url_options[:host] = "example.com"
+  default_url_options[:host] = "example.com"
 
   def setup
     @project = Project.new
-- 
cgit v1.2.3