diff options
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/RUNNING_UNIT_TESTS | 2 | ||||
-rw-r--r-- | actionpack/lib/abstract_controller/callbacks.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/RUNNING_UNIT_TESTS b/actionpack/RUNNING_UNIT_TESTS index 16b119878a..95a8bc7497 100644 --- a/actionpack/RUNNING_UNIT_TESTS +++ b/actionpack/RUNNING_UNIT_TESTS @@ -11,7 +11,7 @@ Rake can be found at http://rake.rubyforge.org If you only want to run a single test suite, or don't want to bother with Rake, you can do so with something like: - ruby controller/base_tests.rb + ruby -Itest test/controller/base_tests.rb == Dependency on ActiveRecord and database setup diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb index ee496dadc5..67efeb7063 100644 --- a/actionpack/lib/abstract_controller/callbacks.rb +++ b/actionpack/lib/abstract_controller/callbacks.rb @@ -20,7 +20,7 @@ module AbstractController end module ClassMethods - # If :only or :accept are used, convert the options into the + # If :only or :except are used, convert the options into the # primitive form (:per_key) used by ActiveSupport::Callbacks. # The basic idea is that :only => :index gets converted to # :if => proc {|c| c.action_name == "index" }, but that the |