@@ -82,7 +82,7 @@ class Merb::Controller < Merb::AbstractController # # :api: public def self.override!(*names) - self._overrride_bang.push(*names) + self._override_bang.push(*names) end # Hide each of the given methods from being callable as actions. merb-core/lib/merb-core/controller/merb_controller.rb @@ -22,6 +22,6 @@ describe "attempting to override a method in Merb::Controller" do override! :status def status end - end }.should_not raise_error(Merb::ReservedError) + end }.should_not raise_error end end \ No newline at end of file merb-core/spec/public/controller/override_spec.rb 4343860a4959bf0bfd123b8701a1b4c24ea6d809 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/83860887996c8df7b5d93b10ca3c9d84aaae0c82 83860887996c8df7b5d93b10ca3c9d84aaae0c82 2008-11-25T09:49:23-08:00 2008-11-25T09:49:23-08:00 Fixes a typo in 1.0.2 and the spec that should have caught it d9bfe1687cc83ac38cdaae54594d89c49e9ef2d4 Yehuda Katz wycats@gmail.com