aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-02-01 11:44:12 +0100
committerYves Senn <yves.senn@gmail.com>2015-02-01 11:44:12 +0100
commite374db237198b07e778c41320922d574fef4bc5e (patch)
tree2c8423d864cc8f034f6e425be832a2c01124a52e /actionpack
parentad83233eee3a5beb48919a91b4c109ff8c145f6b (diff)
parent1bb1b9e8cbf7a7b8bbac4ccf970eb8d9891a1831 (diff)
downloadrails-e374db237198b07e778c41320922d574fef4bc5e.tar.gz
rails-e374db237198b07e778c41320922d574fef4bc5e.tar.bz2
rails-e374db237198b07e778c41320922d574fef4bc5e.zip
Merge pull request #18759 from yuki24/remove-warning
:scissors: warning from controller renderer test
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/renderer_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/renderer_test.rb b/actionpack/test/controller/renderer_test.rb
index 6d5508323b..b55a25430b 100644
--- a/actionpack/test/controller/renderer_test.rb
+++ b/actionpack/test/controller/renderer_test.rb
@@ -65,10 +65,10 @@ class RendererTest < ActiveSupport::TestCase
end
test 'same defaults from the same controller' do
- defaults = ->(controller) { controller.renderer.defaults }
+ renderer_defaults = ->(controller) { controller.renderer.defaults }
- assert defaults[AccountsController].equal? defaults[AccountsController]
- assert_not defaults[AccountsController].equal? defaults[CommentsController]
+ assert renderer_defaults[AccountsController].equal? renderer_defaults[AccountsController]
+ assert_not renderer_defaults[AccountsController].equal? renderer_defaults[CommentsController]
end
test 'rendering with different formats' do