aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/layout_test.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-05-04 19:23:34 -0300
committerEmilio Tagua <miloops@gmail.com>2009-05-04 19:23:34 -0300
commitd3042ef80c4406c90ff1e120059a99784d8ae79f (patch)
treea779b4fced3fd546d7c7c855fee41f3d996afba0 /actionpack/test/controller/layout_test.rb
parentd522b7ccf61a71b4c66ddf39368513d1fd9cd577 (diff)
parenteb201e64c0b68aee6d0715d44cf48178204c4133 (diff)
downloadrails-d3042ef80c4406c90ff1e120059a99784d8ae79f.tar.gz
rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.tar.bz2
rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/controller/layout_test.rb')
-rw-r--r--actionpack/test/controller/layout_test.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index da3f7b0cb8..5b7d40d16d 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -205,8 +205,7 @@ end
class LayoutExceptionRaised < ActionController::TestCase
def test_exception_raised_when_layout_file_not_found
@controller = SetsNonExistentLayoutFile.new
- get :hello
- assert_kind_of ActionView::MissingTemplate, @controller.template.instance_eval { @exception }
+ assert_raise(ActionView::MissingTemplate) { get :hello }
end
end