From c16f4f1f38c8d209379cfec45b259538aba61c7c Mon Sep 17 00:00:00 2001 From: Alexey Vakhov Date: Sat, 10 Mar 2012 09:57:50 +0400 Subject: [PATCH] Fix exceptions messages in AC layouts --- actionpack/lib/abstract_controller/layouts.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index 92e93cbee7df7..dec406a778ea6 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -304,7 +304,7 @@ def _write_layout_method when false nil when true - raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil" + raise ArgumentError, "Layouts must be specified as a String, Symbol, Proc, false, or nil" when nil name_clause end @@ -364,7 +364,7 @@ def _layout_for_option(name) when false, nil then nil else raise ArgumentError, - "String, true, or false, expected for `layout'; you passed #{name.inspect}" + "String, Proc, :default, true, or false, expected for `layout'; you passed #{name.inspect}" end end