diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2009-11-24 21:45:14 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2009-11-24 21:45:14 +1100 |
| commit | 5f2395041d1578433fa825ed5c6f26a201f2203d (patch) | |
| tree | 3b78531ae77a2173ad0df1103543bdfea0b1f60f /actionpack/test/abstract/layouts_test.rb | |
| parent | 3a72923e27195983d37bdb39ef26b29cf03d3483 (diff) | |
| parent | e62e6d409986cd5c99234689aa49e3162d7b3a59 (diff) | |
| download | rails-5f2395041d1578433fa825ed5c6f26a201f2203d.tar.gz rails-5f2395041d1578433fa825ed5c6f26a201f2203d.tar.bz2 rails-5f2395041d1578433fa825ed5c6f26a201f2203d.zip | |
Merge branch 'master' of git://github.com/rails/rails into rails_master
Diffstat (limited to 'actionpack/test/abstract/layouts_test.rb')
| -rw-r--r-- | actionpack/test/abstract/layouts_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb index 9c29696ad5..ae2f1bf1f2 100644 --- a/actionpack/test/abstract/layouts_test.rb +++ b/actionpack/test/abstract/layouts_test.rb @@ -212,7 +212,7 @@ module AbstractControllerTests end test "when the layout is specified as a symbol and the method doesn't exist, raise an exception" do - assert_raises(NoMethodError, /:nilz/) { WithSymbolAndNoMethod.new.process(:index) } + assert_raises(NoMethodError) { WithSymbolAndNoMethod.new.process(:index) } end test "when the layout is specified as a symbol and the method returns something besides a string/false/nil, raise an exception" do |