diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-02 05:32:14 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-02 05:32:14 +0000 |
commit | 0ee1cb2cd32bfaf47deaf5440dd5b9cf0915ab6a (patch) | |
tree | 5778378eafcbdfa37c82c67be1566c76aca249be /actionpack/test/controller/layout_test.rb | |
parent | 9264bdc8f618344307f07790a07a60dc04b80434 (diff) | |
download | rails-0ee1cb2cd32bfaf47deaf5440dd5b9cf0915ab6a.tar.gz rails-0ee1cb2cd32bfaf47deaf5440dd5b9cf0915ab6a.tar.bz2 rails-0ee1cb2cd32bfaf47deaf5440dd5b9cf0915ab6a.zip |
Ruby 1.9 compat, consistent load paths
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7719 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/layout_test.rb')
-rw-r--r-- | actionpack/test/controller/layout_test.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb index f194539fcf..85cc3a0843 100644 --- a/actionpack/test/controller/layout_test.rb +++ b/actionpack/test/controller/layout_test.rb @@ -93,16 +93,16 @@ class ExemptFromLayoutTest < Test::Unit::TestCase end def test_rjs_exempt_from_layout - assert @controller.send(:template_exempt_from_layout?, 'test.rjs') + assert @controller.send!(:template_exempt_from_layout?, 'test.rjs') end def test_rhtml_and_rxml_not_exempt_from_layout - assert !@controller.send(:template_exempt_from_layout?, 'test.rhtml') - assert !@controller.send(:template_exempt_from_layout?, 'test.rxml') + assert !@controller.send!(:template_exempt_from_layout?, 'test.rhtml') + assert !@controller.send!(:template_exempt_from_layout?, 'test.rxml') end def test_other_extension_not_exempt_from_layout - assert !@controller.send(:template_exempt_from_layout?, 'test.random') + assert !@controller.send!(:template_exempt_from_layout?, 'test.random') end def test_add_extension_to_exempt_from_layout @@ -110,20 +110,20 @@ class ExemptFromLayoutTest < Test::Unit::TestCase assert_nothing_raised do ActionController::Base.exempt_from_layout ext end - assert @controller.send(:template_exempt_from_layout?, "test.#{ext}") + assert @controller.send!(:template_exempt_from_layout?, "test.#{ext}") end end def test_add_regexp_to_exempt_from_layout ActionController::Base.exempt_from_layout /\.rdoc/ - assert @controller.send(:template_exempt_from_layout?, 'test.rdoc') + assert @controller.send!(:template_exempt_from_layout?, 'test.rdoc') end def test_rhtml_exempt_from_layout_status_should_prevent_layout_render ActionController::Base.exempt_from_layout :rhtml - assert @controller.send(:template_exempt_from_layout?, 'test.rhtml') - assert @controller.send(:template_exempt_from_layout?, 'hello.rhtml') + assert @controller.send!(:template_exempt_from_layout?, 'test.rhtml') + assert @controller.send!(:template_exempt_from_layout?, 'hello.rhtml') get :hello assert_equal 'hello.rhtml', @response.body |